More progress on lobby code. Still work-in-progress.