Working on new grid, more column types, wider