Initial server work, doc updates
Reverting "Initial server work, doc updates"
Initial server work, doc updates