Pass 4 - building the set in stages