getting classy

moving to class-based methods