wip/agile/patches
