Also refactored the room into a class.