Finished tasks 15 and 16

Finished tasks 15 and 16