Adding the network, lots of changes