Keep state for highlighting in separate property
Redraw highlighting every time after redrawFromRaw