Nice, moving them out to the model files.