Updated movement shit.
Merge fixed.