Restore Mark's DMC work from previous repo