Reverting some of the more haskell-specific stuff for now
WIP