DM-419

Forgot I could now create GitHub PRs for reviews.  Here it is; hope it's helpful.
I agree that it's too late.  

Note that my on-the-fly solution would allow old and new versions of the code to both read the files.