wip/zapping/patches
