Refactored code to support single network spec
Fixed network spec stuff to accept correct format