C++ server code

Latest master merged in. We should discuss the layout of the code.
Oh ok, google misled me (kinda) :stuck_out_tongue: