Started refactoring to abstract behavior away from controller, inserting a layer between controller and DataMapper