Fix Diff Tool (Partial Completion)

Fix the diff tool, so it can be demoed, so @leolyons and @Angelamariewatson can demo it next week.