changing names, changing grid to take cell objects