Large rewrites: add ZIP, FOLDR, etc