Network refactor4

I think this is complete. My plan is to do an xo4 install, and then merge this into master if it all goes well.  The override worked for me on the NUC.