wip/zbar/patches
