wip/slim/patches
