Finally the it builds and tests pass. There is more more work to be done for cleaning code and more tests.