Integrated client and servers.

Server Discovery is working.
Proxying is working.