Refactoring movement code
Bad smooth movement system in place