moved over some more factiverecord stuff to the traits file