New hacking, bug came back.  Tried to go back and find where it came in, but I can't make it go away atm.
Add 0CFA implementation from Max Bolingbroke
Duplicate Set.hs to seed Map.hs
Move the Classes module into position and expose it