Progress on highlighter (still work in progress).