Add TODO in ms so I don't forget later
Clean up make-data file