Started another overhaul this time for repackaging of sets.