wip/schur/patches
