Graphing works, needs some fixes / cleanups