[Laptop] 2D Grid re-write