pre-merge
post merge
rewrote UI to match GameState API