move stuff to class