WIP: Add Hilight feature