Proxy changes

Renamed class to NetworkProxyFactory, changes in methods. Still a lot of
work to do.