More work on mai game state