merging the clieny functionality into the network architecture