Begin movement work - in progress
Add movement. Rough as hell, but it works (kinda).