Correctly accounting for the existence of mismatches we have read over.
All tests pass on the new mapping code