refactoring lobby
progress
progress