change to OOP

used to be procedural my b