OOP-ifying it