C++ server code

Latest master merged in. We should discuss the layout of the code.
this shouldn't be indented, correct?