Added OOP. YIPPY!