Some good work on side by side diffs