Trying to move the view calls into the controller