WIP: adds map and set comparisons, other changes to data structures post