Storage actions now in the custom monad
Formatting
Fix (compiling of) tests

All test suites build again. They don't (all) pass, but they do build.