Added a lot of graphing functionality