Haven't tested things yet, but since I was messing about with commit history I wanted to commit. Re-fixing motion.
In pretty good shape. Just doing some final tests, but I want to try and fix some of the random-reset bugs that have plagued the code for awhile.