Fixed a bit of brokenness. Pretty much ready to merge back to develop, though the design decision of which monad should be exposed by default still stands