Add some TODO notes when Diff is ready