Refactored ProxyController

- current spec status: 1209 examples, 452 failures