Got highlights all working