Quick pass on the new version of CSV export