C++ server code

Latest master merged in. We should discuss the layout of the code.
is aVariable a common convention for naming variables in cpp?