Making progress - now hunting for bug with assigning a room to a new tenant.