Oop congregation

Converted many of the methods used so that it will use objects more efficiently.