Reworking the data model to move it out of controllers and into a separate model class