Copy CGrep and Found from previous activity

They shouldn't have to change at all.