wip/ranmacgen/patches
