More futzing about - added some logging, fix a few things.  Still needs
a lot of work.