wip/pdq/patches
