Task 1.18 NOT finished for OO