Add exercises 3 & 4 (along with extra credit from 3)