flesh out the network bits some more