incorporating Lobby work from Taylor, and game update from Patrick