Pull gamestate

Ready-ish to merge