update models to better reflect current state of the game

Will take care of queue and building stuff later...