Add grid-parsing