Networking

Someone should probably read through, @sseago? Let me know if you prefer me to squash first.
Lines 20 and 21 here seem to duplicate lines 16-17 -- merge issue? In any case, I guess this can go away.