Move stuff around
Simplify automatonless impl
Remove cabal constraints (hope this works)