diff --git a/bench/Cargo.toml b/bench/Cargo.toml
index ae7d5f0..afd27d7 100644
--- a/bench/Cargo.toml
+++ b/bench/Cargo.toml
@@ -14,20 +14,26 @@ edition = "2021"
 [lib]
 bench = false
 
-[[bench]]
-name = "eu4-bench"
-harness = false
-path = "src/bench.rs"
-
 [dependencies]
-criterion = "0.6.0"
+criterion = "0.8.0"
 erased-serde = "0.4.5"
 eu4save = { path = "../" }
+gungraun = "0.19.0"
 jomini = "0.34"
 rawzip = "0.4.0"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_path_to_error = "0.1.16"
 
+[[bench]]
+name = "jomini-bench-criterion"
+harness = false
+path = "src/criterion_main.rs"
+
+[[bench]]
+name = "jomini-bench-gungraun"
+harness = false
+path = "src/gungraun_main.rs"
+
 [profile.release]
 debug = true
 
diff --git a/bench/src/bench.rs b/bench/src/bench.rs
deleted file mode 100644
index 156cd23..0000000
--- a/bench/src/bench.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-use criterion::{Criterion, Throughput};
-use eu4save::flavor::Eu4Flavor;
-use jomini::JominiDeserialize;
-use serde::{
-    de::{self, SeqAccess},
-    Deserialize, Deserializer,
-};
-use std::{
-    collections::HashMap,
-    fmt,
-    hash::{BuildHasherDefault, Hasher},
-};
-
-fn parse_save(c: &mut Criterion) {
-    let mut group = c.benchmark_group("parse_save");
-
-    let data = std::fs::read("../assets/saves/mp_Uesugi.eu4").unwrap();
-    let zip = rawzip::ZipArchive::from_slice(&data).unwrap();
-    let mut entries = zip.entries();
-    let mut total_size = 0;
-    while let Some(entry) = entries.next_entry().unwrap() {
-        total_size += entry.uncompressed_size_hint();
-    }
-
-    let file_data = std::fs::read("../assets/eu4.txt").unwrap_or_default();
-    let segments = eu4save::SegmentedResolver::parse(file_data.as_slice()).unwrap();
-
-    group.throughput(Throughput::Bytes(total_size as u64));
-    group.bench_function("text", |b| {
-        b.iter(|| {
-            let file = eu4save::Eu4File::from_slice(&data).unwrap();
-            let _ = file.parse_save(&segments.resolver());
-        })
-    });
-
-    let data = std::fs::read("../assets/saves/kandy2.bin.eu4").unwrap();
-    let zip = rawzip::ZipArchive::from_slice(&data).unwrap();
-    let mut entries = zip.entries();
-    let mut total_size = 0;
-    while let Some(entry) = entries.next_entry().unwrap() {
-        total_size += entry.uncompressed_size_hint();
-    }
-
-    group.throughput(Throughput::Bytes(total_size as u64));
-    group.bench_function("binary", |b| {
-        b.iter(|| {
-            let file = eu4save::Eu4File::from_slice(&data).unwrap();
-            let _ = file.parse_save(&segments.resolver());
-        })
-    });
-
-    group.bench_function("debug", |b| {
-        b.iter(|| {
-            let file = eu4save::Eu4File::from_slice(&data).unwrap();
-            let eu4save::file::Eu4SliceFileKind::Zip(zip) = file.kind() else {
-                return;
-            };
-
-            let resolver = segments.resolver();
-            let meta = zip.get(eu4save::file::Eu4FileEntryName::Meta).unwrap();
-            let mut deser = eu4save::file::Eu4Modeller::from_reader(meta, &resolver);
-            let mut track = serde_path_to_error::Track::new();
-            let deser = serde_path_to_error::Deserializer::new(&mut deser, &mut track);
-            let mut erased = <dyn erased_serde::Deserializer>::erase(deser);
-            let meta = erased_serde::deserialize(&mut erased).unwrap();
-
-            let gamestate = zip.get(eu4save::file::Eu4FileEntryName::Gamestate).unwrap();
-            let mut deser = eu4save::file::Eu4Modeller::from_reader(gamestate, &resolver);
-            let mut track = serde_path_to_error::Track::new();
-            let deser = serde_path_to_error::Deserializer::new(&mut deser, &mut track);
-            let mut erased = <dyn erased_serde::Deserializer>::erase(deser);
-            let game = erased_serde::deserialize(&mut erased).unwrap();
-
-            let _ = eu4save::models::Eu4Save { meta, game };
-        })
-    });
-    group.finish();
-}
-
-fn deserialize_ledger(c: &mut Criterion) {
-    let mut group = c.benchmark_group("deserialize");
-
-    #[derive(Debug, Clone, JominiDeserialize)]
-    #[expect(dead_code)]
-    struct CountryLedger {
-        #[jomini(
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x287f
-        )]
-        income: [f32; 19],
-        #[jomini(
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x2880
-        )]
-        expense: [f32; 38],
-        #[jomini(alias = "lastmonthincome", token = 0x2879)]
-        last_month_income: Option<f32>,
-        #[jomini(
-            alias = "lastmonthincometable",
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x287b
-        )]
-        last_month_income_table: [f32; 19],
-        #[jomini(
-            alias = "lastmonthexpensetable",
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x287c
-        )]
-        last_month_expense_table: [f32; 38],
-        #[jomini(
-            alias = "totalexpensetable",
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x34a4
-        )]
-        total_expense_table: [f32; 38],
-        #[jomini(
-            alias = "lastyearincome",
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x287d
-        )]
-        last_year_income: [f32; 19],
-        #[jomini(
-            alias = "lastyearexpense",
-            default = "array_default",
-            deserialize_with = "deserialize_list",
-            token = 0x287e
-        )]
-        last_year_expense: [f32; 38],
-    }
-
-    let data = r#"
-			income={
-				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
-			}
-			expense={
-				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
-			}
-			lastmonthincome=1598.331
-			lastmonthincometable={
-				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
-			}
-			lastmonthexpense=409.644
-			lastmonthexpensetable={
-				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
-			}
-			totalexpensetable={
-				57281.152 8858.215 53707.281 151.200 35162.777 0.000 182451.328 41266.332 28286.047 10804.620 0.000 6979.546 15015.400 0.000 308928.188 0.000 65326.508 3621.690 16936.703 86527.047 0.000 0.000 0.000 0.000 0.000 0.000 0.000 6571.160 16624.076 157.956 0.000 36739.602 0.000 74.205 194.857 159112.000 27260.199 102.400
-			}
-			lastyearincome={
-				1905.523 6395.835 9682.316 634.344 247.500 19.980 0.000 0.000 0.000 0.000 0.000 0.000 0.000 597.321 0.000 0.000 0.000 26.108 108.956
-			}
-			lastyearexpense={
-				476.682 0.000 875.137 0.000 153.276 0.000 2102.549 992.460 426.870 80.840 0.000 0.000 575.700 0.000 21585.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 9108.000 0.000 0.000 0.000 0.000 0.000 0.000
-			}
-			last_months_recurring_income=1598.331
-			last_months_recurring_expenses=409.644
-"#;
-
-    let data2 = r#"
-			incom1={
-				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
-			}
-			expens1={
-				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
-			}
-			lastmonthincom1=1598.331
-			lastmonthincometabl1={
-				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
-			}
-			lastmonthexpens1=409.644
-			lastmonthexpensetabl1={
-				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
-			}
-			totalexpensetabl1={
-				57281.152 8858.215 53707.281 151.200 35162.777 0.000 182451.328 41266.332 28286.047 10804.620 0.000 6979.546 15015.400 0.000 308928.188 0.000 65326.508 3621.690 16936.703 86527.047 0.000 0.000 0.000 0.000 0.000 0.000 0.000 6571.160 16624.076 157.956 0.000 36739.602 0.000 74.205 194.857 159112.000 27260.199 102.400
-			}
-			lastyearincom1={
-				1905.523 6395.835 9682.316 634.344 247.500 19.980 0.000 0.000 0.000 0.000 0.000 0.000 0.000 597.321 0.000 0.000 0.000 26.108 108.956
-			}
-			lastyearexpens1={
-				476.682 0.000 875.137 0.000 153.276 0.000 2102.549 992.460 426.870 80.840 0.000 0.000 575.700 0.000 21585.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 9108.000 0.000 0.000 0.000 0.000 0.000 0.000
-			}
-			last_months_recurring_incom1=1598.331
-			last_months_recurring_expense1=409.644
-"#;
-
-    let binary_data = include_bytes!("../../assets/ledger.bin");
-
-    group.throughput(Throughput::Bytes(data.len() as u64));
-
-    group.bench_function("matching-ledger", |b| {
-        b.iter(|| {
-            let reader = jomini::text::TokenReader::from_slice(data.as_bytes());
-            let _: CountryLedger = jomini::TextDeserializer::from_windows1252_reader(reader)
-                .deserialize()
-                .unwrap();
-        })
-    });
-
-    let resolver = HashMap::<u16, String>::new();
-    group.bench_function("binary-ledger", |b| {
-        b.iter(|| {
-            let _: CountryLedger = jomini::BinaryDeserializer::builder_flavor(Eu4Flavor::new())
-                .deserialize_slice(&binary_data[..], &resolver)
-                .unwrap();
-        })
-    });
-
-    group.bench_function("skip-ledger", |b| {
-        b.iter(|| {
-            let reader = jomini::text::TokenReader::from_slice(data2.as_bytes());
-            let _: CountryLedger = jomini::TextDeserializer::from_windows1252_reader(reader)
-                .deserialize()
-                .unwrap();
-        })
-    });
-
-    group.bench_function("parser", |b| {
-        b.iter(|| {
-            let mut reader = jomini::text::TokenReader::from_slice(data.as_bytes());
-            while let Ok(Some(_)) = reader.next() {}
-        })
-    });
-
-    group.finish();
-}
-
-fn country_tag_hashing(c: &mut Criterion) {
-    let mut group = c.benchmark_group("country_tag_hashing");
-
-    let data = std::fs::read("../assets/saves/mp_Uesugi.eu4").unwrap();
-    let file_data = std::fs::read("../assets/eu4.txt").unwrap_or_default();
-    let segments = eu4save::SegmentedResolver::parse(file_data.as_slice()).unwrap();
-    let file = eu4save::Eu4File::from_slice(&data).unwrap();
-    let save = file.parse_save(&segments.resolver()).unwrap();
-    let country_tags = save
-        .game
-        .countries
-        .iter()
-        .map(|(tag, _)| *tag)
-        .collect::<Vec<_>>();
-
-    group.throughput(Throughput::Elements(country_tags.len() as u64));
-    group.bench_function("default-hash", |b| {
-        let map = country_tags
-            .iter()
-            .enumerate()
-            .map(|(i, tag)| (*tag, i))
-            .collect::<HashMap<_, _>>();
-        b.iter(|| {
-            let mut sum = 0;
-            for tag in &country_tags {
-                sum += map.get(tag).unwrap_or(&0);
-            }
-            std::hint::black_box(sum)
-        })
-    });
-
-    type FnvBuildHasher = BuildHasherDefault<FnvHasher>;
-    pub type FnvHashMap<K, V> = HashMap<K, V, FnvBuildHasher>;
-
-    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-    pub struct FnvHasher(u64);
-
-    impl Default for FnvHasher {
-        #[inline]
-        fn default() -> FnvHasher {
-            FnvHasher(0xcbf29ce484222325)
-        }
-    }
-
-    impl Hasher for FnvHasher {
-        #[inline]
-        fn finish(&self) -> u64 {
-            self.0
-        }
-
-        #[inline]
-        fn write(&mut self, bytes: &[u8]) {
-            let FnvHasher(mut hash) = *self;
-
-            for byte in bytes {
-                hash ^= *byte as u64;
-                hash = hash.wrapping_mul(0x100000001b3);
-            }
-
-            *self = FnvHasher(hash);
-        }
-    }
-
-    group.bench_function("fnv-hash", |b| {
-        let map = country_tags
-            .iter()
-            .enumerate()
-            .map(|(i, tag)| (*tag, i))
-            .collect::<FnvHashMap<_, _>>();
-        b.iter(|| {
-            let mut sum = 0;
-            for tag in &country_tags {
-                sum += map.get(tag).unwrap_or(&0);
-            }
-            std::hint::black_box(sum)
-        })
-    });
-}
-
-criterion::criterion_group!(benches, parse_save, deserialize_ledger, country_tag_hashing);
-criterion::criterion_main!(benches);
-
-fn collect_into_default<'de, A, T, const N: usize>(
-    mut seq: A,
-) -> Result<[T; N], <A as SeqAccess<'de>>::Error>
-where
-    A: SeqAccess<'de>,
-    T: Default + Copy + Deserialize<'de>,
-{
-    let mut result = [T::default(); N];
-    for i in 0..N {
-        let Some(x) = seq.next_element::<T>()? else {
-            return Ok(result);
-        };
-        result[i] = x;
-    }
-
-    // If the sequence is not finished, we need to consume the rest of the elements
-    // so that we drive a potential parser that underlies the deserializer
-    while let Some(_x) = seq.next_element::<de::IgnoredAny>()? {}
-    Ok(result)
-}
-
-fn deserialize_list<'de, D, const N: usize>(deserializer: D) -> Result<[f32; N], D::Error>
-where
-    D: Deserializer<'de>,
-{
-    struct ListVisitor<const N: usize>;
-
-    impl<'de, const N: usize> de::Visitor<'de> for ListVisitor<N> {
-        type Value = [f32; N];
-
-        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            formatter.write_str("a seq of bytes allowed to overflow")
-        }
-
-        fn visit_seq<A>(self, seq: A) -> Result<Self::Value, A::Error>
-        where
-            A: SeqAccess<'de>,
-        {
-            collect_into_default(seq)
-        }
-    }
-
-    deserializer.deserialize_seq(ListVisitor)
-}
-
-fn array_default<const N: usize>() -> [f32; N] {
-    [0.0; N]
-}
diff --git a/bench/src/benchmarks.rs b/bench/src/benchmarks.rs
new file mode 100644
index 0000000..c7b87d0
--- /dev/null
+++ b/bench/src/benchmarks.rs
@@ -0,0 +1,3 @@
+pub mod country_tag_hashing;
+pub mod deserialize_ledger;
+pub mod parse_save;
diff --git a/bench/src/benchmarks/country_tag_hashing.rs b/bench/src/benchmarks/country_tag_hashing.rs
new file mode 100644
index 0000000..b0b8893
--- /dev/null
+++ b/bench/src/benchmarks/country_tag_hashing.rs
@@ -0,0 +1,88 @@
+pub mod criterion_benches {
+    use criterion::{Criterion, Throughput};
+    use std::{
+        collections::HashMap,
+        hash::{BuildHasherDefault, Hasher},
+    };
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    pub struct FnvHasher(u64);
+
+    impl Default for FnvHasher {
+        #[inline]
+        fn default() -> FnvHasher {
+            FnvHasher(0xcbf29ce484222325)
+        }
+    }
+
+    impl Hasher for FnvHasher {
+        #[inline]
+        fn finish(&self) -> u64 {
+            self.0
+        }
+
+        #[inline]
+        fn write(&mut self, bytes: &[u8]) {
+            let FnvHasher(mut hash) = *self;
+
+            for byte in bytes {
+                hash ^= *byte as u64;
+                hash = hash.wrapping_mul(0x100000001b3);
+            }
+
+            *self = FnvHasher(hash);
+        }
+    }
+
+    pub fn country_tag_hashing(c: &mut Criterion) {
+        let mut group = c.benchmark_group("country_tag_hashing");
+
+        let data = std::fs::read("../assets/saves/mp_Uesugi.eu4").unwrap();
+        let file_data = std::fs::read("../assets/eu4.txt").unwrap_or_default();
+        let segments = eu4save::SegmentedResolver::parse(file_data.as_slice()).unwrap();
+        let file = eu4save::Eu4File::from_slice(&data).unwrap();
+        let save = file.parse_save(segments.resolver()).unwrap();
+        let country_tags = save
+            .game
+            .countries
+            .iter()
+            .map(|(tag, _)| *tag)
+            .collect::<Vec<_>>();
+
+        group.throughput(Throughput::Elements(country_tags.len() as u64));
+        group.bench_function("default-hash", |b| {
+            let map = country_tags
+                .iter()
+                .enumerate()
+                .map(|(i, tag)| (*tag, i))
+                .collect::<HashMap<_, _>>();
+            b.iter(|| {
+                let mut sum = 0;
+                for tag in &country_tags {
+                    sum += map.get(tag).unwrap_or(&0);
+                }
+                std::hint::black_box(sum)
+            })
+        });
+
+        type FnvBuildHasher = BuildHasherDefault<FnvHasher>;
+        type FnvHashMap<K, V> = HashMap<K, V, FnvBuildHasher>;
+
+        group.bench_function("fnv-hash", |b| {
+            let map = country_tags
+                .iter()
+                .enumerate()
+                .map(|(i, tag)| (*tag, i))
+                .collect::<FnvHashMap<_, _>>();
+            b.iter(|| {
+                let mut sum = 0;
+                for tag in &country_tags {
+                    sum += map.get(tag).unwrap_or(&0);
+                }
+                std::hint::black_box(sum)
+            })
+        });
+    }
+
+    criterion::criterion_group!(country_tag_hashing_benches, country_tag_hashing);
+}
diff --git a/bench/src/benchmarks/deserialize_ledger.rs b/bench/src/benchmarks/deserialize_ledger.rs
new file mode 100644
index 0000000..73c35f8
--- /dev/null
+++ b/bench/src/benchmarks/deserialize_ledger.rs
@@ -0,0 +1,213 @@
+pub mod criterion_benches {
+    use criterion::{Criterion, Throughput};
+    use eu4save::{file::Eu4Modeller, Encoding};
+    use jomini::JominiDeserialize;
+    use serde::{
+        de::{self, SeqAccess},
+        Deserialize, Deserializer,
+    };
+    use std::{collections::HashMap, fmt};
+
+    #[derive(Debug, Clone, JominiDeserialize)]
+    #[expect(dead_code)]
+    struct CountryLedger {
+        #[jomini(
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x287f
+        )]
+        income: [f32; 19],
+        #[jomini(
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x2880
+        )]
+        expense: [f32; 38],
+        #[jomini(alias = "lastmonthincome", token = 0x2879)]
+        last_month_income: Option<f32>,
+        #[jomini(
+            alias = "lastmonthincometable",
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x287b
+        )]
+        last_month_income_table: [f32; 19],
+        #[jomini(
+            alias = "lastmonthexpensetable",
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x287c
+        )]
+        last_month_expense_table: [f32; 38],
+        #[jomini(
+            alias = "totalexpensetable",
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x34a4
+        )]
+        total_expense_table: [f32; 38],
+        #[jomini(
+            alias = "lastyearincome",
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x287d
+        )]
+        last_year_income: [f32; 19],
+        #[jomini(
+            alias = "lastyearexpense",
+            default = "array_default",
+            deserialize_with = "deserialize_list",
+            token = 0x287e
+        )]
+        last_year_expense: [f32; 38],
+    }
+
+    fn collect_into_default<'de, A, T, const N: usize>(
+        mut seq: A,
+    ) -> Result<[T; N], <A as SeqAccess<'de>>::Error>
+    where
+        A: SeqAccess<'de>,
+        T: Default + Copy + Deserialize<'de>,
+    {
+        let mut result = [T::default(); N];
+        for i in 0..N {
+            let Some(x) = seq.next_element::<T>()? else {
+                return Ok(result);
+            };
+            result[i] = x;
+        }
+
+        while let Some(_x) = seq.next_element::<de::IgnoredAny>()? {}
+        Ok(result)
+    }
+
+    fn deserialize_list<'de, D, const N: usize>(deserializer: D) -> Result<[f32; N], D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct ListVisitor<const N: usize>;
+
+        impl<'de, const N: usize> de::Visitor<'de> for ListVisitor<N> {
+            type Value = [f32; N];
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("a seq of bytes allowed to overflow")
+            }
+
+            fn visit_seq<A>(self, seq: A) -> Result<Self::Value, A::Error>
+            where
+                A: SeqAccess<'de>,
+            {
+                collect_into_default(seq)
+            }
+        }
+
+        deserializer.deserialize_seq(ListVisitor)
+    }
+
+    fn array_default<const N: usize>() -> [f32; N] {
+        [0.0; N]
+    }
+
+    pub fn deserialize_ledger(c: &mut Criterion) {
+        let mut group = c.benchmark_group("deserialize");
+
+        let data = r#"
+			income={
+				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
+			}
+			expense={
+				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
+			}
+			lastmonthincome=1598.331
+			lastmonthincometable={
+				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
+			}
+			lastmonthexpense=409.644
+			lastmonthexpensetable={
+				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
+			}
+			totalexpensetable={
+				57281.152 8858.215 53707.281 151.200 35162.777 0.000 182451.328 41266.332 28286.047 10804.620 0.000 6979.546 15015.400 0.000 308928.188 0.000 65326.508 3621.690 16936.703 86527.047 0.000 0.000 0.000 0.000 0.000 0.000 0.000 6571.160 16624.076 157.956 0.000 36739.602 0.000 74.205 194.857 159112.000 27260.199 102.400
+			}
+			lastyearincome={
+				1905.523 6395.835 9682.316 634.344 247.500 19.980 0.000 0.000 0.000 0.000 0.000 0.000 0.000 597.321 0.000 0.000 0.000 26.108 108.956
+			}
+			lastyearexpense={
+				476.682 0.000 875.137 0.000 153.276 0.000 2102.549 992.460 426.870 80.840 0.000 0.000 575.700 0.000 21585.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 9108.000 0.000 0.000 0.000 0.000 0.000 0.000
+			}
+			last_months_recurring_income=1598.331
+			last_months_recurring_expenses=409.644
+"#;
+
+        let data2 = r#"
+			incom1={
+				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
+			}
+			expens1={
+				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
+			}
+			lastmonthincom1=1598.331
+			lastmonthincometabl1={
+				160.500 539.364 817.406 52.862 20.882 1.665 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 5.652
+			}
+			lastmonthexpens1=409.644
+			lastmonthexpensetabl1={
+				39.736 0.000 72.992 0.000 12.773 0.000 153.668 82.705 39.690 8.080 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
+			}
+			totalexpensetabl1={
+				57281.152 8858.215 53707.281 151.200 35162.777 0.000 182451.328 41266.332 28286.047 10804.620 0.000 6979.546 15015.400 0.000 308928.188 0.000 65326.508 3621.690 16936.703 86527.047 0.000 0.000 0.000 0.000 0.000 0.000 0.000 6571.160 16624.076 157.956 0.000 36739.602 0.000 74.205 194.857 159112.000 27260.199 102.400
+			}
+			lastyearincom1={
+				1905.523 6395.835 9682.316 634.344 247.500 19.980 0.000 0.000 0.000 0.000 0.000 0.000 0.000 597.321 0.000 0.000 0.000 26.108 108.956
+			}
+			lastyearexpens1={
+				476.682 0.000 875.137 0.000 153.276 0.000 2102.549 992.460 426.870 80.840 0.000 0.000 575.700 0.000 21585.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 9108.000 0.000 0.000 0.000 0.000 0.000 0.000
+			}
+			last_months_recurring_incom1=1598.331
+			last_months_recurring_expense1=409.644
+"#;
+
+        let binary_data = include_bytes!("../../../assets/ledger.bin");
+
+        group.throughput(Throughput::Bytes(data.len() as u64));
+
+        group.bench_function("matching-ledger", |b| {
+            b.iter(|| {
+                let reader = jomini::text::TokenReader::from_slice(data.as_bytes());
+                let _: CountryLedger = jomini::TextDeserializer::from_windows1252_reader(reader)
+                    .deserialize()
+                    .unwrap();
+            })
+        });
+
+        let resolver = HashMap::<u16, String>::new();
+        group.bench_function("binary-ledger", |b| {
+            b.iter(|| {
+                let mut deser = Eu4Modeller::from_reader(&binary_data[..], &resolver)
+                    .with_encoding(Encoding::Binary);
+                let _: CountryLedger = deser.deserialize().unwrap();
+            })
+        });
+
+        group.bench_function("skip-ledger", |b| {
+            b.iter(|| {
+                let reader = jomini::text::TokenReader::from_slice(data2.as_bytes());
+                let _: CountryLedger = jomini::TextDeserializer::from_windows1252_reader(reader)
+                    .deserialize()
+                    .unwrap();
+            })
+        });
+
+        group.bench_function("parser", |b| {
+            b.iter(|| {
+                let mut reader = jomini::text::TokenReader::from_slice(data.as_bytes());
+                while let Ok(Some(_)) = reader.next() {}
+            })
+        });
+
+        group.finish();
+    }
+
+    criterion::criterion_group!(deserialize_ledger_benches, deserialize_ledger);
+}
diff --git a/bench/src/benchmarks/parse_save.rs b/bench/src/benchmarks/parse_save.rs
new file mode 100644
index 0000000..585cee5
--- /dev/null
+++ b/bench/src/benchmarks/parse_save.rs
@@ -0,0 +1,102 @@
+pub mod criterion_benches {
+    use criterion::{Criterion, Throughput};
+
+    fn parse_save(c: &mut Criterion) {
+        let mut group = c.benchmark_group("parse_save");
+
+        let data = std::fs::read("../assets/saves/mp_Uesugi.eu4").unwrap();
+        let zip = rawzip::ZipArchive::from_slice(&data).unwrap();
+        let mut entries = zip.entries();
+        let mut total_size = 0;
+        while let Some(entry) = entries.next_entry().unwrap() {
+            total_size += entry.uncompressed_size_hint();
+        }
+
+        let file_data = std::fs::read("../assets/eu4.txt").unwrap_or_default();
+        let segments = eu4save::SegmentedResolver::parse(file_data.as_slice()).unwrap();
+
+        group.throughput(Throughput::Bytes(total_size));
+        group.bench_function("text", |b| {
+            b.iter(|| {
+                let file = eu4save::Eu4File::from_slice(&data).unwrap();
+                let _ = file.parse_save(segments.resolver());
+            })
+        });
+
+        let data = std::fs::read("../assets/saves/kandy2.bin.eu4").unwrap();
+        let zip = rawzip::ZipArchive::from_slice(&data).unwrap();
+        let mut entries = zip.entries();
+        let mut total_size = 0;
+        while let Some(entry) = entries.next_entry().unwrap() {
+            total_size += entry.uncompressed_size_hint();
+        }
+
+        group.throughput(Throughput::Bytes(total_size));
+        group.bench_function("binary", |b| {
+            b.iter(|| {
+                let file = eu4save::Eu4File::from_slice(&data).unwrap();
+                let _ = file.parse_save(segments.resolver());
+            })
+        });
+
+        group.bench_function("debug", |b| {
+            b.iter(|| {
+                let file = eu4save::Eu4File::from_slice(&data).unwrap();
+                let eu4save::file::Eu4SliceFileKind::Zip(zip) = file.kind() else {
+                    return;
+                };
+
+                let resolver = segments.resolver();
+                let meta = zip.get(eu4save::file::Eu4FileEntryName::Meta).unwrap();
+                let mut deser = eu4save::file::Eu4Modeller::from_reader(meta, &resolver);
+                let mut track = serde_path_to_error::Track::new();
+                let deser = serde_path_to_error::Deserializer::new(&mut deser, &mut track);
+                let mut erased = <dyn erased_serde::Deserializer>::erase(deser);
+                let meta = erased_serde::deserialize(&mut erased).unwrap();
+
+                let gamestate = zip.get(eu4save::file::Eu4FileEntryName::Gamestate).unwrap();
+                let mut deser = eu4save::file::Eu4Modeller::from_reader(gamestate, &resolver);
+                let mut track = serde_path_to_error::Track::new();
+                let deser = serde_path_to_error::Deserializer::new(&mut deser, &mut track);
+                let mut erased = <dyn erased_serde::Deserializer>::erase(deser);
+                let game = erased_serde::deserialize(&mut erased).unwrap();
+
+                let _ = eu4save::models::Eu4Save { meta, game };
+            })
+        });
+        group.finish();
+    }
+
+    criterion::criterion_group!(parse_save_benches, parse_save);
+}
+
+#[cfg(not(target_family = "wasm"))]
+pub mod gungraun_benches {
+    use gungraun::{library_benchmark, library_benchmark_group};
+
+    fn setup_text() -> (Vec<u8>, eu4save::SegmentedResolverBuilder) {
+        let data = std::fs::read("../assets/saves/mp_Uesugi.eu4").unwrap();
+        let file_data = std::fs::read("../assets/eu4.txt").unwrap_or_default();
+        let segments = eu4save::SegmentedResolver::parse(file_data.as_slice()).unwrap();
+        (data, segments)
+    }
+
+    fn setup_binary() -> (Vec<u8>, eu4save::SegmentedResolverBuilder) {
+        let data = std::fs::read("../assets/saves/kandy2.bin.eu4").unwrap();
+        let file_data = std::fs::read("../assets/eu4.txt").unwrap_or_default();
+        let segments = eu4save::SegmentedResolver::parse(file_data.as_slice()).unwrap();
+        (data, segments)
+    }
+
+    #[library_benchmark]
+    #[bench::text(setup = setup_text)]
+    #[bench::binary(setup = setup_binary)]
+    fn parse_save(
+        (data, segments): (Vec<u8>, eu4save::SegmentedResolverBuilder),
+    ) -> eu4save::models::Eu4Save {
+        let file = eu4save::Eu4File::from_slice(&data).unwrap();
+        file.parse_save(segments.resolver()).unwrap()
+    }
+
+    library_benchmark_group!(name = parse_save_benches, benchmarks = [parse_save,]);
+}
diff --git a/bench/src/criterion_main.rs b/bench/src/criterion_main.rs
new file mode 100644
index 0000000..fe04865
--- /dev/null
+++ b/bench/src/criterion_main.rs
@@ -0,0 +1,8 @@
+use criterion::criterion_main;
+use eu4save_bench::benchmarks::{country_tag_hashing, deserialize_ledger, parse_save};
+
+criterion_main!(
+    parse_save::criterion_benches::parse_save_benches,
+    deserialize_ledger::criterion_benches::deserialize_ledger_benches,
+    country_tag_hashing::criterion_benches::country_tag_hashing_benches,
+);
diff --git a/bench/src/gungraun_main.rs b/bench/src/gungraun_main.rs
new file mode 100644
index 0000000..8d8538f
--- /dev/null
+++ b/bench/src/gungraun_main.rs
@@ -0,0 +1,3 @@
+use eu4save_bench::benchmarks::parse_save::gungraun_benches::parse_save_benches;
+
+gungraun::main!(library_benchmark_groups = parse_save_benches);
diff --git a/bench/src/lib.rs b/bench/src/lib.rs
index d11c69f..53b3f4d 100644
--- a/bench/src/lib.rs
+++ b/bench/src/lib.rs
@@ -1 +1 @@
-// intentionally empty
+pub mod benchmarks;