Added the highlighter code and tests