working on fixing primitives