Some more work fleshing out the GameSetup phase

I've started planning for handling the turn end on the game side of things
I'm getting a little bit tangled up with what I should be keeping track of
:(