checkpoint; lots of s/r conflicts, but the whole grammar is roughly there.