New highlighting system - not finished