Adds OOP You're Doing It Completely Wrong