Slowly everything has been getting moved over model by model and everything in the code follows those good conventions