Revert "Revert "Server""

This reverts commit dc9aebc4a03c776a772201ad48970f9b276798ab.