100% this is going into Highlighter 2.1 I should probably write a public roadmap of where I'm taking Highlighter.