Major reworking of cell parsing logic to remove need for Maybe wrappers