From connect

Merge the Python modules. This will force me to finish the refactoring process.