start work addressing the diffs