More todo
more efficient scheme creation

This halves the number of times we have to merge subsets.