C++ server code

Latest master merged in. We should discuss the layout of the code.
should these both be on the same line?