Adding Proxy Server into the Mix

Added additional features and bug fixes as I went. . .