I'll poke at this a little more, but since these graphs are not mostly used interactively I'll probably shelve it for a later PR