restructuring of system to work with new state system.
more work on the usage of the state system to create game flow.