Task 1.16 finished for OO