Adding OOP classes with this commit