Fleshed out the network-class