More hacky movement :p lil refactor