Made minor changes, still need to add max, min, and avg to graph.
Trying to fix merge conflict
Fixed merge issue