Progress on highlights... sorta