paring back and adding tests
yup
MORE THINGS! roll back here for traits in factories yo