grammar in place, need to add actions