Moved some button functionality to controller. Added comments for work left to be done