Add more ideas
Add state parameters to parser rules
Start move towards a stateful parser