Fleshing out remainder of discovery section.