wip/gnomebaker/patches
