wip/cdogs/patches
