Switch the approach waypoints to the groups so that modellers can avoid duplicating them for bays which share (are grouped under) an entrance.
WIP, laptop so slow that I have to leave it here and sleep!