added import stuff to classes in preparation for library import