WIP: fix up Pair and Map.  cabal install works (without tests)
WIP: Almost all unit tests operational, but with liftQs in still