Proxy Handler implementation
Add support for testing the proxy and fix some minor bugs