Added state stack and in-game play state