ENH: Started on skeleton of network refactoring.