Reworked how we index the grid, made it more intuitive