Added code problems 1.7, 1.8 and 2.1