Revert "Server"

This reverts commit f2ba7c3048b66f2b18a2e1f66cd3ed20e4a44dbd.
Revert "Revert "Server""

This reverts commit 6bd02f28491a8e52d9ea0eb26b8c91380d35a5fa.