Issue #6 and #9: Add a main game state, Add a debug game state

Also removes the test states.