Implements #6086

Implements #6086 - Number and offsets of SubCells should not be hardcoded
Would an `int2[]` work better here?