More Modular Proxy

[Hammer1279]

While this could increase compute time by a tiny bit, it might make more sense long term to modularize the different functionalities in the proxy resolver.