WIP: faster entry, some work on game state