Working on grid. Pre changes checkin