First round of network changes

Note network stuff is not complete yet