Beginnings of grid and debugging refinement