Initial code for new highlights rendering. Does not yet work.