This now uses the prev data format data as well, and outputs in modern format. Will use that in next commit to update all the data to modern format.