start moving stuff to own classes