Major updates - shift to datastore for grids