Added more haskell stuff