Friendly refactoring to rooms

Almost perfect...