Fixed movement ready for tweaks