wip/snark/patches
