working version
saving all test passing version
tests passing
cleaning up core dir