wip/dmd/patches
