Added more gamestate support

Make way for Jesse's commit