Clean up some things, start adding StateManager