Prelim add/remove rooms handling