Made pass several tests
removed refs to store