initial commit of new grid system work