Server and Client
Revert "Server and Client"

This reverts commit 2b4505efb119a961d75f7f0d770625755ee5d48d.
Revert "Revert "Server and Client""

This reverts commit b788cec283323665efd5b9c03c834c888e6c21ba.