Completes 1.7 exercise

Signed-off-by: Irina Chichikova <diva.artim@gmail.com>
Completes 1.8 exercise

Signed-off-by: Irina Chichikova <diva.artim@gmail.com>