Adding more OO

Aslo bulls**ted everything