Network refactor WIP.  Horrible.