Reimplemented the proxy work

This must have been lost in a previous commit. I cannot find it.
Merge pull request #323 from binford2k/fix/reimplement_proxy_work

Reimplemented the proxy work