adding OOP
ksolo helped
finished