Even more changes to lobby code. Still work-in-progress.