wip/electricsheep/patches
