Some more work on the new networking