Changes & Moved Proxy code to private location :)