Added rooms and expanded time slot functionality