Got parser working with general grammar (still need to make changes for OneZoom