Merging back all of the python stuff