Adding most recent changes. Only 6 shift reduce. Dangling else hopefully resolved