Add client/server code and cleanuo