progress, but LR(1) is more trouble than it's worth now