Integrated lobby logic with the server fixes #47