alphabatized things because I like being pedantic
cleaned up primitives testing
removed some testing methods because I'll add those later