redesign of network module. WIP