more rooms, rooms now have building attribute