deleted lots of commented out stuff, 2 tests don't work