Started transforming the old grammar to PEG so that we have a base reference