diff --git a/common/ideas/_economic.txt b/common/ideas/_economic.txt
@@ -2,125 +2,256 @@ ideas = {
 
 	economy = { 
 		law = yes
-		free_market_law = {
+		undisturbed_isolation = {
 
 
-			available = {
-
-				OR = {
-
-					has_government = liberalism
-					has_government = conservatism
-
-				}
-
+			allowed = {
+				always = no
 			}
-
 			removal_cost = -1
-			cost = 200 
 
 			modifier = {
-				consumer_goods_factor = 0.05  
+				consumer_goods_factor = 0.40
 				production_speed_industrial_complex_factor = -0.5
 				production_speed_arms_factory_factor = -0.5
 				conversion_cost_civ_to_mil_factor = 0.5
 				conversion_cost_mil_to_civ_factor = 0.5
-				industrial_capacity_factory = -0.15 
-               	production_factory_max_efficiency_factor = -0.1
+				generate_wargoal_tension = 1.00
+				join_faction_tension = 0.20
+				lend_lease_tension = 0.50
+				send_volunteers_tension = 0.20
+				guarantee_tension = 0.75
 			}
 
-			default = yes
-
+			allowed_to_remove = {
+				OR = {
+					threat > 0.5
+					has_war = yes
+				}
+			}
+
+			cancel_if_invalid = no
 		}
 
-		mixed_economy_law = {
+		isolation = {
 
-			available = {
-
-				NOT = {
-
-					has_government = communism
-
+
+
+			allowed = {
+				always = no
+			}
+			removal_cost = -1
+
+			modifier = {
+				consumer_goods_factor = 0.35
+				production_speed_industrial_complex_factor = -0.4
+				production_speed_arms_factory_factor = -0.4
+				conversion_cost_civ_to_mil_factor= 0.4
+				conversion_cost_mil_to_civ_factor = 0.4
+				generate_wargoal_tension = 1.00
+				join_faction_tension = 0.20
+				send_volunteers_tension = 0.20
+				guarantee_tension = 0.5
+			}
+			allowed_to_remove = {
+				OR = {
+					threat > 0.75
+					has_war = yes					
 				}
-
 			}
-
+
+			cancel_if_invalid = no
+		}
+
+		civilian_economy = {
+
+
+			cost = 150
 			removal_cost = -1
-			cost = 200 
 
 			modifier = {
-				consumer_goods_factor = 0.15 
-				production_speed_industrial_complex_factor = 0.1
-				production_speed_arms_factory_factor = 0.1
-				conversion_cost_civ_to_mil_factor= -0.1
-				conversion_cost_mil_to_civ_factor = -0.1
-				industrial_capacity_factory = -0.05  
-
+				consumer_goods_factor = 0.30
+				production_speed_industrial_complex_factor = -0.3
+				production_speed_arms_factory_factor = -0.3
+				conversion_cost_civ_to_mil_factor= 0.3
+				conversion_cost_mil_to_civ_factor = 0.3
 			}
 
 			default = yes
 
+			cancel_if_invalid = no
 		}
 
-
-		collectivized_economy_law = {
+		low_economic_mobilisation = {
 
 			available = {
-
 				OR = {
-
+					has_government = national_integralism
 					has_government = socialism
 					has_government = communism
-
-					}
-					
-				}			
-
+					has_war = yes
+					threat > 0.05
+				}
+
+			}
 
-			cost = 250
+			cost = 150
 			removal_cost = -1
 
 			modifier = {
+				consumer_goods_factor = 0.25
+
+				production_speed_industrial_complex_factor = -0.1
+				production_speed_arms_factory_factor = -0.1
+			}
+
+			cancel_if_invalid = no
+
+			ai_will_do = {
+   				factor = 2
+
+   				modifier = {
+					factor = 20
+
+					is_major = yes
+				}
+   			}
+		}
+
+		partial_economic_mobilisation = {
 
-				consumer_goods_factor = 0.1 
-				industrial_capacity_factory = -0.1 
-				unity_factor = 0.1
+			available = {
+				OR = {
+					has_government = national_integralism
+					has_government = communism
+					has_war = yes
+					threat > 0.15
+				}
+
 
 			}
+
+			cost = 150
+			removal_cost = -1
 
-			default = yes 
+			modifier = {
+				consumer_goods_factor = 0.20
+				production_speed_arms_factory_factor = 0.1
+				conversion_cost_civ_to_mil_factor= -0.1
+				conversion_cost_mil_to_civ_factor = -0.1
+			}
+
+			cancel_if_invalid = no
+
+			ai_will_do = {
+   				factor = 2
+
+   				modifier = {
+					factor = 20
+
+					is_major = yes
+				}
+   			}
 		}
 
-		nationalized_economy_law = {
+		war_economy = {
 
-			available = {
 
+			available = {
+				threat > 0.15
 				OR = {
-
 					has_government = national_integralism
-					has_government = reactionarism
 					has_government = communism
-					has_government = socialism
-
-				}			
+					custom_trigger_tooltip = { tooltip = or_clarification_tooltip always = no }
+					AND = {
+						has_war = yes
+						any_enemy_country = {
+							ic_ratio = { 
+								tag = ROOT 
+								ratio > 0.4
+							}
+						}
+					}
+				}
+
 			}
-
-			cost = 350  
+		
+			cost = 150
 			removal_cost = -1
 
 			modifier = {
+				consumer_goods_factor = 0.15
+				production_speed_arms_factory_factor = 0.2
+				conversion_cost_civ_to_mil_factor= -0.2
+				conversion_cost_mil_to_civ_factor = -0.2
+			}
+
+			cancel_if_invalid = no
+
+			ai_will_do = {
+   				factor = 5
+
+				modifier = {
+					#High prio on production
+					factor = 20
+					manpower_per_military_factory >  1000
+				}
+   			}
+		}
+
+		tot_economic_mobilisation = {
+
 
-				consumer_goods_factor = 0.25  
-				production_speed_arms_factory_factor = 0.5
-				conversion_cost_civ_to_mil_factor= -0.5
-				conversion_cost_mil_to_civ_factor = -0.5
-				production_factory_max_efficiency_factor = 0.1 
-				industrial_capacity_factory = 0.2 
-				unity_factor = -0.05 
+			available = {
+				has_war = yes
+				threat > 0.2
+				any_enemy_country = {
+					ic_ratio = { 
+						tag = ROOT 
+						ratio > 0.5
+					}
+				}
+
+			}
+
+			ai_will_do = {
+   				factor = 1
+
+				modifier = {
+					factor = 25
+					#Prio this if nation has a lot of manpower compared to MIC
+					manpower_per_military_factory >  10000
+				}
+
+				modifier = {
+					#Block  unless nation has a lot of manpower
+					factor = 0
+					manpower_per_military_factory <  3000
+				}
+
 
+				modifier = {
+					# never take this if we are on low conscription laws for safety
+					factor = 0
+					OR = {
+						has_idea = volunteer_only
+						has_idea = limited_conscription
+					}
+				}				
+   			}
+
+			cost = 150
+			removal_cost = -1
+
+			modifier = {
+				consumer_goods_factor = 0.10
+				conscription = -0.03
+				production_speed_arms_factory_factor = 0.3
+				conversion_cost_civ_to_mil_factor= -0.3
+				conversion_cost_mil_to_civ_factor = -0.3
 			}
 
-			default = yes 
+			cancel_if_invalid = no
 		}
 	}
 
@@ -136,6 +267,7 @@ ideas = {
 			modifier = {
 				min_export = 0.8
 				industrial_capacity_factory = 0.15
+				industrial_capacity_dockyard = 0.15
 				production_speed_buildings_factor = 0.15
 				research_time_factor = -0.10
 			}
@@ -152,6 +284,7 @@ ideas = {
 			modifier = {
 				min_export = 0.5
 				industrial_capacity_factory = 0.1
+				industrial_capacity_dockyard = 0.1
 				production_speed_buildings_factor = 0.1
 				research_time_factor = -0.05
 			}
@@ -167,11 +300,12 @@ ideas = {
 			available = {
 				OR = {
 					AND = {
-					    OR = {
-							has_government = liberalism
-					        has_government = socialism
-					        has_government = conservatism
-							has_government = reactionarism
+						OR = {
+
+							has_government = conservatism
+							has_government = liberalism 
+							has_government = socialism
+
 						}
 						has_war = yes
 						any_enemy_country = {
@@ -182,11 +316,13 @@ ideas = {
 						}
 					}
 					AND = {
-						NOT = { 							
-						    has_government = liberalism
-					        has_government = socialism
-					        has_government = conservatism
-							has_government = reactionarism
+						NOT = { has_government = conservatism
+							has_government = liberalism 
+							has_government = socialism }
+						OR = {
+							has_idea = partial_economic_mobilisation
+							has_idea = war_economy
+							has_idea = tot_economic_mobilisation
 						}
 					}
 				}
@@ -198,6 +334,7 @@ ideas = {
 			modifier = {
 				min_export = 0.25
 				industrial_capacity_factory = 0.05
+				industrial_capacity_dockyard = 0.05
 				production_speed_buildings_factor = 0.05
 				research_time_factor = -0.01
 			}
@@ -227,9 +364,10 @@ ideas = {
 					has_government = communism
 				}
 				OR = {
-					NOT = {	tag = SOV }
-					NOT = { has_opinion_modifier = MR_pact }
+					has_idea = war_economy
+					has_idea = tot_economic_mobilisation
 				}
+
 			}
 
 			cost = 150

diff --git a/common/ideas/_foreign_policy.txt b/common/ideas/_foreign_policy.txt
diff --git a/common/ideas/_internal_policy.txt b/common/ideas/_internal_policy.txt
diff --git a/common/ideas/soviet.txt b/common/ideas/soviet.txt
@@ -2,7 +2,24 @@ ideas = {
 
     country = {
 
+	 SOV_no_leadership = {
+			removal_cost = -1
+      picture = generic_disjointed_gov
+
+			allowed = {
+				always = no 
+			}
 
+			allowed_civil_war = {
+				has_government = communism
+			}
+
+			modifier = {
+				unity_factor = -0.1 
+			}
+		}
+
+
     home_of_revolution = {
 			removal_cost = -1
       picture = home_of_revolution

diff --git a/common/national_focus/soviet.txt b/common/national_focus/soviet.txt
diff --git a/events/Soviet_Republic.txt b/events/Soviet_Republic.txt
diff --git a/gfx/leaders/SOV/Shliapnikov.dds b/gfx/leaders/SOV/Shliapnikov.dds
diff --git a/gfx/leaders/SOV/Soviet_Assembly.dds b/gfx/leaders/SOV/Soviet_Assembly.dds
diff --git a/localisation/SovietRepublic_l_english.yml b/localisation/SovietRepublic_l_english.yml
@@ -5,6 +5,24 @@
 Gosplan_Congress:0 "Economic Congress"
 Gosplan_Congress_desc:0 "We must call a new congress of Gosplan in order to reevaluate our economic directions and focus."
 Decentralized_Socialism:0 "Decentralized Socialist System"
+1936_assembly:0 "All-Soviet Assembly of 1936"
+1936_assembly_desc:0 "The annual All-Soviet Parliamentary Assembly have convened in January to discuss several key issues regarding the future of the state. While Trotsky's policies managed to dominate the political stage until now, several parties and factions within the RSDLP have been making moves to outmanuver the party center this year."
+Internal_Policies:0 "The Political System"
+Internal_Policies_desc:0 "The assembly opened with fierce debates over the economic system of the country, with radical suggestions for future reforms."
+Economic_Policies:0 "The Economic Question"
+Economic_Policies_desc:0 "The elected representatives of the All-Soviet Assembly have gathered to decide the future of the country's economic direction."
+National_Policies:0 "The Question Of Nationalities"
+National_Policies_desc:0 "One of the most contentious political issues in the Soviet Republic is the question of the many different nationalities living in its territory."
+Foreign_Policies:0 "Diplomatic Direction"
+Foreign_Policies_desc:0 "The historic convention is coming to an end and the final issue debated in the Soviet Hall of Moscow is the issue of the state's diplomatic policies."
+Trotsky_Wins:0 "Party Center"
+Trotsky_Wins_desc:0 "With Trotsky reelected as the republic's chairman, the party center can continue in its sacred goal of spreading the workers' revolution worldwide."
+Kirov_Wins:0 "Right Opposition"
+Kirov_Wins_desc:0 "Using his many contacts and follower within the party Sergey Kirov have managed to secure the post of Chairman and can now pursue his own vision for the Soviet Republic."
+Left_Wins:0 "Left Opposition"
+Left_Wins_desc:0 "In a surprise turn of events Alexander Shliapnikov managed to get his loose coalition to a position of power and get elected as chairman of the republic. A bright new future awaits the workers of the world."
+Moderates_Win:0 "People's Reform Coalition"
+Moderates_Win_desc:0 "The Soviet experiment have run its course and the people have elected Chairman Chernov to see the restoration of the 1907 constitution and the Russian People's Republic."
 
 New_Economic_Policy:0 "Market Socialist System"
 New_Economic_Policy_desc:0 "Our current economic choices are clearly not working well enough - let us instead take our economy in a radical new direction to improve it significantly!"
@@ -82,33 +100,48 @@ Dealing_With_Nationalists:0 "Dealing With The Nationalists"
 ###events####
  soviet.1.t:0 "The Soviet Republic"
  soviet.1.d:0 "The Soviet Republic was formed in the fires of the worldwide social upheaval of the mid-1920s after the devestating 2nd Russian-Japanese war. The Soviet Republic, despite its popularity at home, faces near universal diplomatic isolation, with the Japanese rivals in the east setting up their own pretender regime which is seen as the legitimate Russian government by many capitalist countries. With the death of Lenin in 1928, Leon Trotsky becamethe  leader of the Republic, leading it to rapidly gear towards the perpetual revolution envisioned by Trotsky and the Second International.  Will the workersfinally be able to break their shackles under the guidance of the Soviet Republic?"
- soviet.1.a:0 "Onwards to Revolution!"
- soviet.2.d:0 "-"
- soviet.2.t:0 "All-Soviet Constitutent Assembly"
- soviet.2.a:0 "The Future is Uncertain"
- soviet.3.t:0 " Internal Policies"
- soviet.3.d:0 "Internal Policies"
- soviet.3.a:0 "Authoritarian"
- soviet.3.b:0 "Liberal"
- soviet.4.t:0 "Economic Policies"
- soviet.4.d:0 "Economic Policies"
+ soviet.1.a:0 "Long live the revolution!"
+ soviet.2.t:0 "All-Soviet Parliamentary Assembly"
+ soviet.2.d:0 "The winter seat of the All-Soviet Parliamentary Assembly have opened today, with several factions pushing for different policies. The RSDLP party center lead by Trotsky, the leftist opposition lead by Alexander Shliapnikov in a coalition with other Anarchists, Syndicalists and libertarian Marxists, the right opposition lead by Sergey Kirov and his followers, as well as the People's Reform Coalition of the Russian Union of Liberals and the Socialist Revolutionary Party, who wish to restore the Russian Constitution of 1907. The congress is predicted to be dominated by questions about the nation's economy, political system, national identity and foreign policy."
+ soviet.2.a:0 "I love democracy"
+ soviet.3.t:0 "The political system"
+ soviet.3.d:0 "The first issue that was brought up in the assembly was the nature of the Soviet political system. While the hundreds of different members all had their own ideas as to what would be the best government form, the different factions mainly divided into 3 groups, with the Kirovists pushing for a more centralized system with restrictions on counter-revolutionary activities, the Left opposition and the People's Reform Coalition supporting a more direct and libertarian democracy, while the party center wishing to maintain the status quo."
+ soviet.3.a:0 "The state needs to be strong"
+ soviet.3.b:0 "Democracy is the only way to socialism"
+ soviet.3.c:0 "Maintain the status quo"
+ soviet.4.t:0 "Economic Question"
+ soviet.4.d:0 "Three main economic policies have been proposed in the assembly, with both the party center and most of the Kirovists advocating a planned economy with full state control over the development of the economy, with a portion of the Kirovists proposing a 'Market Socialist' system, which will combine elements of socialist economics and a market economy, with a similar policy advocated by the People's Reform Coalition. Left Opposition members have proposed several different models of decentralized socialist systems ranging from Syndicalism to Anarcho-Communism, but they are at a political disadvantage to push their reforms."
  soviet.4.a:0 "Market Socialism"
- soviet.4.b:0 "State Capitalism"
+ soviet.4.b:0 "Planned economy"
  soviet.4.c:0 "Decentralized Socialism"
- soviet.5.t:0 "National Policies"
- soviet.5.d:0 "National Policies"
- soviet.5.a:0 "Internationalism"
- soviet.5.b:0 "Nationalism"
- soviet.5.c:0 "Federalization"
- soviet.6.t:0 "Foreign Policies"
- soviet.6.d:0 "Foreign Policies"
- soviet.6.a:0 "Defensive"
+ soviet.5.t:0 "The National Question"
+ soviet.5.d:0 "One of the oldest issues in the post-revolutionary Russia was the question of the different nationalities living within it and the national character of the state. This issue has persisted into the Soviet era,with three main approaches occupying the Assembly. Both the party center and the left opposition support an internationalist identity for the state, reflecting the global nature of the Workers' revolution. The Kirovists propose a more practical federal solution with the various nationalities recieving different levels of political autonomy within the state, while the People's Reform Coalition proposing a strictly Russian character for the state, with equal rights for minorities."
+ soviet.5.a:0 "The workers know no nations!"
+ soviet.5.b:0 "Russia will remain at the center "
+ soviet.5.c:0 "A Soviet Federation is what we need"
+ soviet.6.t:0 "Diplomatic Approach"
+ soviet.6.d:0 "The last issue discussed at the Assembly is the question of the country's diplomatic attitude. The party center and the Radical left opposition both support the World Revolution idea, that the revolution must be spread as quickly and as massively as possible for its survival, while the Kirovists proposing a more cynical 'imperialist' attitude, to further the state's goals above all else, a sentiment shared by some of the more nationalist members of the People's Reform coalition. The rest of the Coalition's members suggest a more defensive approach, prefering peaceful advancement of the Republic's interests."
+ soviet.6.a:0 "Pacifism and isolationism"
  soviet.6.b:0 "World Revolution"
- soviet.6.c:0 "Imperialist"
- soviet.7.t:0 "Trotsky"
- soviet.8.t:0 "Kirov"
- soviet.9.t:0 "Left Opposition"
- soviet.10.t:0 "Moderates"
+ soviet.6.c:0 "Imperialist Expansion"
+ soviet.7.t:0 "Closing of the All-Soviet Parliamentary Assembly"
+ soviet.7.d:0 "With the last of the debates finally ending the closing ceremony of the 1936 All-Soviet Parliamentary Assembly winter convention can begin. One last vote with all members of the Soviet present will determine the new chairman of the Soviet Republic!"
+ soviet.7.a:0 "Leon Trotsky of the RSDLP"
+ soviet.7.b:0 "Sergey Kirov of the RSDLP, right"
+ soviet.7.c:0 "Alexander Shliapnikov of the RSDLP, left"
+ soviet.7.e:0 "Viktor Chernov of the SRP"
+ soviet.8.t:0 "No majority reached"
+ soviet.8.d:0 "Following the winter convention of the 1936 All-Soviet Assembly no majority vote could be reached over the new chairman of the republic, so the duties of the chairman have been assumed by the Assembly itself."
+ soviet.8.a:0 "This is bad news..."
+ soviet.9.t:0 "Trotsky declares victory"
+ soviet.9.d:0 "Following his election as the Chairman of the Soviet Republic, Leon Trotsky made a speech in the Moscow Soviet emphasizing the role of the Soviet state in the world proletarian revolution. While popular with the people, Trotsky has many enemies outside the country."
+ soviet.9.a:0 "The revolution must spread!"
+ soviet.10.t:0 "Shliapnikov declares victory"
+ soviet.10.d:0 "Following his election as the Chairman of the Soviet Republic, Alexander Shliapnikov have made a speech in the Moscow House of the Unions addressing union leaders from around the country, emphasizing the immense task of creating a true communist utopia in Eurasia and the world."
+ soviet.10.a:0 "Freedom for the working peoples"
+ soviet.11.t:0 "Kirov declares victory"
+ soviet.11.d:0 "Following his election as the Chairman of the Soviet Republic, Sergey Kirov have made a radio address to the entire nation, declaring a new era for the working class and the soviet people. While enjoying popularity from the people and the state apparatus, many of the party's old guard are worried about Kirov's policies and personality."
+
  soviet.12.t:0 "Unrest in Mongolia"
  soviet.12.d:0 "In our efforts to make allies in the far east our agents have contacted the Mongolian revolutionary warlord Damdin Sükhbaatar who have long been waging a resistance against the autocratic rule of the Bogd Khanate. Our agents have been supplying Sukhbaatar with weapons and training them in the border regions between Siberia and Tanna Tuva and the revolutionaries are now ready to strike."
  soviet.12.a:0 "Long live the workers' revolution!"
@@ -205,7 +238,20 @@ Dealing_With_Nationalists:0 "Dealing With The Nationalists"
  SOV_five_year_plan_draft:0 "The Five Year Plan Draft"
 Gosplan_Congress_Happens:0 "The Gosplan Congress Occurs"
 gosplan_complete:0 "The Gosplan Congress has occured through completing either the left or the right political path."
+SOV_no_leadership:0 "Unclear leadership"
+SOV_no_leadership_desc:0 "Following  the 1936 winter convention of the All-Soviet Assembly no new chairman could be elected and the Assembly have taken on the duties of the Chairman."
 ####tooltip####
 world_revolution_tooltip:0 "World Revolution"
-manchurian_rebels_tip:0 "This will support rebels in Manchuria, which will rise up and fight alongside us when we are at war with Japan."
-korean_rebels_tip:0 "This will support rebels in Korea, which will rise up and fight alongside us when we are at war with Japan."
+SOV_authoritarian_internal:0 "Centralization"
+SOV_liberal_internal:0 "Liberalization"
+SOV_internal_status_quo:0 "Status Quo"
+SOV_dec_soc_economic:0 "Decentralized Socialism"
+SOV_msocialist_economic:0 "Market Socialism"
+SOV_scapitalist_economic:0 "Planned Economy"
+SOV_int_national:0 "Internationalism"
+SOV_nat_national:0 "Russian Nationalism"
+SOV_fed_national:0 "Federalism"
+trotsky_victory:0 "Party center maintains power"
+kirov_victory:0 "The Kirovists control the assembly"
+SOV_left_victory:0 "The Left opposition sweepes the assembly"
+