Added the beginnings of highlighting.