Some progress. All tests pass... they don't test much though!