Added some, but not all, of the needed GraphsDriver code