Started to fix movement.

Needs to be finished.