Add class define and such, also add operand highlighting