Client is done

Updated Server and Command and Control