fixed oop issues
Calc object creating (derp)