wip/calibre/patches
