Add the Model, refactor Controller.