Python Upgrade 2

Still pushing forward the upgrade to Python.  Not a completely working
copy yet, but getting closer!