Log Message:

I did this because it was in doc/TODO.  However, it needs to be audited
because I don't know much about Python.  See the 'TODO' file for what
I think, at the very least, still needs to be addressed.  Thanks.