started integrating new grid class