OOP

Some serious progress