Movement works pretty well now!
Merged with latest changes