cleaning up the code and adding initial draft of proxy code