wip/adamem/patches
