Small progress toward full highlighting.
Freakkin did it!