Task 1.19 not finished for OO
Merging