lots of work
Merge branch 'GraphUpdatesContinued'