Working on migration to an OOP approach