some slight refactoring + more rooms