Oops, final fix to refactor.
Add selection highlighting.