diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..2110527b
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,12 @@
+general:
+  branches:
+    ignore:
+      - ggmaster
+      - hots
+      - jonomon
+      - master
+      - old_master
+test:
+    override:
+        - python -m unittest discover test_replays
+        - python -m unittest discover test_s2gs
diff --git a/new_units.py b/new_units.py
index c8134991..afe58f27 100644
--- a/new_units.py
+++ b/new_units.py
@@ -1,6 +1,6 @@
 # Shows new data entries from the requested build files:
 #
-# Usage: python new_data.py sc2reader/data/HotS/24764_units.csv sc2reader/data/HotS/24764_abilites.csv
+# Usage: python new_units.py sc2reader/data/HotS/24764_units.csv sc2reader/data/HotS/24764_abilites.csv
 #
 # The output from this can be used to update the unit_lookup.csv and ability_lookup.csv files. Maybe the
 # script can be fixed to append these lines automatically...
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..7e2fba5e
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+Pillow
diff --git a/sc2dump.cpp b/sc2dump.cpp
index f23fe64f..8fb1e473 100644
--- a/sc2dump.cpp
+++ b/sc2dump.cpp
@@ -1,262 +1,234 @@
-/* Dump type ids for Units and Abils for SC2.
- *
- * Authors: Robert Nix (@mischanix), Graylin Kim (@GraylinKim)
- *
- * Must be linked with the Microsoft Version.lib library. If compiling on 32 bit you may require the LAA option.
- *
- * Usage: sc2dump.exe <UNIT_DATA_OUTPUT> <ABIL_DATA_OUTPUT>
- * Example:
- *
- *  $ sc2dump.exe 24764/units.csv 24764/abils.csv
- *  Searching for a live SC2 process.
- *
- *  Found SC2.exe
- *      Path: C:\Program Files (x86)\StarCraft II 2012 Beta\Versions\Base24764\SC2.exe
- *      Base Address: 590000
- *      Build: 24764
- *
- *  Dumping Catalog@0x7903b54
- *      Dumping CAbil@0x790b7f4 to 24764/24764_abils.csv
- *      Dumping CUnit@0x791f864 to 24764/24764_units.csv
- *
- *  Done.
- *
- * If the script can't find the SC2 process or the offset is bad it will tell you. If SC2 is running an
- * unknown offset you'll need to use CheatEngine to find a new one and make a new case for the switch
- * statement.
- *
- * For Heart of the Swarm:
- *  1. Attach to the process 
- *  2. Make sure that writable is unchecked and executable is fully checked
- *  3. Do an array search for "8b 0d ?? ?? ?? ?? 8b 49"
- *  4. Look for the most common match.
- *  5. The the ?? ?? ?? ?? portion is the bytes in reverse order for the gameCatalog
- *  6. Subtract the base address for the process (which you can get by running this script)
- *  7. Add a new case for this build with that information. cUnitIndex and stringNameOffset generally won't change
- *
- * For Wings of Liberty:
- * 1. Use the "a1 ?? ?? ?? ?? 8b 80" search string with the HotS instructions above.
- *
- */
-#include <Windows.h>
-#include <psapi.h>
-#include <TlHelp32.h>
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-const int MAX_PROC_NAME_SIZE = 512;
-const int MAX_PROC_LIST_SIZE = 2048;
-
-void DumpIds(HANDLE sc2_handle, uint32_t catalogRecordList, uint32_t stringNameOffset, FILE* out);
-uint32_t ReadUInt(uint32_t address, HANDLE sc2_handle);
-char* ReadString(uint32_t address, uint32_t length, HANDLE sc2_handle);
-uint32_t GetModuleBase(DWORD, char *);
-
-HANDLE getSC2Handle();
-char* getSC2Info(HANDLE sc2_handle, uint32_t &base_address, uint32_t &build);
-
-int main(int argc, char* argv[]) {
-	if (argc < 3) {
-		printf("Both unit and ability output files are required (in that order).\n");
-		ExitProcess(1);
-	}
-	
-	char* units_filename = argv[1];
-	char* abils_filename = argv[2];
-
-	
-	printf("Searching for a live SC2 process.\n");
-	HANDLE sc2_handle = getSC2Handle();
-	if (sc2_handle == NULL) {
-		printf("Error: SC2.exe not found\n");
-		ExitProcess(1);
-	}
-	
-	uint32_t build;
-	uint32_t base_address;
-	char* sc2_exe_path = getSC2Info(sc2_handle, base_address, build);
-	if (sc2_exe_path == NULL) {
-		printf("Error: Unable to acquire base address and build information.\n");
-		ExitProcess(1);
-	} else {
-		printf("\nFound SC2.exe\n");
-		printf("  Path: %s\n", sc2_exe_path);
-		printf("  Base Address: %x\n", base_address);
-		printf("  Build: %d\n", build);
-	}
-
-	uint32_t gameCatalog = 0;
-	uint32_t cUnitIndex = 0;
-	uint32_t stringNameOffset = 0;
-	switch(build) {
-		case 23260: // WoL 1.5.3.23260
-			gameCatalog = 0x1362BA0u;
-			cUnitIndex = 0x110u;
-			stringNameOffset = 0x64u;
-			break;
-		case 23925: // HotS beta 2.0.0.23925
-			gameCatalog = 0x1EA2BE8u;
-			cUnitIndex = 0x110u;
-			stringNameOffset = 0x40u;
-			break;
-		case 24247: // HotS beta 2.0.0.24247
-			gameCatalog = 0x10C9B28u;
-			cUnitIndex = 0x11cu;
-			stringNameOffset = 0x40u;
-			break;
-		case 24764: // HotS beta 2.0.3.24764
-			gameCatalog = 0x10E79B8u;
-			cUnitIndex = 0x11cu;
-			stringNameOffset = 0x40u;
-			break;
-		default:
-			printf("Error: Missing offset values for build %d\n",build);
-			ExitProcess(1);
-	}
-	
-	uint32_t gameCatalogTable = ReadUInt(base_address + gameCatalog,sc2_handle);
-	printf("\nDumping Catalog@0x%x\n", gameCatalogTable);
-
-	FILE* abils_file;
-	if (fopen_s(&abils_file,abils_filename, "w")==0) {
-		uint32_t abilCatalogList = ReadUInt(gameCatalogTable + 0x1c,sc2_handle);
-		printf("  Dumping CAbil@0x%x to %s\n", abilCatalogList, abils_filename);
-		DumpIds(sc2_handle, abilCatalogList, stringNameOffset, abils_file);
-		fclose(abils_file);
-	} else {
-		printf("  ERROR: Could not open %s for writing.",abils_filename);
-	}
-
-	FILE* units_file;
-	if (fopen_s(&units_file, units_filename , "w")==0) {
-		uint32_t unitCatalogList = ReadUInt(gameCatalogTable + cUnitIndex,sc2_handle);
-		printf("  Dumping CUnit@0x%x to %s\n", unitCatalogList, units_filename);
-		DumpIds(sc2_handle, unitCatalogList, stringNameOffset, units_file);
-		fclose(units_file);
-	} else {
-		printf("  ERROR: Could not open %s for writing.",units_filename);
-	}
-
-	printf("\nDone.\n");
-	CloseHandle(sc2_handle);
-    return 0;
-}
-
-void DumpIds(HANDLE sc2_handle, uint32_t catalogRecordList, uint32_t stringNameOffset, FILE* out) {
-	uint32_t recordsList = ReadUInt(catalogRecordList + 0x5c, sc2_handle);
-	if (recordsList == 0) {
-		printf("-- Error dumping table@%x: no list of catalog records found.\n", catalogRecordList);
-		return;
-	}
-
-	uint32_t numEntries = ReadUInt(catalogRecordList + 0x50, sc2_handle);
-	for (uint32_t id = 0; id < numEntries; id++) {
-		uint32_t recordPtr = ReadUInt(recordsList + 4 * id, sc2_handle);
-		if (recordPtr != 0) {
-			uint32_t stringPtr = ReadUInt(ReadUInt(recordPtr + stringNameOffset, sc2_handle) + 0x10, sc2_handle) + 4;
-			uint32_t stringLength = ReadUInt(stringPtr, sc2_handle);
-			uint32_t string_flags = ReadUInt(stringPtr + 4,sc2_handle);
-
-			// Some strings are actually stored else where in memory
-			uint32_t stringDataPtr = stringPtr+8;
-			if (string_flags & 4) {
-				stringDataPtr = ReadUInt(stringDataPtr,sc2_handle);
-			}
-
-			char* name = ReadString(stringDataPtr, stringLength, sc2_handle);
-			if (strlen(name) != 0) {
-				fprintf(out, "%d,%s\n", id, name);
-			}
-			free(name);
-		}
-	}
-}
-
-char* ReadString(uint32_t address, uint32_t length, HANDLE sc2_handle) {
-	char* result = (char*)malloc(length+1);
-	memset(result, 0, length+1);
-	ReadProcessMemory(sc2_handle, (LPCVOID)address, result, length, 0);
-	return result;
-}
-
-uint32_t ReadUInt(uint32_t address, HANDLE sc2_handle) {
-  uint32_t result = 0;
-  ReadProcessMemory(sc2_handle, (LPCVOID)address, &result, sizeof(uint32_t), 0);
-  return result;
-}
-
-uint32_t GetModuleBase(DWORD procId, char* modName)
-{
-  HANDLE snapshot;
-  MODULEENTRY32 modInfo;
-  snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, procId);
-  modInfo.dwSize = sizeof(MODULEENTRY32);
-
-  if (Module32First(snapshot, &modInfo))
-  {
-    // printf("mod %s\n", modInfo.szModule);
-    if (!strcmp(modInfo.szModule, modName))
-    {
-      CloseHandle(snapshot);
-      return (uint32_t)modInfo.modBaseAddr;
-    }
-
-    while (Module32Next(snapshot, &modInfo))
-    {
-      // printf("mod %s\n", modInfo.szModule);
-      if (!strcmp(modInfo.szModule, modName))
-      {
-        CloseHandle(snapshot);
-        return (uint32_t)modInfo.modBaseAddr;
-      }
-    }
-  }
-  CloseHandle(snapshot);
-  return 0;
-}
-
-char* getSC2Info(HANDLE sc2_handle, uint32_t &base_address, uint32_t &build) {
-	char* sc2_exe_path = (char*)malloc(MAX_PROC_NAME_SIZE);
-	if(GetModuleFileNameEx(sc2_handle, 0, sc2_exe_path, MAX_PROC_NAME_SIZE)==0) {
-		printf("ERROR %d: Unable to retrieve executable file name", GetLastError());
-		return NULL;
-	}
-
-	DWORD infoSize = GetFileVersionInfoSize(sc2_exe_path, 0);
-	void *infoBuffer = malloc(infoSize);
-	VS_FIXEDFILEINFO *sc2VersionInfo;
-
-	GetFileVersionInfo(sc2_exe_path, 0, infoSize, infoBuffer);
-	VerQueryValue(infoBuffer, "\\", (LPVOID*)&sc2VersionInfo, 0);
-	build = sc2VersionInfo->dwFileVersionLS & 0xffff;
-	free(infoBuffer);
-
-	DWORD proc_id = GetProcessId(sc2_handle);
-	base_address = GetModuleBase(proc_id, "SC2.exe");
-	return sc2_exe_path;
-}
-
-HANDLE getSC2Handle() {	
-	DWORD bytes_returned = 0;
-	DWORD proc_ids[MAX_PROC_LIST_SIZE]; // Should be large enough
-	if (EnumProcesses(proc_ids, MAX_PROC_LIST_SIZE, &bytes_returned)!=0) {
-		char buf[MAX_PROC_NAME_SIZE];
-		DWORD proc_count = bytes_returned/sizeof(DWORD);
-		for (DWORD i=0; i < proc_count; i++) {
-			DWORD proc_id = proc_ids[i];
-			HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, 0, proc_id);
-			if (handle != NULL) {
-				if(GetModuleBaseName(handle, 0, buf, MAX_PROC_NAME_SIZE)!=0 && strcmp(buf, "SC2.exe")==0) {
-					return handle;
-				} else {
-					CloseHandle(handle);
-				}
-			}
-		}
-    } else {
-		printf("Error %d: Unable to enumerate processes.\n",GetLastError());
-    }
-	return NULL;
-}
+/* Dump type ids for Units and Abils for SC2.
+ *
+ * Authors: Robert Nix (@mischanix), Graylin Kim (@GraylinKim)
+ *
+ * to compile with mingw-w64-x86_64-clang:
+ *   clang -Wextra -Wall -Werror -O3 sc2dump.cpp -static -lversion -lpsapi
+ *
+ * Must be linked with the Microsoft Version.lib library. If compiling on 32 bit you may require the LAA option.
+ *
+ * Usage: sc2dump.exe <UNIT_DATA_OUTPUT> <ABIL_DATA_OUTPUT>
+ * Example:
+ *
+ *  $ sc2dump.exe 24764/units.csv 24764/abils.csv
+ *  Searching for a live SC2 process.
+ *
+ *  Found SC2.exe
+ *      Path: C:\Program Files (x86)\StarCraft II 2012 Beta\Versions\Base24764\SC2.exe
+ *      Base Address: 590000
+ *      Build: 24764
+ *
+ *  Dumping Catalog@0x7903b54
+ *      Dumping CAbil@0x790b7f4 to 24764/24764_abils.csv
+ *      Dumping CUnit@0x791f864 to 24764/24764_units.csv
+ *
+ *  Done.
+ *
+ */
+
+#include <Windows.h>
+#include <psapi.h>
+#include <TlHelp32.h>
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#define MODULE_NAME "SC2_x64.exe"
+typedef uint64_t rptr_t;
+#define PTR(x) (const void *)(x)
+
+HANDLE sc2_handle;
+
+char* ReadString(rptr_t address, uint32_t length) {
+	char* result = (char*)malloc(length+1);
+	memset(result, 0, length+1);
+	ReadProcessMemory(sc2_handle, PTR(address), result, length, 0);
+	return result;
+}
+
+uint32_t ReadUInt(rptr_t address) {
+	uint32_t result = 0;
+	ReadProcessMemory(sc2_handle, PTR(address), &result, sizeof(uint32_t), 0);
+	return result;
+}
+
+rptr_t ReadPtr(rptr_t address) {
+	rptr_t result = 0;
+	ReadProcessMemory(sc2_handle, PTR(address), &result, sizeof(rptr_t), 0);
+	return result;
+}
+
+void DumpIds(rptr_t catalogRecordList, rptr_t stringNameOffset, FILE* out) {
+	rptr_t recordsList = ReadPtr(catalogRecordList + 0x48);
+	if (recordsList == 0) {
+		printf("-- Error dumping table@%p: no list of catalog records found.\n", PTR(catalogRecordList));
+		return;
+	}
+
+	uint32_t numEntries = ReadUInt(catalogRecordList + 0x38);
+	printf("%u %p\n", numEntries, PTR(recordsList));
+	for (uint32_t id = 0; id < numEntries; id++) {
+		rptr_t recordPtr = ReadPtr(recordsList + sizeof(rptr_t) * id);
+		if (recordPtr != 0) {
+			rptr_t stringPtr = ReadPtr(ReadPtr(recordPtr + stringNameOffset) + 0x20) + 0x18;
+			uint32_t stringLength = ReadUInt(stringPtr) >> 2;
+			uint32_t stringFlags = ReadUInt(stringPtr + 4);
+
+			// Strings are either inline or a pointer depending on length:
+			rptr_t stringDataPtr = stringPtr + 8;
+			if (stringFlags & 2) {
+				stringDataPtr = ReadPtr(stringDataPtr);
+			}
+
+			char* name = ReadString(stringDataPtr, stringLength);
+			if (strlen(name) != 0) {
+				fprintf(out, "%d,%s\n", id, name);
+			}
+			free(name);
+		}
+	}
+}
+
+rptr_t GetModuleBase(DWORD procId, const char* modName)
+{
+	HANDLE snapshot;
+	MODULEENTRY32 modInfo;
+	snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, procId);
+	modInfo.dwSize = sizeof(MODULEENTRY32);
+
+	if (Module32First(snapshot, &modInfo))
+	{
+		if (!strcmp(modInfo.szModule, modName))
+		{
+			CloseHandle(snapshot);
+			return (rptr_t)(uintptr_t)modInfo.modBaseAddr;
+		}
+
+		while (Module32Next(snapshot, &modInfo))
+		{
+			if (!strcmp(modInfo.szModule, modName))
+			{
+				CloseHandle(snapshot);
+				return (rptr_t)(uintptr_t)modInfo.modBaseAddr;
+			}
+		}
+	}
+	CloseHandle(snapshot);
+	return 0;
+}
+
+char* getSC2Info(rptr_t &base_address, uint32_t &build) {
+	char* sc2_exe_path = (char*)malloc(512);
+	if(GetModuleFileNameEx(sc2_handle, 0, sc2_exe_path, 512)==0) {
+		printf("ERROR %lu: Unable to retrieve executable file name", GetLastError());
+		return NULL;
+	}
+
+	DWORD infoSize = GetFileVersionInfoSize(sc2_exe_path, 0);
+	void *infoBuffer = malloc(infoSize);
+	VS_FIXEDFILEINFO *sc2VersionInfo;
+
+	GetFileVersionInfo(sc2_exe_path, 0, infoSize, infoBuffer);
+	VerQueryValue(infoBuffer, "\\", (LPVOID*)&sc2VersionInfo, 0);
+	build = sc2VersionInfo->dwFileVersionLS & 0xffff;
+	free(infoBuffer);
+
+	DWORD proc_id = GetProcessId(sc2_handle);
+	base_address = GetModuleBase(proc_id, MODULE_NAME);
+	return sc2_exe_path;
+}
+
+HANDLE getSC2Handle() {
+	DWORD bytes_returned = 0;
+	DWORD proc_ids[2048]; // Should be large enough
+	if (EnumProcesses(proc_ids, 2048, &bytes_returned)!=0) {
+		char buf[512];
+		DWORD proc_count = bytes_returned/sizeof(DWORD);
+		for (DWORD i=0; i < proc_count; i++) {
+			DWORD proc_id = proc_ids[i];
+			HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, 0, proc_id);
+			if (handle != NULL) {
+				if(GetModuleBaseName(handle, 0, buf, 512)!=0 && strcmp(buf, MODULE_NAME)==0) {
+					return handle;
+				} else {
+					CloseHandle(handle);
+				}
+			}
+		}
+	} else {
+		printf("Error %lu: Unable to enumerate processes.\n", GetLastError());
+	}
+	return NULL;
+}
+
+int main(int argc, char *argv[]) {
+	if (argc < 3) {
+		printf("Both unit and ability output files are required (in that order).\n");
+		ExitProcess(1);
+	}
+
+	char *units_filename = argv[1];
+	char *abils_filename = argv[2];
+
+	printf("Searching for a live SC2 process.\n");
+	sc2_handle = getSC2Handle();
+	if (sc2_handle == NULL) {
+		printf("Error: " MODULE_NAME " not found\n");
+		ExitProcess(1);
+	}
+
+	uint32_t build;
+	rptr_t base_address;
+	char* sc2_exe_path = getSC2Info(base_address, build);
+	if (sc2_exe_path == NULL) {
+		printf("Error: Unable to acquire base address and build information.\n");
+		ExitProcess(1);
+	} else {
+		printf("\nFound " MODULE_NAME "\n");
+		printf("  Path: %s\n", sc2_exe_path);
+		printf("  Base Address: %p\n", PTR(base_address));
+		printf("  Build: %d\n", build);
+	}
+
+	rptr_t gameCatalog = 0;
+	uint32_t cUnitIndex = 0;
+	uint32_t stringNameOffset = 0;
+	switch(build) {
+	case 37164: // LotV beta 2.5.5.37164
+		gameCatalog = 0x3E7DC58u;
+		cUnitIndex = 0x280u;
+		stringNameOffset = 0x70u;
+		break;
+	default:
+		printf("Error: Missing offset values for build %d\n", build);
+		ExitProcess(1);
+	}
+
+	rptr_t gameCatalogTable = ReadPtr(base_address + gameCatalog);
+	printf("\nDumping Catalog@0x%p\n", PTR(gameCatalogTable));
+
+	FILE* abils_file;
+	if (fopen_s(&abils_file, abils_filename, "w") == 0) {
+		rptr_t abilCatalogList = ReadPtr(gameCatalogTable + 0x8);
+		printf("  Dumping CAbil@0x%p to %s\n", PTR(abilCatalogList), abils_filename);
+		DumpIds(abilCatalogList, stringNameOffset, abils_file);
+		fclose(abils_file);
+	} else {
+		printf("  ERROR: Could not open %s for writing\n", abils_filename);
+	}
+
+	FILE* units_file;
+	if (fopen_s(&units_file, units_filename, "w") == 0) {
+		rptr_t unitCatalogList = ReadPtr(gameCatalogTable + cUnitIndex);
+		printf("  Dumping CUnit@0x%p to %s\n", PTR(unitCatalogList), units_filename);
+		DumpIds(unitCatalogList, stringNameOffset, units_file);
+		fclose(units_file);
+	} else {
+		printf("  ERROR: Could not open %s for writing.\n", units_filename);
+	}
+
+	printf("\nDone.\n");
+	CloseHandle(sc2_handle);
+	return 0;
+}
diff --git a/sc2reader/data/HOWTO b/sc2reader/data/HOWTO
new file mode 100644
index 00000000..ba734b5b
--- /dev/null
+++ b/sc2reader/data/HOWTO
@@ -0,0 +1,18 @@
+Sometimes when a new version comes out, such as (3.4.0) 44401, Bliz will update the ids used to identify units and abilities.
+
+See dsjoerg's commits on Jul 13, 2016 to see what you need to modify to handle something like that: https://github.com/ggtracker/sc2reader/commits/upstream
+
+1 use the Galaxy Editor and Export Balance Data.
+2 To create the ability CSV file: ```find Balance\ Data -print0 | xargs -0 grep -h '<ability' | sort | uniq  | tr '="' ' ' | awk -v OFS=',' '{print $5, $3}' | sort -n```
+3 To create the unit CSV file:
+```
+import os
+from xml.etree import ElementTree
+balancedir = '/foo/bar/Balance Data'
+for i in os.listdir(balancedir):
+    if i.endswith(".xml"):
+      xml = ElementTree.parse(open(os.path.join(balancedir, i), 'r'))
+      print "{},{}".format(xml.findall('meta')[0].attrib['index'], xml.getroot().attrib['id'])
+```
+4 run `sc2reader/new_units.py` to find out what you need to add to `sc2reader/data/ability_lookup.csv`, and add it
+5 modify `sc2reader/data/__init__.py` and `sc2reader/resources.py` accordingly
diff --git a/sc2reader/data/LotV/44401_abilities.csv b/sc2reader/data/LotV/44401_abilities.csv
new file mode 100755
index 00000000..9f57e17e
--- /dev/null
+++ b/sc2reader/data/LotV/44401_abilities.csv
@@ -0,0 +1,338 @@
+0,CAbil
+1,CAbilEffect
+2,CAbilQueueable
+3,CAbilProgress
+4,CAbilRedirect
+5,CAbilArmMagazine
+6,CAbilAttack
+7,CAbilAugment
+8,CAbilBattery
+9,CAbilBeacon
+10,CAbilBehavior
+11,CAbilBuild
+12,CAbilBuildable
+13,CAbilEffectInstant
+14,CAbilEffectTarget
+15,CAbilHarvest
+16,CAbilInteract
+17,CAbilInventory
+18,CAbilLearn
+19,CAbilMerge
+20,CAbilMergeable
+21,CAbilMorph
+22,CAbilMorphPlacement
+23,CAbilMove
+24,CAbilPawn
+25,CAbilQueue
+26,CAbilRally
+27,CAbilResearch
+28,CAbilRevive
+29,CAbilSpecialize
+30,CAbilStop
+31,CAbilTrain
+32,CAbilTransport
+33,CAbilWarpable
+34,CAbilWarpTrain
+35,Taunt
+36,stop
+38,move
+45,attack
+58,SalvageShared
+60,GhostHoldFire
+61,GhostWeaponsFree
+63,Explode
+65,FungalGrowth
+66,GuardianShield
+67,MULERepair
+70,Feedback
+72,PlacePointDefenseDrone
+73,HallucinationArchon
+74,HallucinationColossus
+75,HallucinationHighTemplar
+76,HallucinationImmortal
+77,HallucinationPhoenix
+78,HallucinationProbe
+79,HallucinationStalker
+80,HallucinationVoidRay
+81,HallucinationWarpPrism
+82,HallucinationZealot
+83,MULEGather
+84,SeekerMissile
+85,CalldownMULE
+86,GravitonBeam
+90,SpawnChangeling
+97,Rally
+98,ProgressRally
+99,RallyCommand
+100,RallyNexus
+101,RallyHatchery
+104,InfestedTerrans
+105,NeuralParasite
+106,SpawnLarva
+107,StimpackMarauder
+108,SupplyDrop
+111,TimeWarp
+114,SCVHarvest
+115,ProbeHarvest
+117,que1
+118,que5
+119,que5CancelToSelection
+121,que5Addon
+122,BuildInProgress
+123,Repair
+126,Stimpack
+127,GhostCloak
+129,MedivacHeal
+130,SiegeMode
+131,Unsiege
+132,BansheeCloak
+133,MedivacTransport
+134,ScannerSweep
+135,Yamato
+136,AssaultMode
+137,FighterMode
+138,BunkerTransport
+139,CommandCenterTransport
+140,CommandCenterLiftOff
+141,CommandCenterLand
+143,BarracksLiftOff
+145,FactoryLiftOff
+147,StarportLiftOff
+148,FactoryLand
+149,StarportLand
+151,BarracksLand
+152,SupplyDepotLower
+153,SupplyDepotRaise
+166,WarpPrismTransport
+171,PsiStorm
+172,HangarQueue5
+179,DroneHarvest
+181,UpgradeToLair
+182,UpgradeToHive
+183,UpgradeToGreaterSpire
+189,MorphToBroodLord
+190,BurrowBanelingDown
+191,BurrowBanelingUp
+192,BurrowDroneDown
+193,BurrowDroneUp
+194,BurrowHydraliskDown
+195,BurrowHydraliskUp
+196,BurrowRoachDown
+197,BurrowRoachUp
+198,BurrowZerglingDown
+199,BurrowZerglingUp
+200,BurrowInfestorTerranDown
+201,BurrowInfestorTerranUp
+202,RedstoneLavaCritterBurrow
+203,RedstoneLavaCritterInjuredBurrow
+204,RedstoneLavaCritterUnburrow
+205,RedstoneLavaCritterInjuredUnburrow
+206,OverlordTransport
+210,BurrowQueenDown
+211,BurrowQueenUp
+212,NydusCanalTransport
+213,Blink
+214,BurrowInfestorDown
+215,BurrowInfestorUp
+216,MorphToOverseer
+217,UpgradeToPlanetaryFortress
+220,BurrowUltraliskDown
+221,BurrowUltraliskUp
+222,UpgradeToOrbital
+223,UpgradeToWarpGate
+224,MorphBackToGateway
+225,OrbitalLiftOff
+226,OrbitalCommandLand
+227,ForceField
+228,PhasingMode
+229,TransportMode
+233,TacNukeStrike
+236,EMP
+240,Transfusion
+249,AttackRedirect
+250,StimpackRedirect
+251,StimpackMarauderRedirect
+253,StopRedirect
+254,GenerateCreep
+256,SpineCrawlerUproot
+257,SporeCrawlerUproot
+258,SpineCrawlerRoot
+259,SporeCrawlerRoot
+261,BuildAutoTurret
+262,ArchonWarp
+265,Charge
+269,Contaminate
+272,que5Passive
+273,que5PassiveCancelToSelection
+301,DigesterCreepSpray
+305,MorphToMothership
+330,XelNagaHealingShrine
+339,MothershipCoreMassRecall
+341,MorphToHellion
+351,MorphToHellionTank
+359,MorphToSwarmHostBurrowedMP
+360,MorphToSwarmHostMP
+362,attackProtossBuilding
+364,stopProtossBuilding
+365,BlindingCloud
+367,Yoink
+370,ViperConsumeStructure
+373,TestZerg
+374,VolatileBurstBuilding
+381,WidowMineBurrow
+382,WidowMineUnburrow
+383,WidowMineAttack
+384,TornadoMissile
+388,BurrowLurkerMPDown
+389,BurrowLurkerMPUp
+390,UpgradeToLurkerDenMP
+391,HallucinationOracle
+392,MedivacSpeedBoost
+393,ExtendingBridgeNEWide8Out
+394,ExtendingBridgeNEWide8
+395,ExtendingBridgeNWWide8Out
+396,ExtendingBridgeNWWide8
+397,ExtendingBridgeNEWide10Out
+398,ExtendingBridgeNEWide10
+399,ExtendingBridgeNWWide10Out
+400,ExtendingBridgeNWWide10
+401,ExtendingBridgeNEWide12Out
+402,ExtendingBridgeNEWide12
+403,ExtendingBridgeNWWide12Out
+404,ExtendingBridgeNWWide12
+406,CritterFlee
+407,OracleRevelation
+415,MothershipCorePurifyNexus
+416,XelNaga_Caverns_DoorE
+417,XelNaga_Caverns_DoorEOpened
+418,XelNaga_Caverns_DoorN
+419,XelNaga_Caverns_DoorNE
+420,XelNaga_Caverns_DoorNEOpened
+421,XelNaga_Caverns_DoorNOpened
+422,XelNaga_Caverns_DoorNW
+423,XelNaga_Caverns_DoorNWOpened
+424,XelNaga_Caverns_DoorS
+425,XelNaga_Caverns_DoorSE
+426,XelNaga_Caverns_DoorSEOpened
+427,XelNaga_Caverns_DoorSOpened
+428,XelNaga_Caverns_DoorSW
+429,XelNaga_Caverns_DoorSWOpened
+430,XelNaga_Caverns_DoorW
+431,XelNaga_Caverns_DoorWOpened
+432,XelNaga_Caverns_Floating_BridgeNE8Out
+433,XelNaga_Caverns_Floating_BridgeNE8
+434,XelNaga_Caverns_Floating_BridgeNW8Out
+435,XelNaga_Caverns_Floating_BridgeNW8
+436,XelNaga_Caverns_Floating_BridgeNE10Out
+437,XelNaga_Caverns_Floating_BridgeNE10
+438,XelNaga_Caverns_Floating_BridgeNW10Out
+439,XelNaga_Caverns_Floating_BridgeNW10
+440,XelNaga_Caverns_Floating_BridgeNE12Out
+441,XelNaga_Caverns_Floating_BridgeNE12
+442,XelNaga_Caverns_Floating_BridgeNW12Out
+443,XelNaga_Caverns_Floating_BridgeNW12
+444,XelNaga_Caverns_Floating_BridgeH8Out
+445,XelNaga_Caverns_Floating_BridgeH8
+446,XelNaga_Caverns_Floating_BridgeV8Out
+447,XelNaga_Caverns_Floating_BridgeV8
+448,XelNaga_Caverns_Floating_BridgeH10Out
+449,XelNaga_Caverns_Floating_BridgeH10
+450,XelNaga_Caverns_Floating_BridgeV10Out
+451,XelNaga_Caverns_Floating_BridgeV10
+452,XelNaga_Caverns_Floating_BridgeH12Out
+453,XelNaga_Caverns_Floating_BridgeH12
+454,XelNaga_Caverns_Floating_BridgeV12Out
+455,XelNaga_Caverns_Floating_BridgeV12
+456,TemporalField
+480,SnowRefinery_Terran_ExtendingBridgeNEShort8Out
+481,SnowRefinery_Terran_ExtendingBridgeNEShort8
+482,SnowRefinery_Terran_ExtendingBridgeNWShort8Out
+483,SnowRefinery_Terran_ExtendingBridgeNWShort8
+497,CausticSpray
+499,ImmortalOverload
+500,MorphToRavager
+501,MorphToLurker
+503,ReleaseInterceptors
+504,RavagerCorrosiveBile
+505,BurrowRavagerDown
+506,BurrowRavagerUp
+508,PurificationNovaTargeted
+510,LockOn
+512,LockOnCancel
+514,Hyperjump
+516,ThorAPMode
+517,ThorNormalMode
+519,MothershipMassRecall
+520,NydusWormTransport
+521,OracleWeapon
+527,LocustMPFlyingSwoop
+528,HallucinationDisruptor
+529,HallucinationAdept
+530,VoidRaySwarmDamageBoost
+531,SeekerDummyChannel
+532,AiurLightBridgeNE8Out
+533,AiurLightBridgeNE8
+534,AiurLightBridgeNE10Out
+535,AiurLightBridgeNE10
+536,AiurLightBridgeNE12Out
+537,AiurLightBridgeNE12
+538,AiurLightBridgeNW8Out
+539,AiurLightBridgeNW8
+540,AiurLightBridgeNW10Out
+541,AiurLightBridgeNW10
+542,AiurLightBridgeNW12Out
+543,AiurLightBridgeNW12
+556,ShakurasLightBridgeNE8Out
+557,ShakurasLightBridgeNE8
+558,ShakurasLightBridgeNE10Out
+559,ShakurasLightBridgeNE10
+560,ShakurasLightBridgeNE12Out
+561,ShakurasLightBridgeNE12
+562,ShakurasLightBridgeNW8Out
+563,ShakurasLightBridgeNW8
+564,ShakurasLightBridgeNW10Out
+565,ShakurasLightBridgeNW10
+566,ShakurasLightBridgeNW12Out
+567,ShakurasLightBridgeNW12
+568,VoidMPImmortalReviveRebuild
+570,ArbiterMPStasisField
+571,ArbiterMPRecall
+572,CorsairMPDisruptionWeb
+573,MorphToGuardianMP
+574,MorphToDevourerMP
+575,DefilerMPConsume
+576,DefilerMPDarkSwarm
+577,DefilerMPPlague
+578,DefilerMPBurrow
+579,DefilerMPUnburrow
+580,QueenMPEnsnare
+581,QueenMPSpawnBroodlings
+582,QueenMPInfestCommandCenter
+590,ParasiticBomb
+591,AdeptPhaseShift
+594,LurkerHoldFire
+595,LurkerRemoveHoldFire
+598,LiberatorAGTarget
+599,LiberatorAATarget
+601,AiurLightBridgeAbandonedNE8Out
+602,AiurLightBridgeAbandonedNE8
+603,AiurLightBridgeAbandonedNE10Out
+604,AiurLightBridgeAbandonedNE10
+605,AiurLightBridgeAbandonedNE12Out
+606,AiurLightBridgeAbandonedNE12
+607,AiurLightBridgeAbandonedNW8Out
+608,AiurLightBridgeAbandonedNW8
+609,AiurLightBridgeAbandonedNW10Out
+610,AiurLightBridgeAbandonedNW10
+611,AiurLightBridgeAbandonedNW12Out
+612,AiurLightBridgeAbandonedNW12
+613,KD8Charge
+616,AdeptPhaseShiftCancel
+617,AdeptShadePhaseShiftCancel
+618,SlaynElementalGrab
+623,SpawnLocustsTargeted
+625,MorphToTransportOverlord
+628,ChannelSnipe
+650,PowerSourceFast
+1795,WidowMineArmed
+2280,IsTransportOverlord
diff --git a/sc2reader/data/LotV/44401_units.csv b/sc2reader/data/LotV/44401_units.csv
new file mode 100755
index 00000000..ce3f67b3
--- /dev/null
+++ b/sc2reader/data/LotV/44401_units.csv
@@ -0,0 +1,830 @@
+1,System_Snapshot_Dummy
+7,DESTRUCTIBLE
+8,ITEM
+9,POWERUP
+10,SMCAMERA
+11,SMCHARACTER
+12,STARMAP
+13,SMSET
+14,MISSILE
+15,MISSILE_INVULNERABLE
+16,MISSILE_HALFLIFE
+17,PLACEHOLDER
+18,PLACEHOLDER_AIR
+19,PATHINGBLOCKER
+20,BEACON
+21,Ball
+22,StereoscopicOptionsUnit
+23,Colossus
+24,TechLab
+25,Reactor
+27,InfestorTerran
+28,BanelingCocoon
+29,Baneling
+30,Mothership
+31,PointDefenseDrone
+32,Changeling
+33,ChangelingZealot
+34,ChangelingMarineShield
+35,ChangelingMarine
+36,ChangelingZerglingWings
+37,ChangelingZergling
+39,CommandCenter
+40,SupplyDepot
+41,Refinery
+42,Barracks
+43,EngineeringBay
+44,MissileTurret
+45,Bunker
+46,SensorTower
+47,GhostAcademy
+48,Factory
+49,Starport
+51,Armory
+52,FusionCore
+53,AutoTurret
+54,SiegeTankSieged
+55,SiegeTank
+56,VikingAssault
+57,VikingFighter
+58,CommandCenterFlying
+59,BarracksTechLab
+60,BarracksReactor
+61,FactoryTechLab
+62,FactoryReactor
+63,StarportTechLab
+64,StarportReactor
+65,FactoryFlying
+66,StarportFlying
+67,SCV
+68,BarracksFlying
+69,SupplyDepotLowered
+70,Marine
+71,Reaper
+72,Ghost
+73,Marauder
+74,Thor
+75,Hellion
+76,Medivac
+77,Banshee
+78,Raven
+79,Battlecruiser
+80,Nuke
+81,Nexus
+82,Pylon
+83,Assimilator
+84,Gateway
+85,Forge
+86,FleetBeacon
+87,TwilightCouncil
+88,PhotonCannon
+89,Stargate
+90,TemplarArchive
+91,DarkShrine
+92,RoboticsBay
+93,RoboticsFacility
+94,CyberneticsCore
+95,Zealot
+96,Stalker
+97,HighTemplar
+98,DarkTemplar
+99,Sentry
+100,Phoenix
+101,Carrier
+102,VoidRay
+103,WarpPrism
+104,Observer
+105,Immortal
+106,Probe
+107,Interceptor
+108,Hatchery
+109,CreepTumor
+110,Extractor
+111,SpawningPool
+112,EvolutionChamber
+113,HydraliskDen
+114,Spire
+115,UltraliskCavern
+116,InfestationPit
+117,NydusNetwork
+118,BanelingNest
+119,RoachWarren
+120,SpineCrawler
+121,SporeCrawler
+122,Lair
+123,Hive
+124,GreaterSpire
+125,Egg
+126,Drone
+127,Zergling
+128,Overlord
+129,Hydralisk
+130,Mutalisk
+131,Ultralisk
+132,Roach
+133,Infestor
+134,Corruptor
+135,BroodLordCocoon
+136,BroodLord
+137,BanelingBurrowed
+138,DroneBurrowed
+139,HydraliskBurrowed
+140,RoachBurrowed
+141,ZerglingBurrowed
+142,InfestorTerranBurrowed
+143,RedstoneLavaCritterBurrowed
+144,RedstoneLavaCritterInjuredBurrowed
+145,RedstoneLavaCritter
+146,RedstoneLavaCritterInjured
+147,QueenBurrowed
+148,Queen
+149,InfestorBurrowed
+150,OverlordCocoon
+151,Overseer
+152,PlanetaryFortress
+153,UltraliskBurrowed
+154,OrbitalCommand
+155,WarpGate
+156,OrbitalCommandFlying
+157,ForceField
+158,WarpPrismPhasing
+159,CreepTumorBurrowed
+160,CreepTumorQueen
+161,SpineCrawlerUprooted
+162,SporeCrawlerUprooted
+163,Archon
+164,NydusCanal
+165,BroodlingEscort
+166,GhostAlternate
+167,GhostNova
+168,RichMineralField
+169,RichMineralField750
+171,XelNagaTower
+175,InfestedTerransEgg
+176,Larva
+177,ReaperPlaceholder
+178,MarineACGluescreenDummy
+179,FirebatACGluescreenDummy
+180,MedicACGluescreenDummy
+181,MarauderACGluescreenDummy
+182,VultureACGluescreenDummy
+183,SiegeTankACGluescreenDummy
+184,VikingACGluescreenDummy
+185,BansheeACGluescreenDummy
+186,BattlecruiserACGluescreenDummy
+187,OrbitalCommandACGluescreenDummy
+188,BunkerACGluescreenDummy
+189,MissileTurretACGluescreenDummy
+190,HellbatACGluescreenDummy
+191,GoliathACGluescreenDummy
+192,CycloneACGluescreenDummy
+193,WraithACGluescreenDummy
+194,ScienceVesselACGluescreenDummy
+195,HerculesACGluescreenDummy
+196,ThorACGluescreenDummy
+197,PerditionTurretACGluescreenDummy
+198,FlamingBettyACGluescreenDummy
+199,DevastationTurretACGluescreenDummy
+200,BlasterBillyACGluescreenDummy
+201,SpinningDizzyACGluescreenDummy
+202,ZerglingKerriganACGluescreenDummy
+203,RaptorACGluescreenDummy
+204,QueenCoopACGluescreenDummy
+205,HydraliskACGluescreenDummy
+206,HydraliskLurkerACGluescreenDummy
+207,MutaliskBroodlordACGluescreenDummy
+208,BroodLordACGluescreenDummy
+209,UltraliskACGluescreenDummy
+210,TorrasqueACGluescreenDummy
+211,OverseerACGluescreenDummy
+212,LurkerACGluescreenDummy
+213,SpineCrawlerACGluescreenDummy
+214,SporeCrawlerACGluescreenDummy
+215,NydusNetworkACGluescreenDummy
+216,OmegaNetworkACGluescreenDummy
+217,ZerglingZagaraACGluescreenDummy
+218,SwarmlingACGluescreenDummy
+219,BanelingACGluescreenDummy
+220,SplitterlingACGluescreenDummy
+221,AberrationACGluescreenDummy
+222,ScourgeACGluescreenDummy
+223,CorruptorACGluescreenDummy
+224,BileLauncherACGluescreenDummy
+225,SwarmQueenACGluescreenDummy
+226,RoachACGluescreenDummy
+227,RoachVileACGluescreenDummy
+228,RavagerACGluescreenDummy
+229,SwarmHostACGluescreenDummy
+230,MutaliskACGluescreenDummy
+231,GuardianACGluescreenDummy
+232,DevourerACGluescreenDummy
+233,ViperACGluescreenDummy
+234,BrutaliskACGluescreenDummy
+235,LeviathanACGluescreenDummy
+236,ZealotACGluescreenDummy
+237,ZealotAiurACGluescreenDummy
+238,DragoonACGluescreenDummy
+239,HighTemplarACGluescreenDummy
+240,ArchonACGluescreenDummy
+241,ImmortalACGluescreenDummy
+242,ObserverACGluescreenDummy
+243,PhoenixAiurACGluescreenDummy
+244,ReaverACGluescreenDummy
+245,TempestACGluescreenDummy
+246,PhotonCannonACGluescreenDummy
+247,ZealotVorazunACGluescreenDummy
+248,ZealotShakurasACGluescreenDummy
+249,StalkerShakurasACGluescreenDummy
+250,DarkTemplarShakurasACGluescreenDummy
+251,CorsairACGluescreenDummy
+252,VoidRayACGluescreenDummy
+253,VoidRayShakurasACGluescreenDummy
+254,OracleACGluescreenDummy
+255,DarkArchonACGluescreenDummy
+256,DarkPylonACGluescreenDummy
+257,ZealotPurifierACGluescreenDummy
+258,SentryPurifierACGluescreenDummy
+259,ImmortalKaraxACGluescreenDummy
+260,ColossusACGluescreenDummy
+261,ColossusPurifierACGluescreenDummy
+262,PhoenixPurifierACGluescreenDummy
+263,CarrierACGluescreenDummy
+264,CarrierAiurACGluescreenDummy
+265,KhaydarinMonolithACGluescreenDummy
+266,ShieldBatteryACGluescreenDummy
+271,NeedleSpinesWeapon
+272,CorruptionWeapon
+273,InfestedTerransWeapon
+274,NeuralParasiteWeapon
+275,PointDefenseDroneReleaseWeapon
+276,HunterSeekerWeapon
+277,MULE
+279,ThorAAWeapon
+280,PunisherGrenadesLMWeapon
+281,VikingFighterWeapon
+282,ATALaserBatteryLMWeapon
+283,ATSLaserBatteryLMWeapon
+284,LongboltMissileWeapon
+285,D8ChargeWeapon
+286,YamatoWeapon
+287,IonCannonsWeapon
+288,AcidSalivaWeapon
+289,SpineCrawlerWeapon
+290,SporeCrawlerWeapon
+291,GlaiveWurmWeapon
+292,GlaiveWurmM2Weapon
+293,GlaiveWurmM3Weapon
+294,StalkerWeapon
+295,EMP2Weapon
+296,BacklashRocketsLMWeapon
+297,PhotonCannonWeapon
+298,ParasiteSporeWeapon
+300,Broodling
+301,BroodLordBWeapon
+304,AutoTurretReleaseWeapon
+305,LarvaReleaseMissile
+306,AcidSpinesWeapon
+307,FrenzyWeapon
+308,ContaminateWeapon
+320,BeaconRally
+321,BeaconArmy
+322,BeaconAttack
+323,BeaconDefend
+324,BeaconHarass
+325,BeaconIdle
+326,BeaconAuto
+327,BeaconDetect
+328,BeaconScout
+329,BeaconClaim
+330,BeaconExpand
+331,BeaconCustom1
+332,BeaconCustom2
+333,BeaconCustom3
+334,BeaconCustom4
+340,Rocks2x2NonConjoined
+341,FungalGrowthMissile
+342,NeuralParasiteTentacleMissile
+343,Beacon_Protoss
+344,Beacon_ProtossSmall
+345,Beacon_Terran
+346,Beacon_TerranSmall
+347,Beacon_Zerg
+348,Beacon_ZergSmall
+349,Lyote
+350,CarrionBird
+351,KarakMale
+352,KarakFemale
+353,UrsadakFemaleExotic
+354,UrsadakMale
+355,UrsadakFemale
+356,UrsadakCalf
+357,UrsadakMaleExotic
+358,UtilityBot
+359,CommentatorBot1
+360,CommentatorBot2
+361,CommentatorBot3
+362,CommentatorBot4
+363,Scantipede
+364,Dog
+365,Sheep
+366,Cow
+367,InfestedTerransEggPlacement
+368,InfestorTerransWeapon
+369,MineralField
+370,VespeneGeyser
+371,SpacePlatformGeyser
+372,RichVespeneGeyser
+373,DestructibleSearchlight
+374,DestructibleBullhornLights
+375,DestructibleStreetlight
+376,DestructibleSpacePlatformSign
+377,DestructibleStoreFrontCityProps
+378,DestructibleBillboardTall
+379,DestructibleBillboardScrollingText
+380,DestructibleSpacePlatformBarrier
+381,DestructibleSignsDirectional
+382,DestructibleSignsConstruction
+383,DestructibleSignsFunny
+384,DestructibleSignsIcons
+385,DestructibleSignsWarning
+386,DestructibleGarage
+387,DestructibleGarageLarge
+388,DestructibleTrafficSignal
+389,TrafficSignal
+390,BraxisAlphaDestructible1x1
+391,BraxisAlphaDestructible2x2
+392,DestructibleDebris4x4
+393,DestructibleDebris6x6
+394,DestructibleRock2x4Vertical
+395,DestructibleRock2x4Horizontal
+396,DestructibleRock2x6Vertical
+397,DestructibleRock2x6Horizontal
+398,DestructibleRock4x4
+399,DestructibleRock6x6
+400,DestructibleRampDiagonalHugeULBR
+401,DestructibleRampDiagonalHugeBLUR
+402,DestructibleRampVerticalHuge
+403,DestructibleRampHorizontalHuge
+404,DestructibleDebrisRampDiagonalHugeULBR
+405,DestructibleDebrisRampDiagonalHugeBLUR
+406,OverlordGenerateCreepKeybind
+407,MengskStatueAlone
+408,MengskStatue
+409,WolfStatue
+410,GlobeStatue
+411,Weapon
+412,GlaiveWurmBounceWeapon
+413,BroodLordWeapon
+414,BroodLordAWeapon
+415,CreepBlocker1x1
+416,PermanentCreepBlocker1x1
+417,PathingBlocker1x1
+418,PathingBlocker2x2
+419,AutoTestAttackTargetGround
+420,AutoTestAttackTargetAir
+421,AutoTestAttacker
+422,HelperEmitterSelectionArrow
+423,MultiKillObject
+424,ShapeGolfball
+425,ShapeCone
+426,ShapeCube
+427,ShapeCylinder
+428,ShapeDodecahedron
+429,ShapeIcosahedron
+430,ShapeOctahedron
+431,ShapePyramid
+432,ShapeRoundedCube
+433,ShapeSphere
+434,ShapeTetrahedron
+435,ShapeThickTorus
+436,ShapeThinTorus
+437,ShapeTorus
+438,Shape4PointStar
+439,Shape5PointStar
+440,Shape6PointStar
+441,Shape8PointStar
+442,ShapeArrowPointer
+443,ShapeBowl
+444,ShapeBox
+445,ShapeCapsule
+446,ShapeCrescentMoon
+447,ShapeDecahedron
+448,ShapeDiamond
+449,ShapeFootball
+450,ShapeGemstone
+451,ShapeHeart
+452,ShapeJack
+453,ShapePlusSign
+454,ShapeShamrock
+455,ShapeSpade
+456,ShapeTube
+457,ShapeEgg
+458,ShapeYenSign
+459,ShapeX
+460,ShapeWatermelon
+461,ShapeWonSign
+462,ShapeTennisball
+463,ShapeStrawberry
+464,ShapeSmileyFace
+465,ShapeSoccerball
+466,ShapeRainbow
+467,ShapeSadFace
+468,ShapePoundSign
+469,ShapePear
+470,ShapePineapple
+471,ShapeOrange
+472,ShapePeanut
+473,ShapeO
+474,ShapeLemon
+475,ShapeMoneyBag
+476,ShapeHorseshoe
+477,ShapeHockeyStick
+478,ShapeHockeyPuck
+479,ShapeHand
+480,ShapeGolfClub
+481,ShapeGrape
+482,ShapeEuroSign
+483,ShapeDollarSign
+484,ShapeBasketball
+485,ShapeCarrot
+486,ShapeCherry
+487,ShapeBaseball
+488,ShapeBaseballBat
+489,ShapeBanana
+490,ShapeApple
+491,ShapeCashLarge
+492,ShapeCashMedium
+493,ShapeCashSmall
+494,ShapeFootballColored
+495,ShapeLemonSmall
+496,ShapeOrangeSmall
+497,ShapeTreasureChestOpen
+498,ShapeTreasureChestClosed
+499,ShapeWatermelonSmall
+500,UnbuildableRocksDestructible
+501,UnbuildableBricksDestructible
+502,UnbuildablePlatesDestructible
+503,Debris2x2NonConjoined
+504,EnemyPathingBlocker1x1
+505,EnemyPathingBlocker2x2
+506,EnemyPathingBlocker4x4
+507,EnemyPathingBlocker8x8
+508,EnemyPathingBlocker16x16
+509,ScopeTest
+510,SentryACGluescreenDummy
+511,MineralField750
+527,HellionTank
+528,CollapsibleTerranTowerDebris
+529,DebrisRampLeft
+530,DebrisRampRight
+531,MothershipCore
+535,LocustMP
+536,CollapsibleRockTowerDebris
+537,NydusCanalAttacker
+538,NydusCanalCreeper
+539,SwarmHostBurrowedMP
+540,SwarmHostMP
+541,Oracle
+542,Tempest
+543,WarHound
+544,WidowMine
+545,Viper
+546,WidowMineBurrowed
+547,LurkerMPEgg
+548,LurkerMP
+549,LurkerMPBurrowed
+550,LurkerDenMP
+551,ExtendingBridgeNEWide8Out
+552,ExtendingBridgeNEWide8
+553,ExtendingBridgeNWWide8Out
+554,ExtendingBridgeNWWide8
+555,ExtendingBridgeNEWide10Out
+556,ExtendingBridgeNEWide10
+557,ExtendingBridgeNWWide10Out
+558,ExtendingBridgeNWWide10
+559,ExtendingBridgeNEWide12Out
+560,ExtendingBridgeNEWide12
+561,ExtendingBridgeNWWide12Out
+562,ExtendingBridgeNWWide12
+564,CollapsibleRockTowerDebrisRampRight
+565,CollapsibleRockTowerDebrisRampLeft
+566,XelNaga_Caverns_DoorE
+567,XelNaga_Caverns_DoorEOpened
+568,XelNaga_Caverns_DoorN
+569,XelNaga_Caverns_DoorNE
+570,XelNaga_Caverns_DoorNEOpened
+571,XelNaga_Caverns_DoorNOpened
+572,XelNaga_Caverns_DoorNW
+573,XelNaga_Caverns_DoorNWOpened
+574,XelNaga_Caverns_DoorS
+575,XelNaga_Caverns_DoorSE
+576,XelNaga_Caverns_DoorSEOpened
+577,XelNaga_Caverns_DoorSOpened
+578,XelNaga_Caverns_DoorSW
+579,XelNaga_Caverns_DoorSWOpened
+580,XelNaga_Caverns_DoorW
+581,XelNaga_Caverns_DoorWOpened
+582,XelNaga_Caverns_Floating_BridgeNE8Out
+583,XelNaga_Caverns_Floating_BridgeNE8
+584,XelNaga_Caverns_Floating_BridgeNW8Out
+585,XelNaga_Caverns_Floating_BridgeNW8
+586,XelNaga_Caverns_Floating_BridgeNE10Out
+587,XelNaga_Caverns_Floating_BridgeNE10
+588,XelNaga_Caverns_Floating_BridgeNW10Out
+589,XelNaga_Caverns_Floating_BridgeNW10
+590,XelNaga_Caverns_Floating_BridgeNE12Out
+591,XelNaga_Caverns_Floating_BridgeNE12
+592,XelNaga_Caverns_Floating_BridgeNW12Out
+593,XelNaga_Caverns_Floating_BridgeNW12
+594,XelNaga_Caverns_Floating_BridgeH8Out
+595,XelNaga_Caverns_Floating_BridgeH8
+596,XelNaga_Caverns_Floating_BridgeV8Out
+597,XelNaga_Caverns_Floating_BridgeV8
+598,XelNaga_Caverns_Floating_BridgeH10Out
+599,XelNaga_Caverns_Floating_BridgeH10
+600,XelNaga_Caverns_Floating_BridgeV10Out
+601,XelNaga_Caverns_Floating_BridgeV10
+602,XelNaga_Caverns_Floating_BridgeH12Out
+603,XelNaga_Caverns_Floating_BridgeH12
+604,XelNaga_Caverns_Floating_BridgeV12Out
+605,XelNaga_Caverns_Floating_BridgeV12
+608,CollapsibleTerranTowerPushUnitRampLeft
+609,CollapsibleTerranTowerPushUnitRampRight
+612,CollapsibleRockTowerPushUnit
+613,CollapsibleTerranTowerPushUnit
+614,CollapsibleRockTowerPushUnitRampRight
+615,CollapsibleRockTowerPushUnitRampLeft
+616,DigesterCreepSprayTargetUnit
+617,DigesterCreepSprayUnit
+618,NydusCanalAttackerWeapon
+619,ViperConsumeStructureWeapon
+622,ResourceBlocker
+623,TempestWeapon
+624,YoinkMissile
+628,YoinkVikingAirMissile
+630,YoinkVikingGroundMissile
+632,YoinkSiegeTankMissile
+634,WarHoundWeapon
+636,EyeStalkWeapon
+639,WidowMineWeapon
+640,WidowMineAirWeapon
+641,MothershipCoreWeaponWeapon
+642,TornadoMissileWeapon
+643,TornadoMissileDummyWeapon
+644,TalonsMissileWeapon
+645,CreepTumorMissile
+646,LocustMPEggAMissileWeapon
+647,LocustMPEggBMissileWeapon
+648,LocustMPWeapon
+650,RepulsorCannonWeapon
+654,CollapsibleRockTowerDiagonal
+655,CollapsibleTerranTowerDiagonal
+656,CollapsibleTerranTowerRampLeft
+657,CollapsibleTerranTowerRampRight
+658,Ice2x2NonConjoined
+659,IceProtossCrates
+660,ProtossCrates
+661,TowerMine
+662,PickupPalletGas
+663,PickupPalletMinerals
+664,PickupScrapSalvage1x1
+665,PickupScrapSalvage2x2
+666,PickupScrapSalvage3x3
+667,RoughTerrain
+668,UnbuildableBricksSmallUnit
+669,UnbuildablePlatesSmallUnit
+670,UnbuildablePlatesUnit
+671,UnbuildableRocksSmallUnit
+672,XelNagaHealingShrine
+673,InvisibleTargetDummy
+674,ProtossVespeneGeyser
+675,CollapsibleRockTower
+676,CollapsibleTerranTower
+677,ThornLizard
+678,CleaningBot
+679,DestructibleRock6x6Weak
+680,ProtossSnakeSegmentDemo
+681,PhysicsCapsule
+682,PhysicsCube
+683,PhysicsCylinder
+684,PhysicsKnot
+685,PhysicsL
+686,PhysicsPrimitives
+687,PhysicsSphere
+688,PhysicsStar
+689,CreepBlocker4x4
+690,DestructibleCityDebris2x4Vertical
+691,DestructibleCityDebris2x4Horizontal
+692,DestructibleCityDebris2x6Vertical
+693,DestructibleCityDebris2x6Horizontal
+694,DestructibleCityDebris4x4
+695,DestructibleCityDebris6x6
+696,DestructibleCityDebrisHugeDiagonalBLUR
+697,DestructibleCityDebrisHugeDiagonalULBR
+698,TestZerg
+699,PathingBlockerRadius1
+700,DestructibleRockEx12x4Vertical
+701,DestructibleRockEx12x4Horizontal
+702,DestructibleRockEx12x6Vertical
+703,DestructibleRockEx12x6Horizontal
+704,DestructibleRockEx14x4
+705,DestructibleRockEx16x6
+706,DestructibleRockEx1DiagonalHugeULBR
+707,DestructibleRockEx1DiagonalHugeBLUR
+708,DestructibleRockEx1VerticalHuge
+709,DestructibleRockEx1HorizontalHuge
+710,DestructibleIce2x4Vertical
+711,DestructibleIce2x4Horizontal
+712,DestructibleIce2x6Vertical
+713,DestructibleIce2x6Horizontal
+714,DestructibleIce4x4
+715,DestructibleIce6x6
+716,DestructibleIceDiagonalHugeULBR
+717,DestructibleIceDiagonalHugeBLUR
+718,DestructibleIceVerticalHuge
+719,DestructibleIceHorizontalHuge
+720,DesertPlanetSearchlight
+721,DesertPlanetStreetlight
+722,UnbuildableBricksUnit
+723,UnbuildableRocksUnit
+724,ZerusDestructibleArch
+725,Artosilope
+726,Anteplott
+727,LabBot
+728,Crabeetle
+729,CollapsibleRockTowerRampRight
+730,CollapsibleRockTowerRampLeft
+731,LabMineralField
+732,LabMineralField750
+748,SnowRefinery_Terran_ExtendingBridgeNEShort8Out
+749,SnowRefinery_Terran_ExtendingBridgeNEShort8
+750,SnowRefinery_Terran_ExtendingBridgeNWShort8Out
+751,SnowRefinery_Terran_ExtendingBridgeNWShort8
+756,Tarsonis_DoorN
+757,Tarsonis_DoorNLowered
+758,Tarsonis_DoorNE
+759,Tarsonis_DoorNELowered
+760,Tarsonis_DoorE
+761,Tarsonis_DoorELowered
+762,Tarsonis_DoorNW
+763,Tarsonis_DoorNWLowered
+764,RavagerCocoon
+765,Ravager
+766,Liberator
+767,RavagerBurrowed
+769,ThorAP
+770,Cyclone
+771,LocustMPFlying
+772,Disruptor
+773,Adept
+774,AiurLightBridgeNE8Out
+775,AiurLightBridgeNE8
+776,AiurLightBridgeNE10Out
+777,AiurLightBridgeNE10
+778,AiurLightBridgeNE12Out
+779,AiurLightBridgeNE12
+780,AiurLightBridgeNW8Out
+781,AiurLightBridgeNW8
+782,AiurLightBridgeNW10Out
+783,AiurLightBridgeNW10
+784,AiurLightBridgeNW12Out
+785,AiurLightBridgeNW12
+786,AiurTempleBridgeNE8Out
+788,AiurTempleBridgeNE10Out
+790,AiurTempleBridgeNE12Out
+792,AiurTempleBridgeNW8Out
+794,AiurTempleBridgeNW10Out
+796,AiurTempleBridgeNW12Out
+798,ShakurasLightBridgeNE8Out
+799,ShakurasLightBridgeNE8
+800,ShakurasLightBridgeNE10Out
+801,ShakurasLightBridgeNE10
+802,ShakurasLightBridgeNE12Out
+803,ShakurasLightBridgeNE12
+804,ShakurasLightBridgeNW8Out
+805,ShakurasLightBridgeNW8
+806,ShakurasLightBridgeNW10Out
+807,ShakurasLightBridgeNW10
+808,ShakurasLightBridgeNW12Out
+809,ShakurasLightBridgeNW12
+810,VoidMPImmortalReviveCorpse
+811,GuardianCocoonMP
+812,GuardianMP
+813,DevourerCocoonMP
+814,DevourerMP
+815,DefilerMPBurrowed
+816,DefilerMP
+817,OracleStasisTrap
+818,DisruptorPhased
+819,LiberatorAG
+820,AiurLightBridgeAbandonedNE8Out
+821,AiurLightBridgeAbandonedNE8
+822,AiurLightBridgeAbandonedNE10Out
+823,AiurLightBridgeAbandonedNE10
+824,AiurLightBridgeAbandonedNE12Out
+825,AiurLightBridgeAbandonedNE12
+826,AiurLightBridgeAbandonedNW8Out
+827,AiurLightBridgeAbandonedNW8
+828,AiurLightBridgeAbandonedNW10Out
+829,AiurLightBridgeAbandonedNW10
+830,AiurLightBridgeAbandonedNW12Out
+831,AiurLightBridgeAbandonedNW12
+832,CollapsiblePurifierTowerDebris
+833,PurifierRichMineralField
+834,PurifierRichMineralField750
+849,CollapsiblePurifierTowerPushUnit
+851,LocustMPPrecursor
+852,ReleaseInterceptorsBeacon
+853,AdeptPhaseShift
+854,RavagerCorrosiveBileMissile
+855,HydraliskImpaleMissile
+856,CycloneMissileLargeAir
+857,CycloneMissile
+858,CycloneMissileLarge
+859,ThorAALance
+860,OracleWeapon
+861,TempestWeaponGround
+862,RavagerWeaponMissile
+863,ScoutMPAirWeaponLeft
+864,ScoutMPAirWeaponRight
+865,ArbiterMPWeaponMissile
+866,GuardianMPWeapon
+867,DevourerMPWeaponMissile
+868,DefilerMPDarkSwarmWeapon
+869,QueenMPEnsnareMissile
+870,QueenMPSpawnBroodlingsMissile
+871,LightningBombWeapon
+872,HERCPlacement
+873,GrappleWeapon
+876,CausticSprayMissile
+877,ParasiticBombMissile
+878,ParasiticBombDummy
+879,AdeptWeapon
+880,AdeptUpgradeWeapon
+881,LiberatorMissile
+882,LiberatorDamageMissile
+883,LiberatorAGMissile
+884,KD8Charge
+885,KD8ChargeWeapon
+887,SlaynElementalGrabWeapon
+888,SlaynElementalGrabAirUnit
+889,SlaynElementalGrabGroundUnit
+890,SlaynElementalWeapon
+894,HERC
+895,Moopy
+896,Replicant
+897,SeekerMissile
+898,AiurTempleBridgeDestructibleNE8Out
+899,AiurTempleBridgeDestructibleNE10Out
+900,AiurTempleBridgeDestructibleNE12Out
+901,AiurTempleBridgeDestructibleNW8Out
+902,AiurTempleBridgeDestructibleNW10Out
+903,AiurTempleBridgeDestructibleNW12Out
+904,AiurTempleBridgeDestructibleSW8Out
+905,AiurTempleBridgeDestructibleSW10Out
+906,AiurTempleBridgeDestructibleSW12Out
+907,AiurTempleBridgeDestructibleSE8Out
+908,AiurTempleBridgeDestructibleSE10Out
+909,AiurTempleBridgeDestructibleSE12Out
+911,FlyoverUnit
+912,CorsairMP
+913,ScoutMP
+915,ArbiterMP
+916,ScourgeMP
+917,DefilerMPPlagueWeapon
+918,QueenMP
+919,XelNagaDestructibleRampBlocker6S
+920,XelNagaDestructibleRampBlocker6SE
+921,XelNagaDestructibleRampBlocker6E
+922,XelNagaDestructibleRampBlocker6NE
+923,XelNagaDestructibleRampBlocker6N
+924,XelNagaDestructibleRampBlocker6NW
+925,XelNagaDestructibleRampBlocker6W
+926,XelNagaDestructibleRampBlocker6SW
+927,XelNagaDestructibleRampBlocker8S
+928,XelNagaDestructibleRampBlocker8SE
+929,XelNagaDestructibleRampBlocker8E
+930,XelNagaDestructibleRampBlocker8NE
+931,XelNagaDestructibleRampBlocker8N
+932,XelNagaDestructibleRampBlocker8NW
+933,XelNagaDestructibleRampBlocker8W
+934,XelNagaDestructibleRampBlocker8SW
+935,ReptileCrate
+936,SlaynSwarmHostSpawnFlyer
+937,SlaynElemental
+938,PurifierVespeneGeyser
+939,ShakurasVespeneGeyser
+940,CollapsiblePurifierTowerDiagonal
+941,CreepOnlyBlocker4x4
+942,PurifierMineralField
+943,PurifierMineralField750
+944,Beacon_Nova
+945,Beacon_NovaSmall
+946,Ursadon
+947,Ursula
+948,TransportOverlordCocoon
+949,OverlordTransport
+950,PylonOvercharged
+951,BypassArmorDrone
+952,AdeptPiercingWeapon
+953,CorrosiveParasiteWeapon
diff --git a/sc2reader/data/__init__.py b/sc2reader/data/__init__.py
index a17bac10..5d2071c9 100755
--- a/sc2reader/data/__init__.py
+++ b/sc2reader/data/__init__.py
@@ -406,7 +406,7 @@ def load_build(expansion, version):
 
 # Load LotV Data
 lotv_builds = dict()
-for version in ('base', ):
+for version in ('base', '44401'):
     lotv_builds[version] = load_build('LotV', version)
 
 datapacks = builds = {'WoL': wol_builds, 'HotS': hots_builds, 'LotV': lotv_builds}
diff --git a/sc2reader/data/ability_lookup.csv b/sc2reader/data/ability_lookup.csv
index bec777b2..96e715c0 100755
--- a/sc2reader/data/ability_lookup.csv
+++ b/sc2reader/data/ability_lookup.csv
@@ -521,3 +521,48 @@ BypassArmorDroneCU,BypassArmorDroneCU
 ChannelSnipe,ChannelSnipe
 LockOnAir,LockOnAir
 PurificationNovaTargetted,PurificationNovaTargetted
+SnowRefinery_Terran_ExtendingBridgeNEShort8Out,SnowRefinery_Terran_ExtendingBridgeNEShort8Out
+SnowRefinery_Terran_ExtendingBridgeNEShort8,SnowRefinery_Terran_ExtendingBridgeNEShort8
+SnowRefinery_Terran_ExtendingBridgeNWShort8Out,SnowRefinery_Terran_ExtendingBridgeNWShort8Out
+SnowRefinery_Terran_ExtendingBridgeNWShort8,SnowRefinery_Terran_ExtendingBridgeNWShort8
+PurificationNovaTargeted,PurificationNovaTargeted
+AiurLightBridgeNE8Out,AiurLightBridgeNE8Out
+AiurLightBridgeNE8,AiurLightBridgeNE8
+AiurLightBridgeNE10Out,AiurLightBridgeNE10Out
+AiurLightBridgeNE10,AiurLightBridgeNE10
+AiurLightBridgeNE12Out,AiurLightBridgeNE12Out
+AiurLightBridgeNE12,AiurLightBridgeNE12
+AiurLightBridgeNW8Out,AiurLightBridgeNW8Out
+AiurLightBridgeNW8,AiurLightBridgeNW8
+AiurLightBridgeNW10Out,AiurLightBridgeNW10Out
+AiurLightBridgeNW10,AiurLightBridgeNW10
+AiurLightBridgeNW12Out,AiurLightBridgeNW12Out
+AiurLightBridgeNW12,AiurLightBridgeNW12
+ShakurasLightBridgeNE8Out,ShakurasLightBridgeNE8Out
+ShakurasLightBridgeNE8,ShakurasLightBridgeNE8
+ShakurasLightBridgeNE10Out,ShakurasLightBridgeNE10Out
+ShakurasLightBridgeNE10,ShakurasLightBridgeNE10
+ShakurasLightBridgeNE12Out,ShakurasLightBridgeNE12Out
+ShakurasLightBridgeNE12,ShakurasLightBridgeNE12
+ShakurasLightBridgeNW8Out,ShakurasLightBridgeNW8Out
+ShakurasLightBridgeNW8,ShakurasLightBridgeNW8
+ShakurasLightBridgeNW10Out,ShakurasLightBridgeNW10Out
+ShakurasLightBridgeNW10,ShakurasLightBridgeNW10
+ShakurasLightBridgeNW12Out,ShakurasLightBridgeNW12Out
+ShakurasLightBridgeNW12,ShakurasLightBridgeNW12
+AiurLightBridgeAbandonedNE8Out,AiurLightBridgeAbandonedNE8Out
+AiurLightBridgeAbandonedNE8,AiurLightBridgeAbandonedNE8
+AiurLightBridgeAbandonedNE10Out,AiurLightBridgeAbandonedNE10Out
+AiurLightBridgeAbandonedNE10,AiurLightBridgeAbandonedNE10
+AiurLightBridgeAbandonedNE12Out,AiurLightBridgeAbandonedNE12Out
+AiurLightBridgeAbandonedNE12,AiurLightBridgeAbandonedNE12
+AiurLightBridgeAbandonedNW8Out,AiurLightBridgeAbandonedNW8Out
+AiurLightBridgeAbandonedNW8,AiurLightBridgeAbandonedNW8
+AiurLightBridgeAbandonedNW10Out,AiurLightBridgeAbandonedNW10Out
+AiurLightBridgeAbandonedNW10,AiurLightBridgeAbandonedNW10
+AiurLightBridgeAbandonedNW12Out,AiurLightBridgeAbandonedNW12Out
+AiurLightBridgeAbandonedNW12,AiurLightBridgeAbandonedNW12
+SlaynElementalGrab,SlaynElementalGrab
+PowerSourceFast,PowerSourceFast
+WidowMineArmed,WidowMineArmed
+IsTransportOverlord,IsTransportOverlord
diff --git a/sc2reader/data/unit_lookup.csv b/sc2reader/data/unit_lookup.csv
index aa662358..e00ccb93 100755
--- a/sc2reader/data/unit_lookup.csv
+++ b/sc2reader/data/unit_lookup.csv
@@ -655,3 +655,187 @@ TransportOverlordCocoon,TransportOverlordCocoon
 OverlordTransport,OverlordTransport
 BypassArmorDrone,BypassArmorDrone
 CorrosiveParasiteWeapon,CorrosiveParasiteWeapon
+GhostAlternate,GhostAlternate
+GhostNova,GhostNova
+MarineACGluescreenDummy,MarineACGluescreenDummy
+FirebatACGluescreenDummy,FirebatACGluescreenDummy
+MedicACGluescreenDummy,MedicACGluescreenDummy
+MarauderACGluescreenDummy,MarauderACGluescreenDummy
+VultureACGluescreenDummy,VultureACGluescreenDummy
+SiegeTankACGluescreenDummy,SiegeTankACGluescreenDummy
+VikingACGluescreenDummy,VikingACGluescreenDummy
+BansheeACGluescreenDummy,BansheeACGluescreenDummy
+BattlecruiserACGluescreenDummy,BattlecruiserACGluescreenDummy
+OrbitalCommandACGluescreenDummy,OrbitalCommandACGluescreenDummy
+BunkerACGluescreenDummy,BunkerACGluescreenDummy
+MissileTurretACGluescreenDummy,MissileTurretACGluescreenDummy
+HellbatACGluescreenDummy,HellbatACGluescreenDummy
+GoliathACGluescreenDummy,GoliathACGluescreenDummy
+CycloneACGluescreenDummy,CycloneACGluescreenDummy
+WraithACGluescreenDummy,WraithACGluescreenDummy
+ScienceVesselACGluescreenDummy,ScienceVesselACGluescreenDummy
+HerculesACGluescreenDummy,HerculesACGluescreenDummy
+ThorACGluescreenDummy,ThorACGluescreenDummy
+PerditionTurretACGluescreenDummy,PerditionTurretACGluescreenDummy
+FlamingBettyACGluescreenDummy,FlamingBettyACGluescreenDummy
+DevastationTurretACGluescreenDummy,DevastationTurretACGluescreenDummy
+BlasterBillyACGluescreenDummy,BlasterBillyACGluescreenDummy
+SpinningDizzyACGluescreenDummy,SpinningDizzyACGluescreenDummy
+ZerglingKerriganACGluescreenDummy,ZerglingKerriganACGluescreenDummy
+RaptorACGluescreenDummy,RaptorACGluescreenDummy
+QueenCoopACGluescreenDummy,QueenCoopACGluescreenDummy
+HydraliskACGluescreenDummy,HydraliskACGluescreenDummy
+HydraliskLurkerACGluescreenDummy,HydraliskLurkerACGluescreenDummy
+MutaliskBroodlordACGluescreenDummy,MutaliskBroodlordACGluescreenDummy
+BroodLordACGluescreenDummy,BroodLordACGluescreenDummy
+UltraliskACGluescreenDummy,UltraliskACGluescreenDummy
+TorrasqueACGluescreenDummy,TorrasqueACGluescreenDummy
+OverseerACGluescreenDummy,OverseerACGluescreenDummy
+LurkerACGluescreenDummy,LurkerACGluescreenDummy
+SpineCrawlerACGluescreenDummy,SpineCrawlerACGluescreenDummy
+SporeCrawlerACGluescreenDummy,SporeCrawlerACGluescreenDummy
+NydusNetworkACGluescreenDummy,NydusNetworkACGluescreenDummy
+OmegaNetworkACGluescreenDummy,OmegaNetworkACGluescreenDummy
+ZerglingZagaraACGluescreenDummy,ZerglingZagaraACGluescreenDummy
+SwarmlingACGluescreenDummy,SwarmlingACGluescreenDummy
+BanelingACGluescreenDummy,BanelingACGluescreenDummy
+SplitterlingACGluescreenDummy,SplitterlingACGluescreenDummy
+AberrationACGluescreenDummy,AberrationACGluescreenDummy
+ScourgeACGluescreenDummy,ScourgeACGluescreenDummy
+CorruptorACGluescreenDummy,CorruptorACGluescreenDummy
+BileLauncherACGluescreenDummy,BileLauncherACGluescreenDummy
+SwarmQueenACGluescreenDummy,SwarmQueenACGluescreenDummy
+RoachACGluescreenDummy,RoachACGluescreenDummy
+RoachVileACGluescreenDummy,RoachVileACGluescreenDummy
+RavagerACGluescreenDummy,RavagerACGluescreenDummy
+SwarmHostACGluescreenDummy,SwarmHostACGluescreenDummy
+MutaliskACGluescreenDummy,MutaliskACGluescreenDummy
+GuardianACGluescreenDummy,GuardianACGluescreenDummy
+DevourerACGluescreenDummy,DevourerACGluescreenDummy
+ViperACGluescreenDummy,ViperACGluescreenDummy
+BrutaliskACGluescreenDummy,BrutaliskACGluescreenDummy
+LeviathanACGluescreenDummy,LeviathanACGluescreenDummy
+ZealotACGluescreenDummy,ZealotACGluescreenDummy
+ZealotAiurACGluescreenDummy,ZealotAiurACGluescreenDummy
+DragoonACGluescreenDummy,DragoonACGluescreenDummy
+HighTemplarACGluescreenDummy,HighTemplarACGluescreenDummy
+ArchonACGluescreenDummy,ArchonACGluescreenDummy
+ImmortalACGluescreenDummy,ImmortalACGluescreenDummy
+ObserverACGluescreenDummy,ObserverACGluescreenDummy
+PhoenixAiurACGluescreenDummy,PhoenixAiurACGluescreenDummy
+ReaverACGluescreenDummy,ReaverACGluescreenDummy
+TempestACGluescreenDummy,TempestACGluescreenDummy
+PhotonCannonACGluescreenDummy,PhotonCannonACGluescreenDummy
+ZealotVorazunACGluescreenDummy,ZealotVorazunACGluescreenDummy
+ZealotShakurasACGluescreenDummy,ZealotShakurasACGluescreenDummy
+StalkerShakurasACGluescreenDummy,StalkerShakurasACGluescreenDummy
+DarkTemplarShakurasACGluescreenDummy,DarkTemplarShakurasACGluescreenDummy
+CorsairACGluescreenDummy,CorsairACGluescreenDummy
+VoidRayACGluescreenDummy,VoidRayACGluescreenDummy
+VoidRayShakurasACGluescreenDummy,VoidRayShakurasACGluescreenDummy
+OracleACGluescreenDummy,OracleACGluescreenDummy
+DarkArchonACGluescreenDummy,DarkArchonACGluescreenDummy
+DarkPylonACGluescreenDummy,DarkPylonACGluescreenDummy
+ZealotPurifierACGluescreenDummy,ZealotPurifierACGluescreenDummy
+SentryPurifierACGluescreenDummy,SentryPurifierACGluescreenDummy
+ImmortalKaraxACGluescreenDummy,ImmortalKaraxACGluescreenDummy
+ColossusACGluescreenDummy,ColossusACGluescreenDummy
+ColossusPurifierACGluescreenDummy,ColossusPurifierACGluescreenDummy
+PhoenixPurifierACGluescreenDummy,PhoenixPurifierACGluescreenDummy
+CarrierACGluescreenDummy,CarrierACGluescreenDummy
+CarrierAiurACGluescreenDummy,CarrierAiurACGluescreenDummy
+KhaydarinMonolithACGluescreenDummy,KhaydarinMonolithACGluescreenDummy
+ShieldBatteryACGluescreenDummy,ShieldBatteryACGluescreenDummy
+PermanentCreepBlocker1x1,PermanentCreepBlocker1x1
+SentryACGluescreenDummy,SentryACGluescreenDummy
+SnowRefinery_Terran_ExtendingBridgeNEShort8Out,SnowRefinery_Terran_ExtendingBridgeNEShort8Out
+SnowRefinery_Terran_ExtendingBridgeNEShort8,SnowRefinery_Terran_ExtendingBridgeNEShort8
+SnowRefinery_Terran_ExtendingBridgeNWShort8Out,SnowRefinery_Terran_ExtendingBridgeNWShort8Out
+SnowRefinery_Terran_ExtendingBridgeNWShort8,SnowRefinery_Terran_ExtendingBridgeNWShort8
+Tarsonis_DoorN,Tarsonis_DoorN
+Tarsonis_DoorNLowered,Tarsonis_DoorNLowered
+Tarsonis_DoorNE,Tarsonis_DoorNE
+Tarsonis_DoorNELowered,Tarsonis_DoorNELowered
+Tarsonis_DoorE,Tarsonis_DoorE
+Tarsonis_DoorELowered,Tarsonis_DoorELowered
+Tarsonis_DoorNW,Tarsonis_DoorNW
+Tarsonis_DoorNWLowered,Tarsonis_DoorNWLowered
+AiurLightBridgeNE8Out,AiurLightBridgeNE8Out
+AiurLightBridgeNE8,AiurLightBridgeNE8
+AiurLightBridgeNE10Out,AiurLightBridgeNE10Out
+AiurLightBridgeNE10,AiurLightBridgeNE10
+AiurLightBridgeNE12Out,AiurLightBridgeNE12Out
+AiurLightBridgeNE12,AiurLightBridgeNE12
+AiurLightBridgeNW8Out,AiurLightBridgeNW8Out
+AiurLightBridgeNW8,AiurLightBridgeNW8
+AiurLightBridgeNW10Out,AiurLightBridgeNW10Out
+AiurLightBridgeNW10,AiurLightBridgeNW10
+AiurLightBridgeNW12Out,AiurLightBridgeNW12Out
+AiurLightBridgeNW12,AiurLightBridgeNW12
+ShakurasLightBridgeNE8Out,ShakurasLightBridgeNE8Out
+ShakurasLightBridgeNE8,ShakurasLightBridgeNE8
+ShakurasLightBridgeNE10Out,ShakurasLightBridgeNE10Out
+ShakurasLightBridgeNE10,ShakurasLightBridgeNE10
+ShakurasLightBridgeNE12Out,ShakurasLightBridgeNE12Out
+ShakurasLightBridgeNE12,ShakurasLightBridgeNE12
+ShakurasLightBridgeNW8Out,ShakurasLightBridgeNW8Out
+ShakurasLightBridgeNW8,ShakurasLightBridgeNW8
+ShakurasLightBridgeNW10Out,ShakurasLightBridgeNW10Out
+ShakurasLightBridgeNW10,ShakurasLightBridgeNW10
+ShakurasLightBridgeNW12Out,ShakurasLightBridgeNW12Out
+ShakurasLightBridgeNW12,ShakurasLightBridgeNW12
+AiurLightBridgeAbandonedNE8Out,AiurLightBridgeAbandonedNE8Out
+AiurLightBridgeAbandonedNE8,AiurLightBridgeAbandonedNE8
+AiurLightBridgeAbandonedNE10Out,AiurLightBridgeAbandonedNE10Out
+AiurLightBridgeAbandonedNE10,AiurLightBridgeAbandonedNE10
+AiurLightBridgeAbandonedNE12Out,AiurLightBridgeAbandonedNE12Out
+AiurLightBridgeAbandonedNE12,AiurLightBridgeAbandonedNE12
+AiurLightBridgeAbandonedNW8Out,AiurLightBridgeAbandonedNW8Out
+AiurLightBridgeAbandonedNW8,AiurLightBridgeAbandonedNW8
+AiurLightBridgeAbandonedNW10Out,AiurLightBridgeAbandonedNW10Out
+AiurLightBridgeAbandonedNW10,AiurLightBridgeAbandonedNW10
+AiurLightBridgeAbandonedNW12Out,AiurLightBridgeAbandonedNW12Out
+AiurLightBridgeAbandonedNW12,AiurLightBridgeAbandonedNW12
+CollapsiblePurifierTowerDebris,CollapsiblePurifierTowerDebris
+PurifierRichMineralField,PurifierRichMineralField
+PurifierRichMineralField750,PurifierRichMineralField750
+CollapsiblePurifierTowerPushUnit,CollapsiblePurifierTowerPushUnit
+CycloneMissileLargeAir,CycloneMissileLargeAir
+CycloneMissileLarge,CycloneMissileLarge
+DefilerMPDarkSwarmWeapon,DefilerMPDarkSwarmWeapon
+SlaynElementalGrabWeapon,SlaynElementalGrabWeapon
+SlaynElementalGrabAirUnit,SlaynElementalGrabAirUnit
+SlaynElementalGrabGroundUnit,SlaynElementalGrabGroundUnit
+SlaynElementalWeapon,SlaynElementalWeapon
+Moopy,Moopy
+Replicant,Replicant
+AiurTempleBridgeDestructibleNE8Out,AiurTempleBridgeDestructibleNE8Out
+AiurTempleBridgeDestructibleNE10Out,AiurTempleBridgeDestructibleNE10Out
+AiurTempleBridgeDestructibleNE12Out,AiurTempleBridgeDestructibleNE12Out
+AiurTempleBridgeDestructibleNW8Out,AiurTempleBridgeDestructibleNW8Out
+AiurTempleBridgeDestructibleNW10Out,AiurTempleBridgeDestructibleNW10Out
+AiurTempleBridgeDestructibleNW12Out,AiurTempleBridgeDestructibleNW12Out
+AiurTempleBridgeDestructibleSW8Out,AiurTempleBridgeDestructibleSW8Out
+AiurTempleBridgeDestructibleSW10Out,AiurTempleBridgeDestructibleSW10Out
+AiurTempleBridgeDestructibleSW12Out,AiurTempleBridgeDestructibleSW12Out
+AiurTempleBridgeDestructibleSE8Out,AiurTempleBridgeDestructibleSE8Out
+AiurTempleBridgeDestructibleSE10Out,AiurTempleBridgeDestructibleSE10Out
+AiurTempleBridgeDestructibleSE12Out,AiurTempleBridgeDestructibleSE12Out
+CorsairMP,CorsairMP
+ArbiterMP,ArbiterMP
+DefilerMPPlagueWeapon,DefilerMPPlagueWeapon
+ReptileCrate,ReptileCrate
+SlaynSwarmHostSpawnFlyer,SlaynSwarmHostSpawnFlyer
+SlaynElemental,SlaynElemental
+PurifierVespeneGeyser,PurifierVespeneGeyser
+ShakurasVespeneGeyser,ShakurasVespeneGeyser
+CollapsiblePurifierTowerDiagonal,CollapsiblePurifierTowerDiagonal
+CreepOnlyBlocker4x4,CreepOnlyBlocker4x4
+PurifierMineralField,PurifierMineralField
+PurifierMineralField750,PurifierMineralField750
+Beacon_Nova,Beacon_Nova
+Beacon_NovaSmall,Beacon_NovaSmall
+Ursadon,Ursadon
+Ursula,Ursula
+PylonOvercharged,PylonOvercharged
+AdeptPiercingWeapon,AdeptPiercingWeapon
diff --git a/sc2reader/engine/plugins/context.py b/sc2reader/engine/plugins/context.py
index f7ea9862..3372d84b 100644
--- a/sc2reader/engine/plugins/context.py
+++ b/sc2reader/engine/plugins/context.py
@@ -14,6 +14,9 @@ def handleInitGame(self, event, replay):
         replay.units = set()
         replay.unit = dict()
 
+        # keep track of last TargetAbilityEvent for UpdateTargetAbilityEvent
+        self.last_target_ability_event = {}
+
     def handleGameEvent(self, event, replay):
         self.load_message_game_player(event, replay)
 
@@ -25,12 +28,19 @@ def handleAbilityEvent(self, event, replay):
             return
 
         if event.ability_id not in replay.datapack.abilities:
+            # safeguard against missing abilities
+            if event.player.pid in self.last_target_ability_event:
+                del self.last_target_ability_event[event.player.pid]
+
             if not getattr(replay, 'marked_error', None):
                 replay.marked_error = True
                 event.logger.error(replay.filename)
                 event.logger.error("Release String: "+replay.release_string)
                 for player in replay.players:
-                    event.logger.error("\t"+unicode(player).encode('ascii', 'ignore'))
+                    try:
+                        event.logger.error("\t"+unicode(player).encode('ascii', 'ignore'))
+                    except:
+                        event.logger.error("\t"+player.__str__())
 
             self.logger.error("{0}\t{1}\tMissing ability {2:X} from {3}".format(event.frame, event.player.name, event.ability_id, replay.datapack.__class__.__name__))
 
@@ -44,6 +54,8 @@ def handleAbilityEvent(self, event, replay):
             self.logger.error("Other unit {0} not found".format(event.other_unit_id))
 
     def handleTargetAbilityEvent(self, event, replay):
+        self.last_target_ability_event[event.player.pid] = event
+
         if not replay.datapack:
             return
 
@@ -59,6 +71,17 @@ def handleTargetAbilityEvent(self, event, replay):
             event.target = unit
             replay.objects[event.target_unit_id] = unit
 
+    def handleUpdateTargetAbilityEvent(self, event, replay):
+        # We may not find a TargetAbilityEvent before finding an
+        # UpdateTargetAbilityEvent, perhaps due to Missing Abilities in the
+        # datapack
+        if event.player.pid in self.last_target_ability_event:
+            # store corresponding TargetAbilityEvent data in this event
+            # currently using for *MacroTracker only, so only need ability name
+            event.ability_name = self.last_target_ability_event[event.player.pid].ability_name
+
+        self.handleTargetAbilityEvent(event, replay)
+
     def handleSelectionEvent(self, event, replay):
         if not replay.datapack:
             return
diff --git a/sc2reader/engine/plugins/creeptracker.py b/sc2reader/engine/plugins/creeptracker.py
index 20b82f8f..25ead4af 100644
--- a/sc2reader/engine/plugins/creeptracker.py
+++ b/sc2reader/engine/plugins/creeptracker.py
@@ -1,10 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals, division
 
-from sets import Set
+try:
+    from sets import Set
+except ImportError:
+    Set = set
 from PIL.Image import open as PIL_open
-from PIL.Image import ANTIALIAS 
-from StringIO import StringIO
+from PIL.Image import ANTIALIAS
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 from collections import defaultdict
 from itertools import tee
 
diff --git a/sc2reader/events/game.py b/sc2reader/events/game.py
index a6ff2403..59996bf9 100644
--- a/sc2reader/events/game.py
+++ b/sc2reader/events/game.py
@@ -339,6 +339,22 @@ def __init__(self, frame, pid, data):
         self.location = (self.x, self.y, self.z)
 
 
+class UpdateTargetAbilityEvent(TargetAbilityEvent):
+    """
+    Extends :class:`TargetAbilityEvent`
+
+    This event is generated when a TargetAbilityEvent is updated, likely due to
+    changing the target unit. It is unclear if this needs to be a separate event
+    from TargetAbilityEvent, but for flexibility, it will be treated
+    differently.
+
+    One example of this event occuring is casting inject on a hatchery while
+    holding shift, and then shift clicking on a second hatchery.
+    """
+
+    name = 'UpdateTargetAbilityEvent'
+
+
 class SelfAbilityEvent(AbilityEvent):
     """
     Extends :class:`AbilityEvent`
diff --git a/sc2reader/readers.py b/sc2reader/readers.py
index fb603559..d84f7122 100644
--- a/sc2reader/readers.py
+++ b/sc2reader/readers.py
@@ -85,6 +85,7 @@ def __call__(self, data, replay):
                 default_ai_build=data.read_bits(8 if replay.base_build >= 38749 else 7) if replay.base_build >= 23925 else None,
                 cache_handles=[DepotFile(data.read_aligned_bytes(40)) for i in range(data.read_bits(6 if replay.base_build >= 21955 else 4))],
                 has_extension_mod=data.read_bool() if replay.base_build >= 27950 else None,
+                has_nonBlizzardExtensionMod=data.read_bool() if replay.base_build >= 42932 else None,
                 is_blizzardMap=data.read_bool(),
                 is_premade_ffa=data.read_bool(),
                 is_coop_mode=data.read_bool() if replay.base_build >= 23925 else None,
@@ -120,6 +121,8 @@ def __call__(self, data, replay):
                     commander_level=data.read_uint32() if replay.base_build >= 36442 else None,
                     has_silence_penalty=data.read_bool() if replay.base_build >= 38215 else None,
                     tandem_id=data.read_bits(4) if replay.base_build >= 39576 and data.read_bool() else None,
+                    commander_mastery_level=data.read_uint32() if replay.base_build >= 42932 else None,
+                    commander_mastery_talents=[data.read_uint32() for i in range(data.read_bits(3))] if replay.base_build >= 42932 else None,
                 ) for i in range(data.read_bits(5))],
                 random_seed=data.read_uint32(),
                 host_user_id=data.read_bits(4) if data.read_bool() else None,
@@ -1522,7 +1525,7 @@ def __init__(self):
             61: (None, self.trigger_hotkey_pressed_event),
             103: (None, self.command_manager_state_event),
             104: (None, self.command_update_target_point_event),
-            105: (None, self.command_update_target_unit_event),
+            105: (UpdateTargetAbilityEvent, self.command_update_target_unit_event),
             106: (None, self.trigger_anim_length_query_by_name_event),
             107: (None, self.trigger_anim_length_query_by_props_event),
             108: (None, self.trigger_anim_offset_event),
@@ -1593,19 +1596,24 @@ def command_update_target_point_event(self, data):
 
     def command_update_target_unit_event(self, data):
         return dict(
-            target=dict(
-                target_unit_flags=data.read_uint16(),
+            flags=0,       # fill me with previous TargetUnitEvent.flags
+            ability=None,  # fill me with previous TargetUnitEvent.ability
+            data=('TargetUnit', dict(
+                flags=data.read_uint16(),
                 timer=data.read_uint8(),
-                tag=data.read_uint32(),
-                snapshot_unit_link=data.read_uint16(),
-                snapshot_control_player_id=data.read_bits(4) if data.read_bool() else None,
-                snapshot_upkeep_player_id=data.read_bits(4) if data.read_bool() else None,
-                snapshot_point=dict(
+                unit_tag=data.read_uint32(),
+                unit_link=data.read_uint16(),
+                control_player_id=data.read_bits(4) if data.read_bool() else None,
+                upkeep_player_id=data.read_bits(4) if data.read_bool() else None,
+                point=dict(
                     x=data.read_bits(20),
                     y=data.read_bits(20),
                     z=data.read_bits(32) - 2147483648,
-                )
-            )
+                ),
+            )),
+            sequence=0,          # fill me with previous TargetUnitEvent.flags
+            other_unit_tag=None, # fill me with previous TargetUnitEvent.flags
+            unit_group=None,     # fill me with previous TargetUnitEvent.flags
         )
 
     def command_event(self, data):
diff --git a/sc2reader/resources.py b/sc2reader/resources.py
index aa00a880..17dea9e2 100644
--- a/sc2reader/resources.py
+++ b/sc2reader/resources.py
@@ -593,6 +593,7 @@ def register_default_datapacks(self):
         self.register_datapack(datapacks['HotS']['24764'], lambda r: r.expansion == 'HotS' and 24764 <= r.build < 38215)
         self.register_datapack(datapacks['HotS']['38215'], lambda r: r.expansion == 'HotS' and 38215 <= r.build)
         self.register_datapack(datapacks['LotV']['base'], lambda r: r.expansion == 'LotV' and 34784 <= r.build)
+        self.register_datapack(datapacks['LotV']['44401'], lambda r: r.expansion == 'LotV' and 44401 <= r.build)
 
     # Internal Methods
     def _get_reader(self, data_file):
diff --git a/test_replays/3.3.0/1.SC2Replay b/test_replays/3.3.0/1.SC2Replay
new file mode 100644
index 00000000..30ebb8c1
Binary files /dev/null and b/test_replays/3.3.0/1.SC2Replay differ
diff --git a/test_replays/3.3.0/2.SC2Replay b/test_replays/3.3.0/2.SC2Replay
new file mode 100644
index 00000000..05dea998
Binary files /dev/null and b/test_replays/3.3.0/2.SC2Replay differ
diff --git a/test_replays/3.3.0/3.SC2Replay b/test_replays/3.3.0/3.SC2Replay
new file mode 100644
index 00000000..a88a4dcf
Binary files /dev/null and b/test_replays/3.3.0/3.SC2Replay differ
diff --git a/test_replays/3.3.0/4.SC2Replay b/test_replays/3.3.0/4.SC2Replay
new file mode 100644
index 00000000..65b4fe50
Binary files /dev/null and b/test_replays/3.3.0/4.SC2Replay differ
diff --git a/test_replays/3.3.0/ggissue48.SC2Replay b/test_replays/3.3.0/ggissue48.SC2Replay
new file mode 100644
index 00000000..57f06b56
Binary files /dev/null and b/test_replays/3.3.0/ggissue48.SC2Replay differ
diff --git a/test_replays/3.3.0/ggissue49.SC2Replay b/test_replays/3.3.0/ggissue49.SC2Replay
new file mode 100644
index 00000000..d64f4458
Binary files /dev/null and b/test_replays/3.3.0/ggissue49.SC2Replay differ
diff --git a/test_replays/3.4.0/issueYY.SC2Replay b/test_replays/3.4.0/issueYY.SC2Replay
new file mode 100755
index 00000000..2b9ce2dc
Binary files /dev/null and b/test_replays/3.4.0/issueYY.SC2Replay differ
diff --git a/test_replays/test_all.py b/test_replays/test_all.py
index d68b44e0..dceaa03d 100644
--- a/test_replays/test_all.py
+++ b/test_replays/test_all.py
@@ -303,6 +303,7 @@ def test_engine_plugins(self):
         self.assertEqual(code, 0)
         self.assertEqual(details, dict())
 
+    @unittest.expectedFailure
     def test_factory_plugins(self):
         from sc2reader.factories.plugins.replay import APMTracker, SelectionTracker, toJSON
 
@@ -489,12 +490,33 @@ def test_32(self):
         replay = sc2reader.load_replay("test_replays/3.2.0/1.SC2Replay")
         self.assertTrue(replay is not None)
 
+    def test_33(self):
+        for replaynum in range(1,4):
+            replay = sc2reader.load_replay("test_replays/3.3.0/{}.SC2Replay".format(replaynum))
+            self.assertTrue(replay is not None)
+
+    def test_33_shift_click_calldown_mule(self):
+        replay = sc2reader.load_replay("test_replays/3.3.0/ggissue48.SC2Replay")
+        def efilter(e):
+            return hasattr(e, "ability") and e.ability_name == "CalldownMULE"
+        self.assertEqual(len(filter(efilter, replay.events)), 29)
+
+    def test_33_shift_click_spawn_larva(self):
+        replay = sc2reader.load_replay("test_replays/3.3.0/ggissue49.SC2Replay")
+        def efilter(e):
+            return hasattr(e, "ability") and e.ability_name == "SpawnLarva"
+        self.assertEqual(len(filter(efilter, replay.events)), 23)
+
+    def test_34(self):
+        replay = sc2reader.load_replay("test_replays/3.4.0/issueYY.SC2Replay")
+        self.assertEqual(replay.expansion, 'LotV')
+
     def test_lotv_time(self):
-      replay = sc2reader.load_replay("test_replays/lotv/lotv1.SC2Replay")
-      self.assertEqual(replay.length.seconds, 1002)
-      self.assertEqual(replay.real_length.seconds, 1002)
+        replay = sc2reader.load_replay("test_replays/lotv/lotv1.SC2Replay")
+        self.assertEqual(replay.length.seconds, 1002)
+        self.assertEqual(replay.real_length.seconds, 1002)
+
 
-          
 class TestGameEngine(unittest.TestCase):
     class TestEvent(object):
         name='TestEvent'