Floors and Rooms now not so hard coded