wip/zmap/patches
