Added preliminary patch collections; still need tweaks