WIP: first pass at new highlighting

Very work in progress/messy, but it "works" so I wanted to get your thoughts on it @kien