wip/singular/patches
