Added 1.7 and 2.1 exercises