Rearrange highlighting API to give highlight method to doc
Rearrange highlight api, keep orig field accesible
All subs should come out strings