Server API mostly finished
Revert "Server API mostly finished"

This reverts commit fd0a547e6035a3a5518fd16d6807e383103289ed.