refactor in progress but all relevant tests passing
Network restructure in progress
allocation
wip