Throw out reader discard for good
Start on a test suite

Yes the tests are fucked.