First pass at fixing cell range selection