More progress on highlights.

Not ready