Graph work (in progress).
Merge remote-tracking branch 'origin/master'