Merged master with ddm-config

Hi Cody,

Here's master merged with ddm-config for continuing work on this section.

Thanks,
Jim