Task 1.18 finished for OO