Major rewrite of roommate/room structure