Begin refactoring of proxies.py