Add gamestate comments
Refactor for fewer db writes