DM-419

Forgot I could now create GitHub PRs for reviews.  Here it is; hope it's helpful.
the old on -> the old one