WIP.  Partial implementation of graph2.