broke graph somehow so I stashed changes since the last commit.