Movement is looking a lot better. Still some bugs, but I'm happy enough with it to go into the main branch.