Stripped out commented old code since initial tests pass and
comparison wth master copies are easy.