diff --git a/src/ccsaveparser.py b/src/ccsaveparser.py
index 1c17232..ede4f2f 100644
--- a/src/ccsaveparser.py
+++ b/src/ccsaveparser.py
@@ -8,9 +8,10 @@ import struct
 
 class OFFSETS:
     VERSION = 0x42e
-    KEYS_LABEL = 0x12DB
-    KEYS_VALUE = 0x12F9
-    ACCOUNT_LEVEL = 0x12AD
+    KEYS_LABEL = 0x12DB  # These are not static
+    KEYS_VALUE = 0x12F9  # These are not static
+    ACCOUNT_LEVEL = 0x12AD  # These are not static
+    START_OF_OPTIONS = 0x42a  # This appears to be static across multiple saves
 
 
 def _bytes_to_string(bytes):
@@ -36,8 +37,10 @@ def get_key_value(save):
 
 def verify_save(save):
     try:
-        struct.pack("bbbb", *save[:4]) == b"GVAS"
-        token = _bytes_to_string(read_token_at_offset(save, OFFSETS.VERSION))
+        struct.unpack("<sssss", save[:5]) == "GVAS"
+        size = read_int_at_offset(save, OFFSETS.START_OF_OPTIONS)
+        token = read_token_at_offset(save, OFFSETS.START_OF_OPTIONS + 4, size)
+        print(size)
         if token == "CrabChampionsVersion":
             return True
     except struct.error as e:
@@ -45,12 +48,18 @@ def verify_save(save):
         return False
 
 
+def read_int_at_offset(save, offset):
+    try:
+        data = struct.unpack("<i", save[offset:offset + 4])
+        return data[0]
+    except struct.error:
+        return False
+
+
 def read_token_at_offset(save, offset, size=1):
     try:
-        data = struct.pack("b" * size, *save[offset: offset + size])
-        if data[-1] != 0x00:
-            data = read_token_at_offset(save, offset, size + 1)
-        return data
+        data = struct.unpack("s" * size, save[offset: offset + size])
+        return "".join([c.decode() for c in data[:-1]])
     except struct.error:
         print("Failed to find NULL byte in token, probs not a token")
         return None
@@ -68,6 +77,6 @@ else:
 # Should be fine to do shit here
 # print(read_token_at_offset(save, 0x12DB))  # Keys
 # print(read_token_at_offset(save, 0x12AD))  # AccountLevel
-token = read_token_at_offset(save, OFFSETS.KEYS_LABEL)
+token = read_token_at_offset(save, OFFSETS.KEYS_LABEL, 5)
 # print(_bytes_to_string(token))
 print(f"You have {int.from_bytes(get_key_value(save))} keys")