Made one last change to Grid so that it is ready to deal with multiple
sources.