Task 17

Finished
Task 14 - untested