Better movements, but not at the right times. Also, a lot of commented out deferred stuff.