Some work on tedious network rewrite

Going to update GLib now