Midstream on adding better graph support. Probably broke a bunch of stuff but need to commit.
24 files changed