CHANGE - continue the Model/Controller refactor