Moved game logic to GameState.
Merge.