Starting to work on lobby issue #7