Finished server side, and tests.
Finished some end-to-end server tests.