Add more lobby logic