Networking refactor almost complete.