Task 1.21 finished for OO and Task 1.22 finished for OO