all tests pass... gutted out tons of junk