Well, got this diffing stuff done, I think