merged geoff and subgraph into new geoff!