wip/cpdup/patches
