wip/picprog/patches
