Third version dirty

Still dirty but the shift/reduce conflicts are gone.