WIP refactor waiting room