Updated ExtractBundles with find still testing it