Move to subgraph support, still heavily WIP, refs #41