wip/samhain/patches
