Preliminary changes for Python

Ok much better this way.
The lessons I learned is NEVER work in your fork master, and keep branches as small as possible