Add more OOP classes, change input vs output

Dont forget to fix the c1 parameter