Initial rebuild for Haskell