[WIP] Moving Network functionallity into a module