Got it back to passing the test suite.
saving in preparation for a feature add
reorganized filetree a little.