rewrote grammar with combinators will test tomorrow