Ok. First pass implementation is looking good now and all tests are passing.