Remove some debug code and comments
Add a TickHandler and implement motion, and hook up the states to the hotkeys.