Now (AFAIK) fully functional with a minimal set of enable/disable-able logging calls.

Some further test refactoring too, because why not.