Refactoring, using a user stack as well as a rooms