Most of the graphing code is worked out, this commit is just acting as a safe checkpoint