TDD the reverse lookup, refactor into original code.