Started adding Server API
Cleanups