Turn graphing into a class
Include graph-making step in top