diff --git a/.gitignore b/.gitignore
index 74baadb5..ac13c023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -260,3 +260,11 @@ ModelManifest.xml
 .fake/
 *.lnk
 /pack-tree.lua
+
+# Temp GGPK Resolution
+Export/ggpk/*.bin
+Export/ggpk/*.decoded
+Export/ggpk/*.dat
+Export/ggpk/*.txt
+Export/ggpk/Metadata/*
+Export/ggpk/*.exe
diff --git a/Export/Classes/GGPKFile.lua b/Export/Classes/GGPKFile.lua
index 957c8b15..0fd1c47e 100644
--- a/Export/Classes/GGPKFile.lua
+++ b/Export/Classes/GGPKFile.lua
@@ -30,10 +30,10 @@ end
 local GGPKClass = newClass("GGPKFile", function(self, path)
 	self.path = path
 	self.temp = io.popen"cd":read'*l'
-	self.ooz_path = "C:\\Users\\nostr\\Documents\\Projects\\ooz\\x64\\Release\\"
+	self.ooz_path = self.temp .. "\\ggpk\\"
 
-	os.execute("mkdir " .. self.temp .. "\\ggpk")
-	self.temp = self.temp .. "\\ggpk\\"
+	-- make the Metadata subdir
+	os.execute("mkdir " .. self.ooz_path .. "\\Metadata")
 
 	self.ggpk = { }
 	self.dat = { }
@@ -44,23 +44,20 @@ local GGPKClass = newClass("GGPKFile", function(self, path)
 		self:ReadRecord(self.ggpk.recordList[i])
 	end
 	
+	self:IterateBundle("", "Bundles2")
 	self:HandleBundles()
 	self:AddDATFiles()
 end)
 
 function GGPKClass:HandleBundles()
-	self.dump = true
-	self:IterateBundle("", "Bundles2")
-	self.dump = false
-
-	-- copy over the _.index.bin file into the OOZ Release folder
-	local cmd = "copy ggpk\\_.index.bin " .. self.ooz_path .. "_.index.bin"
-	--ConPrintf("[CMD] %s\n", cmd)
-	os.execute(cmd)
-
-	--self:DecodeBundle("Data.dat.bundle.bin")
-	--self:DecodeBundle("_Preload.bundle.bin")
-	--self:DecodeBundle("Data.dat_4.bundle.bin")
+	-- iterate over all the needed files and extract them
+	datFileList, txtFileList = self:GetNeededFiles()
+	for _, datFile in ipairs(datFileList) do
+		self:FindBundle(datFile)
+	end
+	for _, txtFile in ipairs(txtFileList) do
+		self:FindBundle(txtFile)
+	end
 end
 
 function GGPKClass:AddDATFiles()
@@ -83,6 +80,12 @@ function GGPKClass:AddDATFiles()
 	end
 end
 
+function GGPKClass:FindBundle(path)
+	local cmd = "cd " .. self.ooz_path .. " && python ggpk_find_files.py " .. path
+	ConPrintf("[CMD] %s\n", cmd)
+	os.execute(cmd)
+end
+
 function GGPKClass:IterateBundle(topdir, subdir)
 	results = self:Find(topdir, subdir)
 	if results then
@@ -91,41 +94,22 @@ function GGPKClass:IterateBundle(topdir, subdir)
 			bundle_results = self:Find(result.name, "")
 			for _, b_result in ipairs(bundle_results) do
 				if b_result.dir and b_result.name == "Metadata" then
-					-- make the directory
-					local cmd = "mkdir " .. self.temp .. "Metadata"
-					ConPrintf("Executing CMD: '%s'\n", cmd)
-					os.execute(cmd)
-
-					local old_path = self.temp
-					self.temp = self.temp .. "Metadata\\"
 					ConPrintf("\nParsing Path: %s\n", b_result.fullName)
 					meta_results = self:Find(b_result.fullName, "")
-					self.temp = old_path
 				end
 			end
 		end
 	end
 end
 
-function GGPKClass:DecodeBundle(bundleName)
-	local cmd = "copy ggpk\\" .. bundleName .. " " .. self.ooz_path .. bundleName
-	ConPrintf("[CMD] %s\n", cmd)
-	os.execute(cmd)
-	
-	cmd = "cd " .. self.ooz_path .. " && ooz.exe -p --dll -e " .. bundleName .. " output _.index.bin _.index.txt"
-	ConPrintf("[CMD] %s\n", cmd)
-	os.execute(cmd)
-end
-
 function GGPKClass:Write(path, raw)
 	path = path or ""
-	local output = io.open(self.temp .. path, "wb")
+	local output = io.open(self.ooz_path .. path, "wb")
 	if output then
-		--ConPrintf("Writing %s\n", self.temp .. path)
 		output:write(raw)
 		output:close()
 	else
-		ConPrintf("Failed to open '%s' for writing.\n", self.temp )
+		ConPrintf("Failed to open '%s' for writing.\n", self.ooz_path )
 	end
 end
 
@@ -185,9 +169,14 @@ function GGPKClass:ReadRecord(record)
 		record.dataOffset = record.offset + headLength
 		record.dataLength = record.length - headLength
 		--ConPrintf("FILE '%s': %d bytes", record.name, record.dataLength)
-		if self.dump then
+		--if self.dump then
+		is_needed = self:RecordNeeded(record.name)
+		if is_needed == 1 then
 			self.file:seek("set", record.dataOffset)
 			self:Write(record.name, self.file:read(record.dataLength))
+		elseif is_needed == 2 then
+			self.file:seek("set", record.dataOffset)
+			self:Write("Metadata\\" .. record.name, self.file:read(record.dataLength))
 		end
 	elseif record.tag == "FREE" then
 		record.nextFree = bytesToULong(self.file:read(8))
@@ -269,7 +258,7 @@ function GGPKClass:GetNeededFiles()
 		"Data/ComponentArmour.dat",
 		"Data/Flasks.dat",
 		"Data/ComponentCharges.dat",
-		"Data/ComponentAttributeRequirements",
+		"Data/ComponentAttributeRequirements.dat",
 		"Data/PassiveSkills.dat",
 		"Data/PassiveSkillBuffs.dat",
 		"Data/PassiveTreeExpansionJewelSizes.dat",
@@ -296,8 +285,7 @@ function GGPKClass:GetNeededFiles()
 		"Data/EssenceType.dat",
 		"Data/Characters.dat",
 		"Data/BuffDefinitions.dat",
-		"Data/BuffMagnitudes.dat",
-		"Data/BuffCategory.dat",
+		"Data/BuffCategories.dat",
 		"Data/BuffVisuals.dat",
 		"Data/HideoutNPCs.dat",
 		"Data/NPCs.dat",
@@ -344,4 +332,29 @@ function GGPKClass:GetNeededFiles()
 		"Metadata/StatDescriptions/stat_descriptions.txt",
 		"Metadata/StatDescriptions/variable_duration_skill_stat_descriptions.txt",
 	}
+	return datFiles, txtFiles
+end
+
+function GGPKClass:RecordNeeded(name)
+	basedir_list = {}
+	basedir_list["_.index.bin"] = true
+	basedir_list["Data.dat_4.bundle.bin"] = true
+	basedir_list["Data.dat.bundle.bin"] = true
+	basedir_list["_Tiny_1.bundle.bin"] = true
+	basedir_list["Data.dat_5.bundle.bin"] = true
+	basedir_list["Data.dat_2.bundle.bin"] = true
+	basedir_list["Data.dat_3.bundle.bin"] = true
+	basedir_list["Data.dat_1.bundle.bin"] = true
+	basedir_list["_Preload.bundle.bin"] = true
+	
+	metadata_list = {}
+	metadata_list["StatDescriptions.bundle.bin"] = true
+
+	
+	if basedir_list[name] ~= nil then
+		return 1
+	elseif metadata_list[name] ~= nil then
+		return 2
+	end
+	return 0
 end
diff --git a/Export/Main.lua b/Export/Main.lua
index ab400d43..e244794c 100644
--- a/Export/Main.lua
+++ b/Export/Main.lua
@@ -121,6 +121,7 @@ function main:Init()
 		if not self.ggpk then
 			error("GGPK not loaded; set path first")
 		end
+		name = name:gsub("/","_")
 		if not self.ggpk.txt[name] then
 			local f = io.open(self.ggpk.ooz_path .. name, 'rb')
 			if f then
diff --git a/Export/ggpk/ggpk_find_files.py b/Export/ggpk/ggpk_find_files.py
new file mode 100644
index 00000000..17ec089e
--- /dev/null
+++ b/Export/ggpk/ggpk_find_files.py
@@ -0,0 +1,215 @@
+"""Oodle bundle tooling."""
+import os
+import struct
+import dataclasses
+import typing
+import sys
+
+def unpack(in_file: str, out_file: str):
+    os.system(f"ooz -f -p {in_file} {out_file}")
+
+def extract_file(bundle_name: str, offset: int, num_bytes_to_read: int, output_name: str):
+    # NOTE: a x64 release compiled ooz library is pulled from here: https://github.com/uilman/ooz/tree/poe-export
+    # You might need to make one small change for the code to compile (depending on your compiler)
+    # Around Line 4805
+    # -    std::vector<std::size_t> sizes =DecompressPoEBundle2(input,&decompressedOutput,decompressedSize);
+    # +    std::vector<std::uint32_t> sizes = DecompressPoEBundle2(input,&decompressedOutput,decompressedSize);
+    cmd = f"ooz -g {bundle_name} {offset} {num_bytes_to_read} {output_name}"
+    #print(cmd)
+    os.system(cmd)
+
+@dataclasses.dataclass
+class Bundle:
+    name_length: int
+    name: str
+    uncompressed_bundle_size: int
+
+@dataclasses.dataclass
+class FileInfoFile:
+    fnv_1: int
+    fnv_2: int
+    bundle_index: int
+    file_offset: int
+    file_size: int
+
+@dataclasses.dataclass
+class PathRep:
+    unknown1: int
+    unknown2: int
+    inner_bundle_offset: int
+    bundle_size: int
+    inner_bundle_size: int
+
+def unpack_inner(in_file: str, out_file: str) -> typing.Any:
+    with open(in_file, "rb") as f:
+        record_count = struct.unpack("<I", f.read(4))[0]
+        records = []
+        for _ in range(record_count):
+            name_length = struct.unpack("<I", f.read(4))[0]
+            name, uncompressed_bundle_size = struct.unpack(
+                f"<{name_length}sI", f.read(name_length + 4)
+            )
+            records.append(Bundle(name_length, name, uncompressed_bundle_size))
+        file_count = struct.unpack("<I", f.read(4))[0]
+        file_info = [
+            FileInfoFile(*t) for t in struct.iter_unpack("<5I", f.read(file_count * 20))
+        ]
+        path_rep_count = struct.unpack("<I", f.read(4))[0]
+        path_rep_structs = [
+            PathRep(*t) for t in struct.iter_unpack("<5I", f.read(path_rep_count * 20))
+        ]
+        with open(out_file, "wb") as o:
+            o.write(f.read())
+    return records, file_info, path_rep_structs
+
+def findBundle(name, file_list, bundle_list, extract=True):
+    # modify string to PoE standard
+    org_name = name
+    name = name.lower() + "++"
+
+    result = FNV1a(name)
+
+    for i in range(len(file_list)):
+        fnv = file_list[i].fnv_1 + (file_list[i].fnv_2 << 32)
+        if fnv == result:
+            #print(f"Found '{org_name}' in '{file_list[i]}' which is in bundle '{bundle_list[file_list[i].bundle_index].name.decode("utf-8") + '.bundle.bin'}'")
+            if extract:
+                extract_file(bundle_list[file_list[i].bundle_index].name.decode("utf-8") + '.bundle.bin', 
+                             file_list[i].file_offset, file_list[i].file_size, org_name)
+            return bundle_list[file_list[i].bundle_index].name.decode("utf-8") + '.bundle.bin'
+
+def main(flist, test=False):
+    unpack("_.index.bin", "_.index.bin.decoded")
+    bundle_list, file_list, path_list = unpack_inner("_.index.bin.decoded", "inner.bundle.bin")
+    print(len(bundle_list), len(file_list), len(path_list))
+
+    #test = True
+    if test:
+        dat_files, txt_files = Test()
+        needed = dict()
+        for name in dat_files:
+            #print(name)
+            n = findBundle(name, file_list, bundle_list, False)
+            if n == None:
+                print("ERROR: ", name)
+            needed[n] = True
+        for name in txt_files:
+            #print(name)
+            n = findBundle(name, file_list, bundle_list, False)
+            if n == None:
+                print("ERROR: ", name)
+            needed[n] = True
+        for n in needed.keys():
+            print(n)
+    else:
+        for name in flist:
+            print(name)
+            findBundle(name, file_list, bundle_list)
+    
+
+def FNV1a(name):
+    # Set the offset basis
+    hash = 0xcbf29ce484222325
+
+    # For each character
+    for character in name:
+
+        # Xor with the current character
+        hash ^= ord(character)
+
+        # Multiply by prime
+        hash *= 0x100000001b3
+
+        # Clamp
+        hash &= 0xffffffffffffffff
+
+    # Return the final hash as a number
+    return hash
+
+def Test():
+    dat_files = [
+        "Data/Stats.dat",
+		"Data/BaseItemTypes.dat",
+		"Data/WeaponTypes.dat",
+		"Data/ShieldTypes.dat",
+		"Data/ComponentArmour.dat",
+		"Data/Flasks.dat",
+		"Data/ComponentCharges.dat",
+		"Data/ComponentAttributeRequirements.dat",
+		"Data/PassiveSkills.dat",
+		"Data/PassiveSkillBuffs.dat",
+		"Data/PassiveTreeExpansionJewelSizes.dat",
+		"Data/PassiveTreeExpansionJewels.dat",
+		"Data/PassiveJewelSlots.dat",
+		"Data/PassiveTreeExpansionSkills.dat",
+		"Data/PassiveTreeExpansionSpecialSkills.dat",
+		"Data/Mods.dat",
+		"Data/ModType.dat",
+		"Data/ModDomains.dat",
+		"Data/ModGenerationType.dat",
+		"Data/ModFamily.dat",
+		"Data/ModAuraFlags.dat",
+		"Data/ActiveSkills.dat",
+		"Data/ActiveSkillTargetTypes.dat",
+		"Data/ActiveSkillType.dat",
+		"Data/Ascendancy.dat",
+		"Data/ClientStrings.dat",
+		"Data/ItemClasses.dat",
+		"Data/SkillTotems.dat",
+		"Data/SkillTotemVariations.dat",
+		"Data/SkillMines.dat",
+		"Data/Essences.dat",
+		"Data/EssenceType.dat",
+		"Data/Characters.dat",
+		"Data/BuffDefinitions.dat",
+		"Data/BuffCategories.dat",
+		"Data/BuffVisuals.dat",
+		"Data/HideoutNPCs.dat",
+		"Data/NPCs.dat",
+		"Data/CraftingBenchOptions.dat",
+		"Data/CraftingItemClassCategories.dat",
+		"Data/CraftingBenchUnlockCategories.dat",
+		"Data/MonsterVarieties.dat",
+		"Data/MonsterResistances.dat",
+		"Data/MonsterTypes.dat",
+		"Data/DefaultMonsterStats.dat",
+		"Data/SkillGems.dat",
+		"Data/GrantedEffects.dat",
+		"Data/GrantedEffectsPerLevel.dat",
+		"Data/ItemExperiencePerLevel.dat",
+		"Data/EffectivenessCostConstants.dat",
+		"Data/StatInterpolationTypes.dat",
+		"Data/Tags.dat",
+		"Data/GemTags.dat",
+		"Data/ItemVisualIdentity.dat",
+		"Data/AchievementItems.dat",
+		"Data/MultiPartAchievements.dat",
+		"Data/PantheonPanelLayout.dat"
+    ]
+    txt_files = [
+        "Metadata/StatDescriptions/passive_skill_aura_stat_descriptions.txt",
+		"Metadata/StatDescriptions/passive_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/active_skill_gem_stat_descriptions.txt",
+		"Metadata/StatDescriptions/advanced_mod_stat_descriptions.txt",
+		"Metadata/StatDescriptions/aura_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/banner_aura_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/beam_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/brand_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/buff_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/curse_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/debuff_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/gem_stat_descriptions.txt",
+		"Metadata/StatDescriptions/minion_attack_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/minion_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/minion_spell_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/monster_stat_descriptions.txt",
+		"Metadata/StatDescriptions/offering_skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/skillpopup_stat_filters.txt",
+		"Metadata/StatDescriptions/skill_stat_descriptions.txt",
+		"Metadata/StatDescriptions/stat_descriptions.txt",
+		"Metadata/StatDescriptions/variable_duration_skill_stat_descriptions.txt"
+    ]
+    return dat_files, txt_files
+
+if __name__ == "__main__":
+    main(sys.argv[1:])