[WIP] Updates for new datashape grammar