Further work on intro/discussion