Some nastiness, but now treating graph as object