almost done
fixed more tests
fix racing condition bug
fix another racing condition bug when attempting a problem
resolve merge conflicts