Python: Intermediate commit.  Adding some of Spencers changes.