Work towards highlighting with fidelty to DOM structure. Working out bugs.