Started to fully implement movement
Solved merge conflicts