Starting work on revamp with THC's grammar