More work on merging network functionality.