Adding some OOP stuff...