refactor movement and collision to my own code from physics system