big refactoring work in progress
functional again after refactoring (templatized NetworkModule)