diff --git a/src/common/ai_navy/goals/goals_generic.txt b/src/common/ai_navy/goals/goals_generic.txt
new file mode 100755
index 0000000..ec2038b
--- /dev/null
+++ b/src/common/ai_navy/goals/goals_generic.txt
@@ -0,0 +1,109 @@
+generic_naval_invasion_support = {
+    objective_type = naval_invasion_support
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 4
+    max_priority = 14
+}
+
+generic_mine_sweeping = {
+    objective_type = mines_sweeping
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 2
+    max_priority = 8
+}
+
+generic_invasion_defense = {
+    objective_type = naval_invasion_defense
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 5
+    max_priority = 15
+}
+
+generic_coast_defense = {
+    objective_type = coast_defense
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 1
+    max_priority = 16
+}
+
+generic_convoy_protection = {
+    objective_type = convoy_protection
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 1
+    max_priority = 5
+}
+
+generic_convoy_raiding = {
+    objective_type = convoy_raiding
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 3
+    max_priority = 7
+}
+
+generic_naval_dominance = {
+    objective_type = naval_dominance
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 1
+    max_priority = 13
+}
+
+generic_mine_laying = {
+    objective_type = mines_planting
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 2
+    max_priority = 8
+}
+
+generic_training = {
+    objective_type = training
+
+    blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 10
+    max_priority = 20
+}
+
+generic_naval_blockade = {
+    objective_type = naval_blockade
+
+     blocked_for = {
+        HUJ YUW TIX SAD CHY BFL USA
+    }
+
+    min_priority = 10
+    max_priority = 20
+}
\ No newline at end of file
diff --git a/src/common/ai_navy/taskforce/ENG_taskforce_templates.txt b/src/common/ai_navy/taskforce/ENG_taskforce_templates.txt
new file mode 100755
index 0000000..3dfe5b7
--- /dev/null
+++ b/src/common/ai_navy/taskforce/ENG_taskforce_templates.txt
@@ -0,0 +1,190 @@
+ENG_StrikeForce_1 = {
+	allowed = {
+		original_tag = HUJ 
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		battleship = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 6
+		}
+		battleship = {
+			amount = 8
+		}
+		light_cruiser = {
+			amount = 14
+		}
+		destroyer = {
+			amount = 24
+		}
+	}
+}
+
+ENG_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = HUJ
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+ENG_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = HUJ
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 6
+		}
+	}
+	optimal_composition = {
+		battleship = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+ENG_PatrolDominanceForce_2 = {
+	allowed = {
+		original_tag = HUJ
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 5
+		}
+	}
+	optimal_composition = {
+		battle_cruiser = {
+			amount = 3
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 3
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+ENG_PatrolDominanceForce_3 = {
+	allowed = {
+		original_tag = HUJ
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 5
+		}
+	}
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 3
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+ENG_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = HUJ
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+ENG_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = HUJ
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 10
+		}
+	}
+}
diff --git a/src/common/ai_navy/taskforce/FRA_taskforce_templates.txt b/src/common/ai_navy/taskforce/FRA_taskforce_templates.txt
new file mode 100755
index 0000000..046242e
--- /dev/null
+++ b/src/common/ai_navy/taskforce/FRA_taskforce_templates.txt
@@ -0,0 +1,182 @@
+FRA_StrikeForce_1 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 8
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 2
+		}
+		battleship = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 10
+		}
+		destroyer = {
+			amount = 22
+
+		}
+	}
+}
+
+FRA_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+FRA_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		battleship = {
+			amount = 2
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+}
+
+FRA_PatrolDominanceForce_2 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+}
+
+FRA_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+FRA_ConvoySurfaceRaiding_1 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding}
+	min_composition = {
+		battle_cruiser = {
+			amount = 1
+		}
+	}
+
+	optimal_composition = {
+		battle_cruiser = {
+			amount = 2
+		}
+	}
+}
+
+FRA_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = YUW
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 10
+		}
+	}
+}
diff --git a/src/common/ai_navy/taskforce/GER_taskforce_templates.txt b/src/common/ai_navy/taskforce/GER_taskforce_templates.txt
new file mode 100755
index 0000000..999fb2b
--- /dev/null
+++ b/src/common/ai_navy/taskforce/GER_taskforce_templates.txt
@@ -0,0 +1,175 @@
+GER_StrikeForce_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 8
+		}
+	}
+	
+	optimal_composition = {
+		battleship = {
+			amount = 4
+		}
+		heavy_cruiser = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 22
+		}
+	}
+}
+
+GER_StrikeForceCarrier_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 1
+	}		
+	mission = { naval_strike }
+	min_composition = {
+		destroyer = {
+			amount = 8
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 2
+		}
+		battleship = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 10
+		}
+		destroyer = {
+			amount = 20
+		}
+	}
+}
+
+GER_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 10
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+GER_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 10
+	}		
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 3
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+}
+
+GER_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+GER_ConvoySurfaceRaiding_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding}
+	min_composition = {
+		battle_cruiser = {
+			amount = 1
+		}
+	}
+
+	optimal_composition = {
+		battle_cruiser = {
+			amount = 2
+		}
+	}
+}
+
+GER_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = TIX
+	}
+	ai_will_do = {
+		factor = 5
+	}		
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 3
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 10
+		}
+	}
+}
diff --git a/src/common/ai_navy/taskforce/ITA_taskforce_templates.txt b/src/common/ai_navy/taskforce/ITA_taskforce_templates.txt
new file mode 100755
index 0000000..88ce140
--- /dev/null
+++ b/src/common/ai_navy/taskforce/ITA_taskforce_templates.txt
@@ -0,0 +1,173 @@
+ITA_StrikeForce_1 = {
+	allowed = {
+		original_tag = SAD 
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		destroyer = {
+			amount = 8
+		}
+	}
+	
+	optimal_composition = {
+		battleship = {
+			amount = 4
+		}
+		heavy_cruiser = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 28
+		}
+	}
+}
+ITA_StrikeForceCarrier_1 = {
+	allowed = {
+		original_tag = SAD 
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		destroyer = {
+			amount = 8
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 2
+		}
+		battleship = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 10
+		}
+		destroyer = {
+			amount = 20
+		}
+	}
+}
+
+ITA_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = SAD
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+ITA_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = SAD
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 3
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+}
+
+ITA_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = SAD
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+ITA_ConvoySurfaceRaiding_1 = {
+	allowed = {
+		original_tag = SAD
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		battle_cruiser = {
+			amount = 1
+		}
+	}
+
+	optimal_composition = {
+		battle_cruiser = {
+			amount = 2
+		}
+	}
+}
+
+ITA_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = SAD
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 3
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 10
+		}
+	}
+}
diff --git a/src/common/ai_navy/taskforce/JAP_taskforce_templates.txt b/src/common/ai_navy/taskforce/JAP_taskforce_templates.txt
new file mode 100755
index 0000000..224fe93
--- /dev/null
+++ b/src/common/ai_navy/taskforce/JAP_taskforce_templates.txt
@@ -0,0 +1,193 @@
+JAP_StrikeForce_1 = {
+	allowed = {
+		original_tag = CHY 
+	}
+	ai_will_do = {
+		factor = 15
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		battleship = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 6
+		}
+		battleship = {
+			amount = 8
+		}
+		light_cruiser = {
+			amount = 14
+		}
+		destroyer = {
+			amount = 25
+		}
+	}
+}
+
+JAP_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 10
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+JAP_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 10
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 6
+		}
+	}
+
+	optimal_composition = {
+		battleship = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+JAP_PatrolDominanceForce_2 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 10
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 6
+		}
+	}
+
+	optimal_composition = {
+		battle_cruiser = {
+			amount = 2
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+JAP_PatrolDominanceForce_3 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 6
+		}
+	}
+
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+JAP_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+JAP_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 4
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 10
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/common/ai_navy/taskforce/SOV_taskforce_templates.txt b/src/common/ai_navy/taskforce/SOV_taskforce_templates.txt
new file mode 100755
index 0000000..ed840cc
--- /dev/null
+++ b/src/common/ai_navy/taskforce/SOV_taskforce_templates.txt
@@ -0,0 +1,158 @@
+SOV_StrikeForce_1 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		battleship = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 8
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 4
+		}
+		battleship = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 10
+		}
+		destroyer = {
+			amount = 25
+
+		}
+	}
+}
+
+SOV_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+SOV_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		battleship = {
+			amount = 3
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+SOV_PatrolDominanceForce_2 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 3
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 3
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+SOV_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+SOV_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 3
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 10
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/common/ai_navy/taskforce/USA_taskforce_templates.txt b/src/common/ai_navy/taskforce/USA_taskforce_templates.txt
new file mode 100755
index 0000000..c447550
--- /dev/null
+++ b/src/common/ai_navy/taskforce/USA_taskforce_templates.txt
@@ -0,0 +1,160 @@
+USA_StrikeForce_1 = {
+	allowed = {
+		original_tag = BYG 
+	}
+	ai_will_do = {
+		factor = 30
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		battleship = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 12
+		}
+	}
+	
+	optimal_composition = {
+		carrier = {
+			amount = 6
+		}
+		battleship = {
+			amount = 8
+		}
+		light_cruiser = {
+			amount = 14
+		}
+		destroyer = {
+			amount = 20
+		}
+	}
+}
+
+USA_PatrolReconForce_1 = {
+	allowed = {
+		original_tag = BYG
+	}
+	ai_will_do = {
+		factor = 5
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		destroyer = {
+			amount = 1
+		}
+	}	
+	optimal_composition = {
+		destroyer = {
+			amount = 5
+		}
+	}
+}
+
+USA_PatrolDominanceForce_1 = {
+	allowed = {
+		original_tag = BYG
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 8
+		}
+	}
+
+	optimal_composition = {
+		battleship = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+USA_PatrolDominanceForce_2 = {
+	allowed = {
+		original_tag = BYG
+	}
+	ai_will_do = {
+		factor = 3
+	}	
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 8
+		}
+	}
+
+	optimal_composition = {
+		heavy_cruiser = {
+			amount = 4
+		}
+		medium_cruiser = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 4
+		}
+		destroyer = {
+			amount = 10
+		}
+	}
+}
+
+USA_ConvoyRaiding_1 = {
+	allowed = {
+		original_tag = BYG
+	}
+	ai_will_do = {
+		factor = 5
+	}	
+	mission = { convoy_raiding }
+	min_composition = {
+		submarine = {
+			amount = 4
+		}
+	}
+
+	optimal_composition = {
+		submarine = {
+			amount = 12
+		}
+	}
+}
+
+USA_ConvoyEscort_1 = {
+	allowed = {
+		original_tag = BYG
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { convoy_escort }
+	min_composition = {
+		destroyer = {
+			amount = 4
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 8
+		}
+	}
+}
diff --git a/src/common/ai_navy/taskforce/generic_taskforce_templates.txt b/src/common/ai_navy/taskforce/generic_taskforce_templates.txt
index 0b9fd1c..7234dc1 100755
--- a/src/common/ai_navy/taskforce/generic_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/generic_taskforce_templates.txt
@@ -1,45 +1,55 @@
 StrikeForce_1 = {
 	allowed = {
-		
+		NOT = {
+			original_tag = CHY
+			original_tag = HUJ
+			original_tag = BFL
+			original_tag = BYG
+			original_tag = SAD
+			original_tag = TIX
+			original_tag = YUW
+		}		
 	}
 	ai_will_do = {
-		factor = 100
+		factor = 1
 	}	
 	mission = { naval_strike }
 	min_composition = {
-		heavy_cruiser = {
-			amount = 4
-		}
 		destroyer = {
-			amount = 20
+			amount = 8
 		}
 	}
 	
 	optimal_composition = {
 		carrier = {
-			amount = 6
+			amount = 2
 		}
 		battleship = {
-			amount = 8
+			amount = 4
 		}
 		heavy_cruiser = {
 			amount = 4
 		}
-		medium_cruiser = {
+		light_cruiser = {
 			amount = 4
 		}
-		light_cruiser = {
-			amount = 15
-		}
 		destroyer = {
-			amount = 25
+			amount = 28
 		}
 	}
 }
 
 PatrolReconForce_1 = {
 	allowed = {
-		
+		NOT = {
+			original_tag = CHY
+			original_tag = HUJ
+			original_tag = BFL
+			original_tag = BYG
+			original_tag = SAD
+			original_tag = TIX
+			original_tag = YUW
+		}		
 	}
 	ai_will_do = {
 		factor = 5
@@ -57,60 +67,66 @@ PatrolReconForce_1 = {
 	}
 }
 
-PatrolDominanceForce_1 = {
+PatrolDominanceForce_CA_1 = {
 	allowed = {
-		
+		NOT = {
+			original_tag = CHY
+			original_tag = HUJ
+			original_tag = BFL
+			original_tag = BYG
+			original_tag = SAD
+			original_tag = TIX
+			original_tag = YUW
+		}		
 	}
 	ai_will_do = {
 		factor = 5
 	}	
 	mission = { naval_patrol }
 	min_composition = {
-		light_cruiser = {
-			amount = 4
-		}
 		destroyer = {
-			amount = 10
+			amount = 4
 		}
 	}
+
 	optimal_composition = {
-		battleship = {
-			amount = 4
-		}
-		light_cruiser = {
-			amount = 10
+		heavy_cruiser = {
+			amount = 3
 		}
 		destroyer = {
-			amount = 20
+			amount = 12
 		}
 	}
 }
 
-PatrolDominanceForce_2 = {
+PatrolDominanceForce_BC_1 = {
 	allowed = {
-		
+		NOT = {
+			original_tag = CHY
+			original_tag = HUJ
+			original_tag = BFL
+			original_tag = BYG
+			original_tag = SAD
+			original_tag = TIX
+			original_tag = YUW
+		}		
 	}
 	ai_will_do = {
-		factor = 1
+		factor = 5
 	}	
 	mission = { naval_patrol }
 	min_composition = {
-		light_cruiser = {
-			amount = 4
-		}
 		destroyer = {
-			amount = 10
+			amount = 4
 		}
 	}
+
 	optimal_composition = {
 		battle_cruiser = {
-			amount = 4
-		}
-		light_cruiser = {
-			amount = 10
+			amount = 3
 		}
 		destroyer = {
-			amount = 20
+			amount = 12
 		}
 	}
 }
@@ -144,6 +160,35 @@ ConvoyRaiding_1 = {
 	}
 }
 
+ConvoySurfaceRaiding_1 = {
+	allowed = {
+		NOT = {
+			original_tag = CHY
+			original_tag = HUJ
+			original_tag = BFL
+			original_tag = BYG
+			original_tag = SAD
+			original_tag = TIX
+			original_tag = YUW
+		}		
+	}
+	ai_will_do = {
+		factor = 1
+	}
+	mission = { convoy_raiding }
+	min_composition = {
+		battle_cruiser = {
+			amount = 1
+		}
+	}
+
+	optimal_composition = {
+		battle_cruiser = {
+			amount = 2
+		}
+	}
+}
+
 ConvoyEscort_1 = {
 	allowed = {
 		NOT = {
@@ -162,7 +207,7 @@ ConvoyEscort_1 = {
 	mission = { convoy_escort }
 	min_composition = {
 		destroyer = {
-			amount = 5
+			amount = 4
 		}
 	}
 	
@@ -172,3 +217,89 @@ ConvoyEscort_1 = {
 		}
 	}
 }
+
+MineLaying_1 = {
+	allowed = {
+		NOT = {
+			original_tag = CHY
+			original_tag = HUJ
+			original_tag = BFL
+			original_tag = BYG
+			original_tag = SAD
+			original_tag = TIX
+			original_tag = YUW
+		}		
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { mines_planting }
+	min_composition = {
+		destroyer = {
+			amount = 1
+			role = 4
+		}
+	}
+	
+	optimal_composition = {
+		destroyer = {
+			amount = 4
+			role = 4
+		}
+		
+		light_cruiser = {
+			amount = 2
+			role = 4
+		}
+	}
+}
+
+#NavalInvasionSupport_1 = { #Commented out for now as it throws the error, for some reason
+#	allowed = {
+#		NOT = {
+#			original_tag = CHY
+#			original_tag = HUJ
+#			original_tag = BFL
+#			original_tag = BYG
+#			original_tag = SAD
+#			original_tag = TIX
+#			original_tag = YUW
+#		}		
+#	}
+#	ai_will_do = {
+#	 factor = 1
+#	}
+
+#	mission = { naval_invasion_support }
+
+
+#	min_composition = {
+#		heavy_cruiser = {
+#			amount = 2
+#		}
+#		battleship = {
+#			amount = 2
+#		}
+#	}
+	
+#	optimal_composition = {
+#		carrier = {
+#			amount = 2
+#		}
+#		battleship = {
+#			amount = 2
+#		}
+#		heavy_cruiser = {
+#			amount = 5
+#		}
+#		destroyer = {
+#			amount = 12
+#		}
+#		battle_cruiser = {
+#			amount = 4
+#		}
+#		light_cruiser = {
+#			amount = 4
+#		}
+#	}
+#}
diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt
index 29a9e1b..125af3e 100755
--- a/src/common/ai_strategy/naval_production.txt
+++ b/src/common/ai_strategy/naval_production.txt
@@ -1455,7 +1455,7 @@ naval_unit_role_ratios_USA_great_depression = {
 		tag = BYG
 	}
 	enable = {
-		date < 1938.1.1
+		date < 1937.2.1
 		has_war_with_major = no
 	}
 	abort_when_not_enabled = yes
@@ -1503,7 +1503,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 		tag = BYG
 	}
 	enable = {
-		date > 1937.3.1
+		date > 1937.1.31
 		has_war_with_major = no
 	}
 	abort_when_not_enabled = yes
@@ -1551,7 +1551,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = building_target
 		id = arms_factory
-		value = 80
+		value = 35
 	}
 }
 
diff --git a/src/common/ai_strategy/vnr_naval_strategy.txt b/src/common/ai_strategy/vnr_naval_strategy.txt
index b635106..8b18e34 100755
--- a/src/common/ai_strategy/vnr_naval_strategy.txt
+++ b/src/common/ai_strategy/vnr_naval_strategy.txt
@@ -228,6 +228,24 @@ JAP_destroy_china_navy_quick = {
         id = 77
         value = 100
     }
+	ai_strategy = {
+        type = naval_blockade
+		target_country = CHI
+        id = 75
+        value = 100
+    }
+    ai_strategy = {
+        type = naval_blockade
+		target_country = CHI
+        id = 76
+        value = 100
+    }
+    ai_strategy = {
+        type = naval_blockade
+		target_country = CHI
+        id = 77
+        value = 100
+    }
 
 	ai_strategy = {
         type = convoy_raiding_target
@@ -269,6 +287,11 @@ JAP_pacific_war_naval_stage_one = {
         id = 84
         value = 100
     }
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_STRIKE_FORCE
+		value = -500
+	}
 }
 
 JAP_pacific_war_naval_stage_two = {
@@ -330,6 +353,11 @@ JAP_pacific_war_naval_stage_two = {
         id = 83
         value = 85
     }
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_STRIKE_FORCE
+		value = -500
+	}
 }
 
 ### BYG ###
@@ -414,7 +442,7 @@ USA_pacific_war_naval_avoid_first = {
 	ai_strategy = {
 		type = naval_dominance
 		id = 95
-		value = 60
+		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
@@ -550,6 +578,11 @@ USA_pacific_war_naval_counterattack_1 = {
 		value = 1000
 	}
 	
+	ai_strategy = {
+		type = naval_dominance
+		id = 83
+		value = 100
+	}
 	ai_strategy = {
 		type = naval_dominance
 		id = 84
@@ -558,12 +591,12 @@ USA_pacific_war_naval_counterattack_1 = {
 	ai_strategy = {
 		type = naval_dominance
 		id = 95
-		value = 80
+		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
 		id = 97
-		value = 80
+		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
@@ -573,7 +606,7 @@ USA_pacific_war_naval_counterattack_1 = {
 	ai_strategy = {
 		type = naval_dominance
 		id = 180
-		value = 100
+		value = 80
 	}
 	ai_strategy = {
 		type = invade
@@ -608,6 +641,12 @@ USA_pacific_war_naval_counterattack_1 = {
 		ordertype = invasion
     	execute_order = yes
 	}
+
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_STRIKE_FORCE
+		value = -500
+	}
 }
 
 USA_pacific_war_naval_counterattack_2 = {
@@ -680,7 +719,7 @@ USA_pacific_war_naval_counterattack_2 = {
 	ai_strategy = {
 		type = naval_dominance
 		id = 97
-		value = 100
+		value = 70
 	}
 	ai_strategy = {
 		type = naval_dominance
@@ -727,6 +766,12 @@ USA_pacific_war_naval_counterattack_2 = {
 		ordertype = invasion
     	execute_order = yes
 	}
+
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_STRIKE_FORCE
+		value = -500
+	}
 }
 
 USA_pacific_war_naval_counterattack_3 = {
@@ -819,6 +864,12 @@ USA_pacific_war_naval_counterattack_3 = {
 		ordertype = invasion
     	execute_order = yes
 	}
+
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_STRIKE_FORCE
+		value = -500
+	}
 }
 
 ### SAD ###
@@ -1054,4 +1105,51 @@ GER_invade_norway = {
 		id = 207
 		value = 100
 	}
+}
+
+major_train_fleet_strategy = {
+	allowed = {
+		OR = {
+			original_tag = CHY
+			original_tag = BYG
+			original_tag = HUJ
+			original_tag = SAD
+			original_tag = YUW
+			original_tag = TIX
+		}
+	}
+	enable = {
+		has_war = no
+		date < 1939.1.1
+	}
+	abort_when_not_enabled = yes
+
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_TRAINING
+		value = -500
+	}
+}
+
+major_dont_hold_fleet = {
+	allowed = {
+		OR = {
+			original_tag = CHY
+			original_tag = BYG
+			original_tag = HUJ
+			original_tag = SAD
+			original_tag = YUW
+			original_tag = TIX
+		}
+	}
+	enable = {
+		has_war = yes
+	}
+	abort_when_not_enabled = yes
+
+	ai_strategy = {
+		type = naval_mission_threshold
+		id = MISSION_HOLD
+		value = 1000
+	}
 }
\ No newline at end of file
diff --git a/src/common/doctrines/subdoctrines/sea/navy_carrier_doctrines.txt b/src/common/doctrines/subdoctrines/sea/navy_carrier_doctrines.txt
index 066cb7c..32d96db 100755
--- a/src/common/doctrines/subdoctrines/sea/navy_carrier_doctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_carrier_doctrines.txt
@@ -49,6 +49,7 @@ carrier_battlegroups = {
 			}
             modifier = {
                 sortie_efficiency = 0.1
+                carrier_capacity_penalty_reduction = -0.1
             }
 		}
 		fleet_antiair = {
@@ -58,6 +59,7 @@ carrier_battlegroups = {
 			}
             modifier = {
                 sortie_efficiency = 0.1
+                fighter_sortie_efficiency = 0.1
             }
 		}
 		alpha_strike = {
diff --git a/src/common/doctrines/subdoctrines/sea/navy_screen_doctrines.txt b/src/common/doctrines/subdoctrines/sea/navy_screen_doctrines.txt
index 0c969c5..ec40c68 100755
--- a/src/common/doctrines/subdoctrines/sea/navy_screen_doctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_screen_doctrines.txt
@@ -262,6 +262,9 @@ torpedo_primacy = {
 			heavy_cruiser = {
 				torpedo_attack = 0.1
 			}
+			medium_cruiser = {
+				torpedo_attack = 0.1
+			}
     	}
     }
 }
@@ -314,6 +317,7 @@ jeune_ecole = {
     	coastal_patrol = {
     		modifier = {
 				mines_planting_by_fleets_factor = 0.2
+				naval_enemy_fleet_size_ratio_penalty_factor = 0.1
 			}
     	}
     }
diff --git a/src/common/doctrines/subdoctrines/sea/navy_submarine_doctrines.txt b/src/common/doctrines/subdoctrines/sea/navy_submarine_doctrines.txt
index 6251ed8..f112023 100755
--- a/src/common/doctrines/subdoctrines/sea/navy_submarine_doctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_submarine_doctrines.txt
@@ -63,9 +63,6 @@ wolfpacks = {
 			}
 		}
     }
-    mastery = {
-        multiplier = 2
-    }
 }
 
 submarine_fleet_operations = {
@@ -133,9 +130,6 @@ submarine_fleet_operations = {
 			}
 		}
     }
-    mastery = {
-        multiplier = 2
-    }
 }
 
 capital_hunters = {
@@ -184,9 +178,6 @@ capital_hunters = {
             }
     	}
     }
-    mastery = {
-        multiplier = 2
-    }
 }
 
 submarine_coastal_defense = {
@@ -239,7 +230,4 @@ submarine_coastal_defense = {
     		}
     	}
     }
-    mastery = {
-        multiplier = 2
-    }
 }
diff --git a/src/common/ideas/navy_spirits.txt b/src/common/ideas/navy_spirits.txt
index 1adfb43..7fe6e95 100755
--- a/src/common/ideas/navy_spirits.txt
+++ b/src/common/ideas/navy_spirits.txt
@@ -521,7 +521,7 @@ ideas = {
 				}
             }
         }
-        disciplined_crewmen = {
+        fleet_interoperability_navy_spirit  = {
             ledger = navy
             modifier = {
                 navy_org_factor = 0.05
diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt
index 29edb05..df0e41f 100755
--- a/src/common/technologies/MTG_naval.txt
+++ b/src/common/technologies/MTG_naval.txt
@@ -223,7 +223,7 @@ technologies = {
 
 		research_cost = 1.5
 
-		start_year = 1940
+		start_year = 1939
 
 		folder = {
 			name = mtgnavalfolder
@@ -1331,7 +1331,7 @@ technologies = {
 
 		research_cost = 1.5
 
-		start_year = 1940
+		start_year = 1939
 
 		folder = {
 			name = mtgnavalfolder
@@ -2162,12 +2162,10 @@ technologies = {
 		research_cost = 0.75
 
 		heavy_cruiser = {
-			lg_attack = 0.075
-			lg_armor_piercing = 0.05
+			lg_attack = 0.05
 		}
 		medium_cruiser = {
-			lg_attack = 0.075
-			lg_armor_piercing = 0.05
+			lg_attack = 0.05
 		}
 		light_cruiser = {
 			lg_attack = 0.05
@@ -3094,7 +3092,7 @@ technologies = {
 
 		research_cost = 1.5
 
-		start_year = 1940
+		start_year = 1939
 
 		folder = {
 			name = mtgnavalfolder
@@ -4377,7 +4375,7 @@ technologies = {
 
 		research_cost = 1.75
 
-		start_year = 1940
+		start_year = 1939
 
 		folder = {
 			name = mtgnavalfolder
@@ -4584,7 +4582,7 @@ technologies = {
 
 		experience_gain_carrier_training_factor = 0.1
 		experience_gain_carrier_combat_factor = 0.1
-		cat_base_strike_cost_factor = -0.1
+		carriers_track_mastery_gain_factor = 0.1
 		ship_hull_carrier_design_cost_factor = -0.1
 
 		path = {
@@ -5284,7 +5282,7 @@ technologies = {
 
 		research_cost = 2.0
 
-		start_year = 1940
+		start_year = 1939
 
 		folder = {
 			name = mtgnavalfolder
diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt
index ab01aab..a98cbbb 100755
--- a/src/common/technologies/MTG_naval_Support.txt
+++ b/src/common/technologies/MTG_naval_Support.txt
@@ -95,11 +95,6 @@ technologies = {
 			custom_effect_tooltip = secondary_battery_advice_tt
 		}
 
-		path = {
-			leads_to_tech = basic_medium_battery
-			research_cost_coeff = 1
-		}
-
 		path = {
 			leads_to_tech = basic_heavy_battery
 			research_cost_coeff = 1
@@ -182,6 +177,11 @@ technologies = {
 			dp_ship_secondaries_1_bb
 			ship_secondaries_2_light
 			ship_anti_air_2_h
+
+			ship_light_medium_battery_2
+			ship_light_medium_battery_2_double
+			ship_light_medium_battery_2_single
+			ship_secondaries_2
 		}
 
 
@@ -228,12 +228,15 @@ technologies = {
 		}
 		light_cruiser = {
 			lg_attack = 0.05
+			lg_armor_piercing = 0.05
 		}
 		heavy_cruiser = {
 			lg_attack = 0.05
+			lg_armor_piercing = 0.05
 		}
 		medium_cruiser = {
 			lg_attack = 0.05
+			lg_armor_piercing = 0.05
 		}
 		##! armored_cruiser = {
 		##! 	lg_attack = 0.05
@@ -302,6 +305,12 @@ technologies = {
 			ship_light_battery_3
 			ship_light_battery_3_double
 			ship_anti_air_3_h
+
+			ship_light_medium_battery_3
+			ship_light_medium_battery_3_double
+			ship_light_medium_battery_3_single
+
+			ship_secondaries_3
 		}
 
 		folder = {
@@ -344,12 +353,15 @@ technologies = {
 		}
 		light_cruiser = {
 			lg_attack = 0.05
+			lg_armor_piercing = 0.05
 		}
 		heavy_cruiser = {
 			lg_attack = 0.05
+			lg_armor_piercing = 0.05
 		}
 		medium_cruiser = {
 			lg_attack = 0.05
+			lg_armor_piercing = 0.05
 		}
 		##! armored_cruiser = {
 		##! 	lg_attack = 0.05
@@ -412,6 +424,11 @@ technologies = {
 			ship_light_battery_4
 			ship_light_battery_4_double
 			ship_anti_air_4_h
+			ship_light_medium_battery_4
+			ship_light_medium_battery_4_double
+			ship_light_medium_battery_4_single
+
+			ship_secondaries_4
 		}
 
 		on_research_complete = {
@@ -447,260 +464,6 @@ technologies = {
 		}
 	}
 
-	basic_medium_battery = {
-
-		research_cost = 0.5
-
-		start_year = 1936
-
-
-		on_research_complete = {
-			custom_effect_tooltip = ca_tech_6_tt
-			custom_effect_tooltip = medium_battery_advice_tt
-			custom_effect_tooltip = secondary_battery_advice_tt
-		}
-
-		path = {
-			leads_to_tech = basic_medium_shell
-			research_cost_coeff = 1
-		}
-
-		enable_equipment_modules = {
-			ship_medium_battery_2
-			ship_medium_battery_2_double
-			ship_medium_battery_2_single
-			ship_light_medium_battery_2
-			ship_light_medium_battery_2_double
-			ship_light_medium_battery_2_single
-			ship_medium_heavy_battery_1
-			ship_medium_heavy_battery_1_double
-			ship_secondaries_2
-
-			sub_battery_1
-		}
-
-
-
-		folder = {
-			name = mtgnavalsupportfolder
-			position = { x = 0 y = 7 }
-		}
-
-		ai_will_do = {
-			factor = 1
-			modifier = {
-				has_tech = interwar_ship_hull_cruiser
-				factor = 10
-			}
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			ship_modules_tech
-			cat_ship_medium_battery
-			mio_cat_tech_all_cruiser_and_modules
-		}
-	}
-
-	basic_medium_shell = {
-
-		research_cost = 0.5
-
-		start_year = 1936
-
-		path = {
-			leads_to_tech = improved_medium_battery
-			research_cost_coeff = 1
-		}
-
-
-		light_cruiser = {
-			lg_armor_piercing = 0.05
-		}
-		heavy_cruiser = {
-			lg_armor_piercing = 0.05
-		}
-		medium_cruiser = {
-			lg_armor_piercing = 0.05
-		}
-
-		folder = {
-			name = mtgnavalsupportfolder
-			position = { x =0 y = 10 }
-		}
-
-		ai_will_do = {
-			factor = 1
-			modifier = {
-				has_tech = interwar_ship_hull_cruiser
-				has_navy_size = {
-					archetype = ship_hull_cruiser
-					size > 5
-				}
-				factor = 7
-			}
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			mio_cat_tech_all_cruiser_and_modules
-		}
-	}
-
-	improved_medium_battery = {
-
-		research_cost = 0.5
-
-		start_year = 1939
-
-		path = {
-			leads_to_tech = improved_medium_shell
-			research_cost_coeff = 1
-		}
-
-
-		on_research_complete = {
-			custom_effect_tooltip = ca_tech_6_tt
-			custom_effect_tooltip = medium_battery_advice_tt
-		}
-		enable_equipment_modules = {
-			ship_medium_battery_3
-			ship_medium_battery_3_double
-			ship_medium_battery_3_single
-			ship_light_medium_battery_3
-			ship_light_medium_battery_3_double
-			ship_light_medium_battery_3_single
-
-			ship_secondaries_3
-
-		}
-
-
-
-		folder = {
-			name = mtgnavalsupportfolder
-			position = { x = 0 y = 13 }
-		}
-
-		ai_will_do = {
-			factor = 1
-			modifier = {
-				has_tech = improved_ship_hull_cruiser
-				factor = 20
-			}
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			ship_modules_tech
-			cat_ship_medium_battery
-			mio_cat_tech_all_cruiser_and_modules
-		}
-	}
-
-	improved_medium_shell = {
-
-		research_cost = 0.5
-
-		start_year = 1942
-
-		path = {
-			leads_to_tech = advanced_medium_battery
-			research_cost_coeff = 1
-		}
-
-		path = {
-			leads_to_tech = basic_dp_medium_battery
-			research_cost_coeff = 1
-		}
-
-		light_cruiser = {
-			lg_armor_piercing = 0.05
-		}
-		heavy_cruiser = {
-			lg_armor_piercing = 0.05
-		}
-		medium_cruiser = {
-			lg_armor_piercing = 0.05
-		}
-
-
-		folder = {
-			name = mtgnavalsupportfolder
-			position = { x = 0 y = 16 }
-		}
-
-		ai_will_do = {
-			factor = 1
-			modifier = {
-				has_tech = improved_ship_hull_cruiser
-				factor = 3
-			}
-			modifier = {
-				has_war = yes
-				factor = 3
-			}
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			mio_cat_tech_all_cruiser_and_modules
-		}
-	}
-
-	advanced_medium_battery = {
-
-		research_cost = 0.5
-
-		start_year = 1944
-
-		enable_equipment_modules = {
-			ship_medium_battery_4
-			ship_medium_battery_4_double
-			ship_medium_battery_4_single
-			ship_light_medium_battery_4
-			ship_light_medium_battery_4_double
-			ship_light_medium_battery_4_single
-			ship_medium_heavy_battery_2
-			ship_medium_heavy_battery_2_double
-			ship_secondaries_4
-		}
-		on_research_complete = {
-			custom_effect_tooltip = ca_tech_12_tt
-			custom_effect_tooltip = medium_battery_advice_tt
-		}
-
-		path = {
-			leads_to_tech = unmanned_gun_turret
-			research_cost_coeff = 1
-		}
-
-		folder = {
-			name = mtgnavalsupportfolder
-			position = { x = 0 y = 19 }
-		}
-
-		ai_will_do = {
-			factor = 1
-			modifier = {
-				has_tech = advanced_ship_hull_cruiser
-				factor = 7
-			}
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			ship_modules_tech
-			cat_ship_medium_battery
-			mio_cat_tech_all_cruiser_and_modules
-		}
-	}
-
 	basic_heavy_battery = {
 
 		research_cost = 0.75
@@ -720,6 +483,13 @@ technologies = {
 			ship_heavy_battery_2
 			ship_heavy_battery_2_triple
 			ship_heavy_battery_2_quad
+			ship_medium_battery_2
+			ship_medium_battery_2_double
+			ship_medium_battery_2_single
+			ship_medium_heavy_battery_1
+			ship_medium_heavy_battery_1_double
+
+			sub_battery_1
 		}
 
 		on_research_complete = {
@@ -729,7 +499,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 6 y = 7 }
+			position = { x = 4 y = 7 }
 		}
 
 		ai_will_do = {
@@ -770,6 +540,9 @@ technologies = {
 			ship_heavy_battery_3
 			ship_heavy_battery_3_triple
 			ship_heavy_battery_3_quad
+			ship_medium_battery_3
+			ship_medium_battery_3_double
+			ship_medium_battery_3_single
 		}
 
 		on_research_complete = {
@@ -779,7 +552,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 6 y = 13 }
+			position = { x = 4 y = 13 }
 		}
 
 		ai_will_do = {
@@ -815,6 +588,11 @@ technologies = {
 			ship_heavy_battery_4
 			ship_heavy_battery_4_triple
 			ship_heavy_battery_4_quad
+			ship_medium_battery_4
+			ship_medium_battery_4_double
+			ship_medium_battery_4_single
+			ship_medium_heavy_battery_2
+			ship_medium_heavy_battery_2_double
 		}
 
 		on_research_complete = {
@@ -825,7 +603,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 6 y = 19 }
+			position = { x = 4 y = 19 }
 		}
 
 		ai_will_do = {
@@ -885,6 +663,12 @@ technologies = {
 		##! 	hg_attack = 0.05
 		##! 	hg_armor_piercing = 0.05
 		##! }
+		heavy_cruiser = {
+			hg_armor_piercing = 0.05
+		}
+		medium_cruiser = {
+			hg_armor_piercing = 0.05
+		}
 
 		enable_equipment_modules = {
 			ship_high_velocity_shell
@@ -892,7 +676,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 6 y = 10 }
+			position = { x = 4 y = 10 }
 		}
 
 		ai_will_do = {
@@ -941,6 +725,12 @@ technologies = {
 		##! 	hg_attack = 0.05
 		##! 	hg_armor_piercing = 0.05
 		##! }
+		heavy_cruiser = {
+			hg_armor_piercing = 0.05
+		}
+		medium_cruiser = {
+			hg_armor_piercing = 0.05
+		}
 
 		enable_equipment_modules = {
 			ship_super_heavy_weight_shell
@@ -948,7 +738,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 6 y = 16 }
+			position = { x = 4 y = 16 }
 		}
 
 		ai_will_do = {
@@ -1072,6 +862,7 @@ technologies = {
 		start_year = 1944
 
 		enable_equipment_modules = {
+			dp_ship_medium_1
 			dp_light_battery_4
 			dp_light_battery_4_single
 			dp_ship_secondaries_4
@@ -1114,47 +905,6 @@ technologies = {
 		}
 	}
 
-	basic_dp_medium_battery = {
-
-		research_cost = 0.5
-
-		start_year = 1944
-
-		enable_equipment_modules = {
-			dp_ship_medium_1
-		}
-
-		on_research_complete = {
-			custom_effect_tooltip = ca_tech_12_tt
-			custom_effect_tooltip = secondary_battery_advice_tt
-		}
-
-		folder = {
-			name = mtgnavalsupportfolder
-			position = { x = 3 y = 19 }
-		}
-
-		ai_will_do = {
-			factor = 2
-			modifier = {
-				OR = {
-					tag = HUJ
-					tag = BYG
-					tag = CHY
-				}
-				factor = 20
-			}
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			ship_modules_tech
-			mio_cat_tech_all_screen_ship_and_modules
-			mio_cat_tech_all_cruiser_and_modules
-		}
-	}
-
 	basic_super_heavy_battery = {
 
 		research_cost = 1.25
@@ -1191,7 +941,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 9 y = 7 }
+			position = { x = 7 y = 7 }
 		}
 
 		ai_will_do = {
@@ -1237,7 +987,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 11 y = 10 }
+			position = { x = 9 y = 10 }
 		}
 
 		ai_will_do = {
@@ -1275,7 +1025,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 9 y = 14 }
+			position = { x = 7 y = 15 }
 		}
 
 		ai_will_do = {
@@ -1315,7 +1065,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 3 y = 15 }
+			position = { x = 0 y = 16 }
 		}
 
 		ai_will_do = {
diff --git a/src/events/MTG_naval_treaty_events.txt b/src/events/MTG_naval_treaty_events.txt
new file mode 100755
index 0000000..69afb5d
--- /dev/null
+++ b/src/events/MTG_naval_treaty_events.txt
@@ -0,0 +1,405 @@
+add_namespace = MTG_naval_treaty
+
+# Country invited to join naval treaty
+country_event = {
+	id = MTG_naval_treaty.1
+	title = MTG_naval_treaty.1.t
+	desc = MTG_naval_treaty.1.desc
+	picture = GFX_report_event_usa_heavy_cruiser
+
+	is_triggered_only = yes
+
+	option = { #accept
+		name = MTG_naval_treaty.1.a 
+		ai_chance = {
+			factor = 70
+			modifier = {
+				has_government = democratic
+				factor = 5
+			}
+			modifier = {
+				has_government = fascism
+				factor = 0.25
+			}
+		}
+		if = {
+			limit = { has_global_flag = MTG_second_london_conference }
+			add_ideas = MTG_naval_treaty_adherent
+		}
+		else = {
+			add_ideas = MTG_naval_treaty_adherent_1936
+		}
+		modify_global_flag = {
+			flag = MTG_naval_treaty_signatories
+			value = 1
+		}
+		every_other_country = {
+			limit = {
+				has_naval_treaty_trigger = yes
+			}
+			country_event = { id = MTG_naval_treaty.2 days = 3 }
+			add_ai_strategy = {
+				type = protect
+				id = PREV
+				value = 100
+			}
+		}
+	}
+	option = { #refuse
+		name = MTG_naval_treaty.1.b 
+		ai_chance = {
+			factor = 30
+		}
+		set_country_flag = MTG_refused_naval_treaty
+		every_other_country = {
+			limit = {
+				has_naval_treaty_trigger = yes
+			}
+			add_opinion_modifier = {
+				target = PREV
+				modifier = refused_naval_treaty
+			}
+			country_event = { id = MTG_naval_treaty.3 days = 3 }
+			add_ai_strategy = {
+				type = contain
+				id = PREV
+				value = 100
+			}
+		}
+	}
+}
+#country accepts naval treaty
+country_event = {
+	id = MTG_naval_treaty.2
+	title = MTG_naval_treaty.2.t
+	desc = MTG_naval_treaty.2.desc
+	picture = GFX_report_event_naval_treaty
+
+	is_triggered_only = yes
+
+	option = { #great
+		name = MTG_naval_treaty.2.a 
+		effect_tooltip = {
+			FROM = {
+				if = {
+					limit = { has_global_flag = MTG_second_london_conference }
+					add_ideas = MTG_naval_treaty_adherent
+				}
+				else = {
+					add_ideas = MTG_naval_treaty_adherent_1936
+				}
+			}
+		}
+	}
+}
+#country refuses naval treaty
+country_event = {
+	id = MTG_naval_treaty.3
+	title = MTG_naval_treaty.3.t
+	desc = MTG_naval_treaty.3.desc
+	picture = GFX_report_event_usa_heavy_cruiser
+
+	is_triggered_only = yes
+
+	option = { #bad end
+		name = MTG_naval_treaty.3.a 
+	}
+}
+#country is warned about the size of its fleet, can commit to disarmament
+country_event = {
+	id = MTG_naval_treaty.4
+	title = MTG_naval_treaty.4.t
+	desc = MTG_naval_treaty.4.desc
+	picture = GFX_report_event_usa_heavy_cruiser
+
+	is_triggered_only = yes
+
+	option = { #disarmament
+		name = MTG_naval_treaty.4.a 
+		ai_chance = {
+			factor = 70
+		}
+		if = {
+			limit = {
+				NOT = { has_naval_treaty_trigger = yes }
+			}
+			activate_mission = MTG_treaty_reduction_mission
+			FROM = {
+				country_event = { id = MTG_naval_treaty.5 days = 3 }
+			}
+		}
+		else = {
+			activate_mission = MTG_treaty_reduction_signatory_mission
+			FROM = {
+				country_event = { id = MTG_naval_treaty.5 days = 3 }
+			}
+		}
+	}
+	option = {# no deals
+		name = MTG_naval_treaty.4.b 
+		ai_chance = {
+			factor = 30
+			modifier = {
+				has_government = democratic
+				factor = 0
+			}
+		}
+		if = {
+			limit = {
+				has_naval_treaty_trigger = yes
+			}
+			add_stability = -0.1
+			add_political_power = -150
+			remove_naval_treaty_effect = yes
+			every_other_country = {
+				limit = {
+					has_naval_treaty_trigger = yes
+				}
+				country_event = MTG_naval_treaty.7
+			}
+			if = {
+				limit = {
+					has_global_flag = {
+						flag = MTG_naval_treaty_signatories
+						value < 3
+					}
+				}
+				random_other_country = {
+					limit = {
+						has_naval_treaty_trigger = yes
+					}
+					remove_naval_treaty_effect = yes
+				}
+				hidden_effect = { news_event = mtg_news.60 }
+				else = {
+					modify_global_flag = {
+						flag = MTG_naval_treaty_signatories
+						value = -1
+					}
+				}
+			}
+			if = {
+				limit = {
+					not = {
+						any_other_country = {
+							OR = {
+								has_idea = MTG_naval_treaty_cheating_reduced
+								has_idea = MTG_naval_treaty_adherent_reduced
+							}
+						}
+					}
+				}
+				every_other_country = {
+					limit = {
+						OR = {
+							has_idea = MTG_naval_treaty_cheating
+							has_idea = MTG_naval_treaty_adherent
+						}
+					}
+					activate_mission = MTG_escalator_clause_invocation_mission
+					custom_effect_tooltip = MTG_escalator_clause_tt
+				}
+			}
+		}
+	}
+}
+#country accepts disarmament
+country_event = {
+	id = MTG_naval_treaty.5
+	title = MTG_naval_treaty.5.t
+	desc = MTG_naval_treaty.5.desc
+	picture = GFX_report_event_naval_treaty
+
+	is_triggered_only = yes
+
+	option = { #great
+		name = MTG_naval_treaty.5.a 
+		effect_tooltip = {
+			FROM = {
+				activate_mission = MTG_treaty_reduction_mission
+			}
+		}
+	}
+}
+
+#country ignores warning
+country_event = {
+	id = MTG_naval_treaty.6
+	title = MTG_naval_treaty.6.t
+	desc = MTG_naval_treaty.6.desc
+	picture = GFX_report_event_usa_heavy_cruiser
+
+	is_triggered_only = yes
+
+	option = { #emabrgo them!
+		name = MTG_naval_treaty.6.a 
+		ai_chance = {
+			factor = 70
+			modifier = {
+				has_war = yes
+				factor = 0.25
+			}
+			modifier = {
+				has_war_support < 0.2
+				factor = 0.5
+			}
+		}
+		send_embargo = FROM
+		add_opinion_modifier = {
+			target = FROM 
+			modifier = broken_naval_treaty_opinion_mod
+		}
+	}
+	option = {# fine
+		name = MTG_naval_treaty.6.b 
+		ai_chance = {
+			factor = 30
+			modifier = {
+				has_completed_focus = ENG_enforce_the_naval_treaties
+				factor = 0
+			}
+		}
+	}
+}
+#country leaves treaty, notification for other countries
+country_event = {
+	id = MTG_naval_treaty.7
+	title = MTG_naval_treaty.7.t
+	desc = MTG_naval_treaty.7.desc
+	picture = GFX_report_event_ast_navy
+
+	is_triggered_only = yes
+
+	option = { #great
+		name = MTG_naval_treaty.7.a 
+		effect_tooltip = {
+			FROM = {
+				remove_naval_treaty_effect = yes
+			}
+		}
+	}
+}
+
+#hidden event to remove treaty if two majors are at war
+country_event = {
+	id = MTG_naval_treaty.10
+	
+	
+	hidden = yes
+	mean_time_to_happen = { days = 2 }
+	fire_only_once = yes
+	trigger = {
+		any_country = {
+			has_naval_treaty_trigger = yes
+			has_war = yes
+			any_enemy_country = {
+				is_major = yes
+				NOT = { tag = event_target:WTT_current_china_leader} #special exception
+			}
+		}
+	}
+	immediate = {
+		every_country = {
+			limit = {
+				has_naval_treaty_trigger = yes
+				has_war = no
+			}
+			country_event = MTG_naval_treaty.11
+		}
+		every_country = {
+			limit = {
+				has_naval_treaty_trigger = yes
+			}
+			remove_naval_treaty_effect = yes
+		}
+	}
+	option = { #great
+	}
+}
+
+#notification event that the naval treaty is null and void due to war being declared
+country_event = {
+	id = MTG_naval_treaty.11
+	title = MTG_naval_treaty.11.t
+	desc = MTG_naval_treaty.11.desc
+	picture = GFX_report_event_ast_navy
+	
+	is_triggered_only = yes
+	
+	option = { #great
+		name = MTG_naval_treaty.11.a 
+	}
+}
+
+country_event = { #notification about 2nd London Naval Conference
+	id = MTG_naval_treaty.12
+	title = MTG_naval_treaty.12.t
+	desc = MTG_naval_treaty.12.d
+	picture = GFX_report_event_second_london_treaty
+	
+	is_triggered_only = yes
+	
+	option = { #yes
+		name = MTG_naval_treaty.12.a 
+		if = {
+			limit = { has_idea = MTG_naval_treaty_adherent }
+			swap_ideas = {
+				remove_idea = MTG_naval_treaty_adherent
+				add_idea = MTG_naval_treaty_adherent_1936
+			}
+		}
+		else = {
+			swap_ideas = {
+				remove_idea = MTG_naval_treaty_cheating
+				add_idea = MTG_naval_treaty_adherent_1936
+			}
+		}
+        
+        if = {
+			limit = {
+				OR = {
+					has_government = fascism 
+					has_government = communism
+				}
+			}
+			custom_effect_tooltip = fascism_renew_naval_treaty_tt
+			add_political_power = -100
+		}
+		else = {
+			custom_effect_tooltip = democracy_renew_naval_treaty_tt
+			add_political_power = 10
+		}
+		set_country_flag = MTG_second_london_treaty_signed
+		
+		ai_chance = {
+			factor = 100
+			modifier = {
+				OR = {
+					has_government = fascism 
+					has_government = communism
+					tag = CHY
+				}
+				factor = 0
+			}
+		}
+	}
+	option = { #no
+		name = MTG_naval_treaty.12.b
+		modify_global_flag = { flag = MTG_naval_treaty_violator value = 1 }
+		
+		ai_chance = {
+			factor = 10
+			modifier = {
+				NOT = {
+					has_government = fascism 
+					has_government = communism
+				}
+				factor = 0
+			}
+			modifier = {
+				tag = CHY
+				add = 100
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt
index 2d819d8..58fd14e 100755
--- a/src/events/ai_ships.txt
+++ b/src/events/ai_ships.txt
@@ -287,7 +287,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		OR = {
-			date > 1939.1.1
+			date > 1938.1.1
 			OR = {
 				AND = {
 					expert_ai_style = no
@@ -340,8 +340,6 @@ country_event = {
 					basic_dp_light_battery = 1 
 					improved_heavy_battery = 1
 					improved_super_heavy_battery = 1
-					improved_medium_battery = 1 
-					improved_medium_heavy_battery = 1 
 					improved_light_battery = 1 
 					advanced_ship_torpedo_launcher = 1 
 					improved_ship_hull_carrier = 1
@@ -362,7 +360,6 @@ country_event = {
 					krupp_cemented_steel = 1
 
 					basic_light_shell = 1
-					basic_medium_shell = 1
 					basic_heavy_shell = 1
 					magnetic_detonator = 1
 					oxygen_torpedo = 1
@@ -444,7 +441,6 @@ country_event = {
 					monopulse_radar = 1 
 					advanced_dp_light_battery = 1 
 					advanced_heavy_battery = 1 
-					advanced_medium_battery = 1 
 					advanced_light_battery = 1
 					advanced_heavy_armor = 1
 					advanced_cruiser_armor = 1
@@ -795,7 +791,6 @@ country_event = {
 					escort_carriers_ship = 1
 
 					improved_light_shell = 1
-					improved_medium_shell = 1
 					improved_heavy_shell = 1
 					improved_dp_light_battery = 1
 					homing_torpedo = 1