OOP Work

heres our work from 3.5.14