Change structure of grid to match what's being used today