Beginnings of state stack system.
Merging edits to game.py