Improved the data model by taking everything out of the controllers and making a DataModel object.