Overhaul of set management.

One failing spec that need swork i