Finish network-features rework. Correlation talk still to be done