Initial proxy setup
Final Commit - Proxy setup