Attempt to convert MF to use DDD/CCRS/ES