More work on network
Merge branch 'jon'