wip/duff/patches
