(Broken) almost done removing cabal-dev and passing tests