diff --git a/vasl_templates/webapp/data/vehicles/japanese.json b/vasl_templates/webapp/data/vehicles/japanese.json
new file mode 100644
index 0000000..828820f
--- /dev/null
+++ b/vasl_templates/webapp/data/vehicles/japanese.json
@@ -0,0 +1,128 @@
+[
+
+{ "name": "Type 92A",
+ "no_radio": "\u00ae",
+ "CS#": 3,
+ "note_number": "1\u2020",
+ "notes": [ "A\u20201" ]
+},
+{ "name": "Type 92B",
+ "no_radio": "\u00ae",
+ "CS#": 3,
+ "note_number": "1\u2020",
+ "notes": [ "A\u20201" ]
+},
+{ "name": "Type 94",
+ "no_radio": "\u00ae",
+ "CS#": 2,
+ "note_number": "2\u2020"
+},
+{ "name": "Type 95 SO-KI",
+ "no_radio": "\u00ae",
+ "CS#": 5,
+ "note_number": "3\u2020"
+},
+{ "name": "Type 97A TE-KE",
+ "no_radio": "\u00ae",
+ "CS#": 2,
+ "note_number": "4\u2020"
+},
+{ "name": "Type 97B TE-KE",
+ "no_radio": "\u00ae",
+ "CS#": 2,
+ "no_if": true,
+ "note_number": "4\u2020"
+},
+{ "name": "Type 95 HA-GO",
+ "no_radio": "\u00ae\u20202",
+ "CS#": 3,
+ "capabilities2": { "sD": [ [5,"4+"], "\u20201" ] },
+ "note_number": "5\u2020",
+ "notes": [ "B\u20201", "C\u20202" ]
+},
+{ "name": "Type 2 KA-MI",
+ "CS#": "5\u2020",
+ "note_number": "6\u2020"
+},
+{ "name": "Type 2 KA-MI (without pontoons)",
+ "CS#": "5\u2020",
+ "note_number": "6\u2020"
+},
+{ "name": "Type 89A CHI-RO",
+ "no_radio": "\u00ae",
+ "CS#": 4,
+ "note_number": "7\u2020",
+ "notes": [ "A\u20201" ]
+},
+{ "name": "Type 89B CHI-RO",
+ "no_radio": "\u00ae",
+ "CS#": 4,
+ "note_number": "7\u2020"
+},
+{ "name": "Type 97A CHI-HA",
+ "no_radio": "\u00ae\u20202",
+ "CS#": 4,
+ "capabilities2": { "sD": [ [5,"1+"], "\u20201" ] },
+ "note_number": "8\u2020",
+ "notes": [ "B\u20201", "C\u20202" ]
+},
+{ "name": "Type 97B CHI-HA",
+ "CS#": 4,
+ "capabilities2": { "sD": 5 },
+ "note_number": "8\u2020"
+},
+{ "name": "Type 1 CHI-HE",
+ "CS#": 5,
+ "capabilities2": { "sD": 5 },
+ "note_number": "9\u2020"
+},
+{ "name": "Type 91",
+ "CS#": 6,
+ "note_number": "10\u2020",
+ "notes": [ "A\u20201" ]
+},
+{ "name": "Type 92",
+ "CS#": 4,
+ "note_number": "11\u2020",
+ "notes": [ "A\u20201" ]
+},
+{ "name": "Type 1 HO-NI I",
+ "CS#": 5,
+ "capabilities2": { "WP": 5 },
+ "note_number": "12\u2020"
+},
+{ "name": "Type 4 HO-RO",
+ "CS#": "5:brewup",
+ "no_if": true,
+ "capabilities2": { "WP": 6 },
+ "note_number": "13\u2020"
+},
+{ "name": "Type 1 HO-KI",
+ "cs#": 5,
+ "note_number": "14\u2020"
+},
+{ "name": "Type 98 SHI-KE",
+ "cs#": 5,
+ "note_number": "15\u2020"
+},
+{ "name": "Type 92 I-KE",
+ "cs#": 5,
+ "note_number": "16\u2020"
+},
+{ "name": "Type 95",
+ "cs#": 2,
+ "note_number": "17\u2020"
+},
+{ "name": "Type 94",
+ "cs#": 6,
+ "note_number": "18"
+},
+{ "name": "Type 97",
+ "cs#": 7,
+ "note_number": "18"
+},
+{ "name": "Vickers 8-in. Costal Defense Gun Turret",
+ "note_number": "19\u2020"
+}
+
+]
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
new file mode 100644
index 0000000..4324aa6
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
@@ -0,0 +1,29 @@
+=== vehicles/japanese/1940 ===
+
+Name Radio IF Crew survival Capabilities (effective) # Notes
+--------------------------------------- -------------- ---- ------------------------------------ -------------- ------------- --- -----------------------------
+Type 92A ® yes CS 3 n/a n/a 1† A†1
+Type 92B ® yes CS 3 n/a n/a 1† A†1
+Type 94 ® yes CS 2 n/a n/a 2† n/a
+Type 95 SO-KI ® yes CS 5 n/a n/a 3† n/a
+Type 97A TE-KE ® yes CS 2 n/a n/a 4† n/a
+Type 97B TE-KE ® n/a CS 2 n/a n/a 4† n/a
+Type 95 HA-GO ®†2 yes CS 3 sD5[4+]†[1] n/a 5† B†1 C†2
+Type 2 KA-MI n/a yes CS 5† n/a n/a 6† n/a
+Type 2 KA-MI (without pontoons) n/a yes CS 5† n/a n/a 6† n/a
+Type 89A CHI-RO ® yes CS 4 n/a n/a 7† A†1
+Type 89B CHI-RO ® yes CS 4 n/a n/a 7† n/a
+Type 97A CHI-HA ®†2 yes CS 4 sD5[1+]†[1] n/a 8† B†1 C†2
+Type 97B CHI-HA n/a yes CS 4 sD5 sD5 8† n/a
+Type 1 CHI-HE n/a yes CS 5 sD5 sD5 9† n/a
+Type 91 n/a yes CS 6 n/a n/a 10† A†1
+Type 92 n/a yes CS 4 n/a n/a 11† A†1
+Type 1 HO-NI I n/a yes CS 5 WP5 WP5 12† n/a
+Type 4 HO-RO n/a n/a CS 5 (brew up) WP6 WP6 13† n/a
+Type 1 HO-KI n/a yes cs 5 n/a n/a 14† n/a
+Type 98 SHI-KE n/a yes cs 5 n/a n/a 15† n/a
+Type 92 I-KE n/a yes cs 5 n/a n/a 16† n/a
+Type 95 n/a yes cs 2 n/a n/a 17† n/a
+Type 94 n/a yes cs 6 n/a n/a 18 n/a
+Type 97 n/a yes cs 7 n/a n/a 18 n/a
+Vickers 8-in. Costal Defense Gun Turret n/a yes n/a n/a n/a 19† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
new file mode 100644
index 0000000..6e22436
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
@@ -0,0 +1,29 @@
+=== vehicles/japanese/1941 ===
+
+Name Radio IF Crew survival Capabilities (effective) # Notes
+--------------------------------------- -------------- ---- ------------------------------------ -------------- ------------- --- -----------------------------
+Type 92A ® yes CS 3 n/a n/a 1† A†1
+Type 92B ® yes CS 3 n/a n/a 1† A†1
+Type 94 ® yes CS 2 n/a n/a 2† n/a
+Type 95 SO-KI ® yes CS 5 n/a n/a 3† n/a
+Type 97A TE-KE ® yes CS 2 n/a n/a 4† n/a
+Type 97B TE-KE ® n/a CS 2 n/a n/a 4† n/a
+Type 95 HA-GO ®†2 yes CS 3 sD5[4+]†[1] n/a 5† B†1 C†2
+Type 2 KA-MI n/a yes CS 5† n/a n/a 6† n/a
+Type 2 KA-MI (without pontoons) n/a yes CS 5† n/a n/a 6† n/a
+Type 89A CHI-RO ® yes CS 4 n/a n/a 7† A†1
+Type 89B CHI-RO ® yes CS 4 n/a n/a 7† n/a
+Type 97A CHI-HA ®†2 yes CS 4 sD5[1+]†[1] sD5†[1] 8† B†1 C†2
+Type 97B CHI-HA n/a yes CS 4 sD5 sD5 8† n/a
+Type 1 CHI-HE n/a yes CS 5 sD5 sD5 9† n/a
+Type 91 n/a yes CS 6 n/a n/a 10† A†1
+Type 92 n/a yes CS 4 n/a n/a 11† A†1
+Type 1 HO-NI I n/a yes CS 5 WP5 WP5 12† n/a
+Type 4 HO-RO n/a n/a CS 5 (brew up) WP6 WP6 13† n/a
+Type 1 HO-KI n/a yes cs 5 n/a n/a 14† n/a
+Type 98 SHI-KE n/a yes cs 5 n/a n/a 15† n/a
+Type 92 I-KE n/a yes cs 5 n/a n/a 16† n/a
+Type 95 n/a yes cs 2 n/a n/a 17† n/a
+Type 94 n/a yes cs 6 n/a n/a 18 n/a
+Type 97 n/a yes cs 7 n/a n/a 18 n/a
+Vickers 8-in. Costal Defense Gun Turret n/a yes n/a n/a n/a 19† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
new file mode 100644
index 0000000..6d62a16
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
@@ -0,0 +1,29 @@
+=== vehicles/japanese/1942 ===
+
+Name Radio IF Crew survival Capabilities (effective) # Notes
+--------------------------------------- -------------- ---- ------------------------------------ -------------- ------------- --- -----------------------------
+Type 92A ® yes CS 3 n/a n/a 1† A†1
+Type 92B ® yes CS 3 n/a n/a 1† A†1
+Type 94 ® yes CS 2 n/a n/a 2† n/a
+Type 95 SO-KI ® yes CS 5 n/a n/a 3† n/a
+Type 97A TE-KE ® yes CS 2 n/a n/a 4† n/a
+Type 97B TE-KE ® n/a CS 2 n/a n/a 4† n/a
+Type 95 HA-GO ®†2 yes CS 3 sD5[4+]†[1] n/a 5† B†1 C†2
+Type 2 KA-MI n/a yes CS 5† n/a n/a 6† n/a
+Type 2 KA-MI (without pontoons) n/a yes CS 5† n/a n/a 6† n/a
+Type 89A CHI-RO ® yes CS 4 n/a n/a 7† A†1
+Type 89B CHI-RO ® yes CS 4 n/a n/a 7† n/a
+Type 97A CHI-HA ®†2 yes CS 4 sD5[1+]†[1] sD5†[1] 8† B†1 C†2
+Type 97B CHI-HA n/a yes CS 4 sD5 sD5 8† n/a
+Type 1 CHI-HE n/a yes CS 5 sD5 sD5 9† n/a
+Type 91 n/a yes CS 6 n/a n/a 10† A†1
+Type 92 n/a yes CS 4 n/a n/a 11† A†1
+Type 1 HO-NI I n/a yes CS 5 WP5 WP5 12† n/a
+Type 4 HO-RO n/a n/a CS 5 (brew up) WP6 WP6 13† n/a
+Type 1 HO-KI n/a yes cs 5 n/a n/a 14† n/a
+Type 98 SHI-KE n/a yes cs 5 n/a n/a 15† n/a
+Type 92 I-KE n/a yes cs 5 n/a n/a 16† n/a
+Type 95 n/a yes cs 2 n/a n/a 17† n/a
+Type 94 n/a yes cs 6 n/a n/a 18 n/a
+Type 97 n/a yes cs 7 n/a n/a 18 n/a
+Vickers 8-in. Costal Defense Gun Turret n/a yes n/a n/a n/a 19† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
new file mode 100644
index 0000000..cd44146
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
@@ -0,0 +1,29 @@
+=== vehicles/japanese/1943 ===
+
+Name Radio IF Crew survival Capabilities (effective) # Notes
+--------------------------------------- -------------- ---- ------------------------------------ -------------- ------------- --- -----------------------------
+Type 92A ® yes CS 3 n/a n/a 1† A†1
+Type 92B ® yes CS 3 n/a n/a 1† A†1
+Type 94 ® yes CS 2 n/a n/a 2† n/a
+Type 95 SO-KI ® yes CS 5 n/a n/a 3† n/a
+Type 97A TE-KE ® yes CS 2 n/a n/a 4† n/a
+Type 97B TE-KE ® n/a CS 2 n/a n/a 4† n/a
+Type 95 HA-GO ®†2 yes CS 3 sD5[4+]†[1] n/a 5† B†1 C†2
+Type 2 KA-MI n/a yes CS 5† n/a n/a 6† n/a
+Type 2 KA-MI (without pontoons) n/a yes CS 5† n/a n/a 6† n/a
+Type 89A CHI-RO ® yes CS 4 n/a n/a 7† A†1
+Type 89B CHI-RO ® yes CS 4 n/a n/a 7† n/a
+Type 97A CHI-HA ®†2 yes CS 4 sD5[1+]†[1] sD5†[1] 8† B†1 C†2
+Type 97B CHI-HA n/a yes CS 4 sD5 sD5 8† n/a
+Type 1 CHI-HE n/a yes CS 5 sD5 sD5 9† n/a
+Type 91 n/a yes CS 6 n/a n/a 10† A†1
+Type 92 n/a yes CS 4 n/a n/a 11† A†1
+Type 1 HO-NI I n/a yes CS 5 WP5 WP5 12† n/a
+Type 4 HO-RO n/a n/a CS 5 (brew up) WP6 WP6 13† n/a
+Type 1 HO-KI n/a yes cs 5 n/a n/a 14† n/a
+Type 98 SHI-KE n/a yes cs 5 n/a n/a 15† n/a
+Type 92 I-KE n/a yes cs 5 n/a n/a 16† n/a
+Type 95 n/a yes cs 2 n/a n/a 17† n/a
+Type 94 n/a yes cs 6 n/a n/a 18 n/a
+Type 97 n/a yes cs 7 n/a n/a 18 n/a
+Vickers 8-in. Costal Defense Gun Turret n/a yes n/a n/a n/a 19† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
new file mode 100644
index 0000000..c900596
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
@@ -0,0 +1,29 @@
+=== vehicles/japanese/1944 ===
+
+Name Radio IF Crew survival Capabilities (effective) # Notes
+--------------------------------------- -------------- ---- ------------------------------------ -------------- ------------- --- -----------------------------
+Type 92A ® yes CS 3 n/a n/a 1† A†1
+Type 92B ® yes CS 3 n/a n/a 1† A†1
+Type 94 ® yes CS 2 n/a n/a 2† n/a
+Type 95 SO-KI ® yes CS 5 n/a n/a 3† n/a
+Type 97A TE-KE ® yes CS 2 n/a n/a 4† n/a
+Type 97B TE-KE ® n/a CS 2 n/a n/a 4† n/a
+Type 95 HA-GO ®†2 yes CS 3 sD5[4+]†[1] sD5†[1] 5† B†1 C†2
+Type 2 KA-MI n/a yes CS 5† n/a n/a 6† n/a
+Type 2 KA-MI (without pontoons) n/a yes CS 5† n/a n/a 6† n/a
+Type 89A CHI-RO ® yes CS 4 n/a n/a 7† A†1
+Type 89B CHI-RO ® yes CS 4 n/a n/a 7† n/a
+Type 97A CHI-HA ®†2 yes CS 4 sD5[1+]†[1] sD5†[1] 8† B†1 C†2
+Type 97B CHI-HA n/a yes CS 4 sD5 sD5 8† n/a
+Type 1 CHI-HE n/a yes CS 5 sD5 sD5 9† n/a
+Type 91 n/a yes CS 6 n/a n/a 10† A†1
+Type 92 n/a yes CS 4 n/a n/a 11† A†1
+Type 1 HO-NI I n/a yes CS 5 WP5 WP5 12† n/a
+Type 4 HO-RO n/a n/a CS 5 (brew up) WP6 WP6 13† n/a
+Type 1 HO-KI n/a yes cs 5 n/a n/a 14† n/a
+Type 98 SHI-KE n/a yes cs 5 n/a n/a 15† n/a
+Type 92 I-KE n/a yes cs 5 n/a n/a 16† n/a
+Type 95 n/a yes cs 2 n/a n/a 17† n/a
+Type 94 n/a yes cs 6 n/a n/a 18 n/a
+Type 97 n/a yes cs 7 n/a n/a 18 n/a
+Vickers 8-in. Costal Defense Gun Turret n/a yes n/a n/a n/a 19† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
new file mode 100644
index 0000000..5975cd0
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
@@ -0,0 +1,29 @@
+=== vehicles/japanese/1945 ===
+
+Name Radio IF Crew survival Capabilities (effective) # Notes
+--------------------------------------- -------------- ---- ------------------------------------ -------------- ------------- --- -----------------------------
+Type 92A ® yes CS 3 n/a n/a 1† A†1
+Type 92B ® yes CS 3 n/a n/a 1† A†1
+Type 94 ® yes CS 2 n/a n/a 2† n/a
+Type 95 SO-KI ® yes CS 5 n/a n/a 3† n/a
+Type 97A TE-KE ® yes CS 2 n/a n/a 4† n/a
+Type 97B TE-KE ® n/a CS 2 n/a n/a 4† n/a
+Type 95 HA-GO ®†2 yes CS 3 sD5[4+]†[1] sD5†[1] 5† B†1 C†2
+Type 2 KA-MI n/a yes CS 5† n/a n/a 6† n/a
+Type 2 KA-MI (without pontoons) n/a yes CS 5† n/a n/a 6† n/a
+Type 89A CHI-RO ® yes CS 4 n/a n/a 7† A†1
+Type 89B CHI-RO ® yes CS 4 n/a n/a 7† n/a
+Type 97A CHI-HA ®†2 yes CS 4 sD5[1+]†[1] sD5†[1] 8† B†1 C†2
+Type 97B CHI-HA n/a yes CS 4 sD5 sD5 8† n/a
+Type 1 CHI-HE n/a yes CS 5 sD5 sD5 9† n/a
+Type 91 n/a yes CS 6 n/a n/a 10† A†1
+Type 92 n/a yes CS 4 n/a n/a 11† A†1
+Type 1 HO-NI I n/a yes CS 5 WP5 WP5 12† n/a
+Type 4 HO-RO n/a n/a CS 5 (brew up) WP6 WP6 13† n/a
+Type 1 HO-KI n/a yes cs 5 n/a n/a 14† n/a
+Type 98 SHI-KE n/a yes cs 5 n/a n/a 15† n/a
+Type 92 I-KE n/a yes cs 5 n/a n/a 16† n/a
+Type 95 n/a yes cs 2 n/a n/a 17† n/a
+Type 94 n/a yes cs 6 n/a n/a 18 n/a
+Type 97 n/a yes cs 7 n/a n/a 18 n/a
+Vickers 8-in. Costal Defense Gun Turret n/a yes n/a n/a n/a 19† n/a
diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py
index c369df7..da86521 100644
--- a/vasl_templates/webapp/tests/test_vo_reports.py
+++ b/vasl_templates/webapp/tests/test_vo_reports.py
@@ -36,7 +36,7 @@ def test_vo_reports( webapp, webdriver ):
)
# check each vehicle/ordnance report
- for nat in ["german","russian","american","british","italian"]:
+ for nat in ["german","russian","american","british","italian","japanese"]:
for vo_type in ["vehicles","ordnance"]:
for year in range(1940,1945+1):