wip/structure/patches
