change of plans -- to be done

At the moment the implementation via map will stay, but I'll have to
change this to get sets of sets