the code is more or less in place and working, but not all the tests are there to test all the parts, so I still don't have confidence in the code