Committing these changes before I leave for the weekend.  These changes are untested.