More work on GameState updates..