Started working on the actions, refactored the controller