More progress on highlights.
Merge pull request #39 from Floobits/more_highlights

More progress on highlights.