wip/ncp/patches
