Makes a few changes in motion and state_machine to get things running