add in a bunch of graph stuff