Merged solution of OOP into notebook