Fix modules list
Minor
Start rework of dms module.  And tests.
No really, tests.