Reimplemented the proxy work

This must have been lost in a previous commit. I cannot find it.