merging the clieny functionality into the network architecture
Merging numpify into master.