Grid now uses 2D matrix
Merge?