Oh, and did anyone else see the bonding moment between Catherine and Greg?

It was sweet and all (aww...she lost her father and he was beat up by psychos), but Catherine should focus her attention back on Warrick. True, he's married, but it's obvious that they are having problems.