Going back to using make_sets to group slaves
Show as of Oct 11