Pythonify

Pythonify previous merge requests.