Some work on getting the highlighter to do magic