Fixed movement. Added controller class