Minor changes to the model.
Started the implementation of the controller.