Breakthroughs in /highlight, almost done