Beware!  Much of this code is untested!

Someday, we will have a test suite and everything will be just fine.