moving stuff to container class