Import model M refactoring and additional features (including DCP 118), and some untested new EDCM features.