Added proxy support...still subject to testing