wip/quickie/patches
