non commit files
cleaned up Lobby interface, added more tests