Just before reworking into gameState object