Initial commit
First cut implementation of proxy.
Minor changes