Adding waitroom logic