progress on networking re-factor (breaking)