wip/archimedes/patches
