Attached below is my full peggyjs grammar. It is technically feature complete, but struggles with a last problem. The test term that is not being correctly parsed is 2d6 + 1d8. The intended result is to receive the term back as string, unchanged, however the parser will not process it, as it is unable to loop around to the start from a PoolTerm to parse another addition.