Update and get gamestate
Merged conflicts