More work on game states and components