Refactoring call routing, trying to share with server (for proxied access)