RE: [MERGE] network refactoring, phase 1

[Alex Huang]

> +1 - with an assumption that Alex and others are OK with it (since the
> javelin branch merge was proposed first).

+1 We're struggling with the merge right now so one more merge is not going to 
hurt very much.

--Alex