Task 1.17 finished for OO