Client server and Dennis Code merge