working on new grid system