Grids

Can this TODO be deleted?