066 Haskell work (and cleanup)