All-but-graphing done
Revert "All-but-graphing done"

This reverts commit a6c5b817cd7ee2f3dc3563b1267642629ab5c37f.
Revert "Revert "All-but-graphing done""

This reverts commit 6ff9271f6bc794cdc8105c53a7e152a9fc6d1125.