wip/slashem/patches
