wip/ddate/patches
