More changes to the lobby code. Still work-in-progress.