Redid the remaining foreach loops with room units