Getting closer. Need to fix dragging in the grid.