worked on test, traits, and some core logic alterations