diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000000..b3da54f0c6
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1 @@
+15.7.2020 Added Greymane bloodline
diff --git a/common/bloodlines/wc_bloodlines.txt b/common/bloodlines/wc_bloodlines.txt
index d685db1382..6243ae22fc 100644
--- a/common/bloodlines/wc_bloodlines.txt
+++ b/common/bloodlines/wc_bloodlines.txt
@@ -26,11 +26,11 @@ deathwing = {
 madoran = {
 	combat_rating = 5
 	monthly_character_prestige = 0.2
-	build_time_modifier = -0.05	
+	build_time_modifier = -0.05
 	bronzebeard_opinion = 10
 	wildhammer_opinion = 5
-	dark_iron_opinion = -10	
-	
+	dark_iron_opinion = -10
+
 	inheritance = patrilineal
 	allow_bastards = yes
 	picture = GFX_bloodlines_placeholder_symbol_2
@@ -42,7 +42,7 @@ khardros = {
 	levy_reinforce_rate = 0.02
 	bronzebeard_opinion = 5
 	wildhammer_opinion = 10
-	dark_iron_opinion = -10	
+	dark_iron_opinion = -10
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -51,11 +51,11 @@ khardros = {
 }
 thaurissan = {
 	combat_rating = 5
-	monthly_character_piety = 0.1	
+	monthly_character_piety = 0.1
 	tech_growth_modifier_military = 0.01
 	bronzebeard_opinion = -10
 	wildhammer_opinion = -10
-	dark_iron_opinion = 5	
+	dark_iron_opinion = 5
 	fire_cult_opinion = 5
 
 	inheritance = patrilineal
@@ -92,7 +92,7 @@ terenas = {
 	monthly_character_prestige = 0.2
 	human_group_opinion = 10
 	vassal_opinion = 3
-	global_revolt_risk = -0.02	
+	global_revolt_risk = -0.02
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -100,7 +100,7 @@ terenas = {
 	flags = { historical_bloodline }
     active = {
         is_member_of_alliance_faction_trigger = yes
-    }	
+    }
 }
 thoradin = {
 	combat_rating = 8
@@ -115,10 +115,10 @@ thoradin = {
 	flags = { historical_bloodline bloodline_heroes }
 }
 waylon = {
-	monthly_character_prestige = 0.1	
+	monthly_character_prestige = 0.1
 	tirassian_opinion = 5
-	tidemother_opinion = 5	
-	bloodline_effect_shaman_training = 1	
+	tidemother_opinion = 5
+	bloodline_effect_shaman_training = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -130,7 +130,7 @@ rastakhan = {
 	monthly_character_piety = 0.1
 	combat_rating = 5
 	troll_group_opinion = 5
-	cult_of_loa_opinion = 5	
+	cult_of_loa_opinion = 5
 	bloodline_effect_loa_priest_training = 1
 
 	inheritance = patrilineal
@@ -157,8 +157,8 @@ zuljin = { # 603 only, no related event for earlier start
 kolk = {
 	monthly_character_prestige = 0.2
 	combat_rating = 5
-	theradras_worship_opinion = 10	
-	bloodline_effect_warrior_training = 1	
+	theradras_worship_opinion = 10
+	bloodline_effect_warrior_training = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -169,7 +169,7 @@ maraudos = {
 	monthly_character_prestige = 0.2
 	combat_rating = 5
 	theradras_worship_opinion = 10
-	bloodline_effect_shaman_training = 1	
+	bloodline_effect_shaman_training = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -182,7 +182,7 @@ tyrande = {
 	combat_rating = 8
 	kaldorei_religion_opinion = 5
 	church_opinion = 5
-	bloodline_effect_priest_training = 1	
+	bloodline_effect_priest_training = 1
 
 	inheritance = matrilineal
 	picture = GFX_bloodlines_placeholder_symbol_2
@@ -192,8 +192,8 @@ malfurion = {
 	monthly_character_prestige = 0.1
 	druidism_group_opinion = 5
 	night_elf_opinion = 5
-	tauren_opinion = 5	
-	bloodline_effect_druid_training = 1	
+	tauren_opinion = 5
+	bloodline_effect_druid_training = 1
 
 	inheritance = patrilineal
 	picture = GFX_bloodlines_symbol_finnish_bearpaw
@@ -202,9 +202,9 @@ malfurion = {
 #Orcs
 blackhand = {
 	monthly_character_prestige = 0.1
-	combat_rating = 5	
+	combat_rating = 5
 	orcish_fel_opinion = 10
-	bloodline_effect_warrior_training = 1	
+	bloodline_effect_warrior_training = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -213,9 +213,9 @@ blackhand = {
 }
 durotan = {
 	monthly_character_piety = 0.1
-	combat_rating = 5	
+	combat_rating = 5
 	orcish_shamanism_opinion = 10
-	bloodline_effect_shaman_training = 1	
+	bloodline_effect_shaman_training = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -226,7 +226,7 @@ grommash = { # For TFT/Garrosh
 	monthly_character_prestige = 0.1
 	combat_rating = 8
 	orcish_shamanism_opinion = 10
-	bloodline_effect_inspire_commanders = 1	
+	bloodline_effect_inspire_commanders = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -250,8 +250,8 @@ uther = {
 	combat_rating = 8
 	monthly_character_piety = 0.1
 	light_group_opinion = 10
-	bloodline_effect_paladin_training = 1	
-	bloodline_effect_great_heroes_appear = 1	
+	bloodline_effect_paladin_training = 1
+	bloodline_effect_great_heroes_appear = 1
 
 	inheritance = patrilineal
 	picture = GFX_bloodlines_symbol_war_knight
@@ -277,7 +277,7 @@ saidan = {
 	combat_rating = 8
 	monthly_character_piety = 0.1
 	light_group_opinion = 10
-	bloodline_effect_paladin_training = 1	
+	bloodline_effect_paladin_training = 1
 	command_modifier = {
 		religious_enemy = 0.05
 	}
@@ -312,7 +312,7 @@ turalyon = {
 	bloodline_effect_paladin_training = 1
 	command_modifier = {
 		morale_defence = 0.05
-	}	
+	}
 
 	inheritance = patrilineal
 	picture = GFX_bloodlines_symbol_war_knight
@@ -325,9 +325,9 @@ turalyon = {
 dathremar = {
 	combat_rating = 8
 	monthly_character_prestige = 0.2
-	tech_growth_modifier_culture = 0.02	
+	tech_growth_modifier_culture = 0.02
 	elf_group_opinion = 10
-	amani_opinion = -10	
+	amani_opinion = -10
 	bloodline_effect_mage_training = 1
 
 	inheritance = patrilineal
@@ -342,7 +342,7 @@ lireesa = { # 603 only, no related event for earlier start
 	bloodline_effect_hunter_training = 1
 	command_modifier = {
 		morale_defence = 0.05
-	}	
+	}
 
 	inheritance = patrilineal
 	allow_bastards = yes
@@ -368,7 +368,7 @@ ulfar = { # High Thornspeaker of the Ancient Drust
 	throsic_opinion = -15
 	tirassian_opinion = 5
 	drust_opinion = 5
-	old_ways_opinion = 5	
+	old_ways_opinion = 5
 	bloodline_effect_druid_training = 1
 
 	inheritance = patrilineal
@@ -382,11 +382,25 @@ ymiron = {
 	vrykul_opinion = 10
 	command_modifier = {
 		morale_offence = 0.05
-	}	
+	}
 	bloodline_effect_warrior_training = 1
 
 	inheritance = patrilineal
 	allow_bastards = yes
 	picture = GFX_bloodlines_placeholder_symbol_2
 	flags = { historical_bloodline bloodline_warrior_training }
-}
\ No newline at end of file
+}
+greymane = {
+	monthly_character_prestige = 0.15
+	
+	gilnean_opinion = 10
+	
+	local_revolt_risk = 0.05
+	
+	local_tax_modifier	= 0.05
+	
+	
+	inheritance = patrilineal
+	picture = bloodlines_symbol_norse_wolf
+	flags = { historical_bloodline bloodline_heroes }
+}
diff --git a/history/characters/46000_gilnean.txt b/history/characters/46000_gilnean.txt
index d3236b1ca5..d75efc07d6 100644
--- a/history/characters/46000_gilnean.txt
+++ b/history/characters/46000_gilnean.txt
@@ -5,9 +5,15 @@
 	dna="ckijbdhmnng"
 	culture=gilnean religion=holy_light
 	martial=6 diplomacy=6 stewardship=6 intrigue=5 learning=6
-	add_trait=fortune_builder add_trait=diligent 
+	add_trait=midas_touched add_trait=diligent
 	add_trait=trusting
+	add_trait=patient
 	518.8.9={ birth=yes add_trait=creature_human }
+	545.7.11 = {
+		create_bloodline = {
+			type = greymane
+		}
+	}
 	569.3.15={ death=yes }
 }
 46001={
@@ -39,7 +45,7 @@
 	dna="glijbjhmbng"
 	culture=gilnean religion=holy_light
 	martial=6 diplomacy=5 stewardship=4 intrigue=6 learning=6
-	add_trait=charismatic_negotiator add_trait=chaste add_trait=gregarious add_trait=humble 
+	add_trait=charismatic_negotiator add_trait=chaste add_trait=gregarious add_trait=humble
 	add_trait=trusting add_trait=kind
 	disallow_random_traits=yes
 	558.4.12={ birth=yes add_trait=creature_human }
@@ -166,7 +172,7 @@
 	dna="hccfigjgecn"
 	culture=gilnean religion=holy_light
 	martial=5 diplomacy=7 stewardship=6 intrigue=5 learning=8
-	add_trait=indulgent_wastrel add_trait=temperate add_trait=arbitrary add_trait=craven add_trait=slothful 
+	add_trait=indulgent_wastrel add_trait=temperate add_trait=arbitrary add_trait=craven add_trait=slothful
 	add_trait=humble add_trait=cruel
 	536.1.24={ birth=yes add_trait=creature_human }
 	607.10.1={ death=yes }
@@ -177,7 +183,7 @@
 	dna="acdmgojgecn"
 	culture=gilnean religion=holy_light
 	martial=4 diplomacy=8 stewardship=7 intrigue=7 learning=8
-	add_trait=charismatic_negotiator add_trait=zealous add_trait=honest add_trait=greedy add_trait=cruel 
+	add_trait=charismatic_negotiator add_trait=zealous add_trait=honest add_trait=greedy add_trait=cruel
 	father=46015	#Mano
 	556.7.17={ birth=yes add_trait=creature_human }
 	618.11.27={ death=yes }
@@ -188,7 +194,7 @@
 	dna="hcbfogigeck"
 	culture=gilnean religion=holy_light
 	martial=7 diplomacy=8 stewardship=8 intrigue=7 learning=7
-	add_trait=tough_soldier add_trait=deceitful add_trait=chaste add_trait=humble add_trait=slothful 
+	add_trait=tough_soldier add_trait=deceitful add_trait=chaste add_trait=humble add_trait=slothful
 	add_trait=brave
 	father=46015	#Mano
 	564.10.21={ birth=yes add_trait=creature_human }
@@ -239,7 +245,7 @@
 	dna="cemgighkgof"
 	culture=gilnean religion=old_ways
 	martial=4 diplomacy=6 stewardship=8 intrigue=5 learning=5
-	add_trait=intricate_webweaver add_trait=hedonist add_trait=just add_trait=craven add_trait=proud 
+	add_trait=intricate_webweaver add_trait=hedonist add_trait=just add_trait=craven add_trait=proud
 	add_trait=slothful add_trait=content add_trait=drunkard
 	556.7.25={ birth=yes add_trait=creature_human }
 	618.3.6={ death=yes }
@@ -284,7 +290,7 @@
 	dna="mleadjjipmj"
 	culture=gilnean religion=old_ways
 	martial=8 diplomacy=7 stewardship=4 intrigue=6 learning=7
-	add_trait=midas_touched add_trait=slothful add_trait=cruel add_trait=envious add_trait=trusting 
+	add_trait=midas_touched add_trait=slothful add_trait=cruel add_trait=envious add_trait=trusting
 	add_trait=charitable
 	father=46027	#Darius
 	559.6.3={ birth=yes add_trait=creature_human }
@@ -306,7 +312,7 @@
 	dna="mbeifjcmfij"
 	culture=gilnean religion=old_ways
 	martial=7 diplomacy=4 stewardship=4 intrigue=4 learning=4
-	add_trait=midas_touched add_trait=humble add_trait=cruel add_trait=lustful 
+	add_trait=midas_touched add_trait=humble add_trait=cruel add_trait=lustful
 	add_trait=brave add_trait=zealous add_trait=envious
 	father=46027	#Darius
 	573.2.26={ birth=yes add_trait=creature_human }
@@ -320,7 +326,7 @@
 	dna="eojjfpnfbcc"
 	culture=gilnean religion=old_ways
 	martial=5 diplomacy=7 stewardship=5 intrigue=8 learning=5
-	add_trait=martial_cleric add_trait=humble add_trait=content add_trait=cruel add_trait=gluttonous 
+	add_trait=martial_cleric add_trait=humble add_trait=content add_trait=cruel add_trait=gluttonous
 	add_trait=gregarious add_trait=craven
 	533.7.15={ birth=yes add_trait=creature_human }
 	615.10.8={ death=yes }
@@ -375,7 +381,7 @@
 	dna="nodlpiabidb"
 	culture=gilnean religion=holy_light
 	martial=5 diplomacy=6 stewardship=5 intrigue=5 learning=8
-	add_trait=indulgent_wastrel add_trait=paranoid add_trait=cruel add_trait=shy 
+	add_trait=indulgent_wastrel add_trait=paranoid add_trait=cruel add_trait=shy
 	add_trait=proud add_trait=cynical
 	549.2.10={ birth=yes add_trait=creature_human }
 	631.3.15={ death=yes }
@@ -387,7 +393,7 @@
 	dna="kbgfennocpm"
 	culture=gilnean religion=old_ways
 	martial=8 diplomacy=5 stewardship=6 intrigue=4 learning=4
-	add_trait=thrifty_clerk add_trait=trusting add_trait=content add_trait=craven 
+	add_trait=thrifty_clerk add_trait=trusting add_trait=content add_trait=craven
 	add_trait=cruel add_trait=shy
 	545.2.12={ birth=yes add_trait=creature_human }
 	608.12.25={ death=yes }
@@ -444,7 +450,7 @@
 	dna="dmnojdaamjf"
 	culture=gilnean religion=holy_light
 	martial=7 diplomacy=6 stewardship=4 intrigue=7 learning=6
-	trait=tough_soldier trait=honest trait=slothful trait=zealous trait=cruel 
+	trait=tough_soldier trait=honest trait=slothful trait=zealous trait=cruel
 	trait=gregarious trait=wroth
 	524.3.5={ birth=yes add_trait=creature_human }
 	609.5.15={ death=yes }
@@ -487,7 +493,7 @@
 	dna="difelcgapjh"
 	culture=gilnean religion=holy_light
 	martial=7 diplomacy=5 stewardship=8 intrigue=6 learning=5
-	trait=elusive_shadow trait=proud trait=zealous trait=ambitious trait=slothful 
+	trait=elusive_shadow trait=proud trait=zealous trait=ambitious trait=slothful
 	trait=gluttonous trait=honest
 	father=46050	#Gregor
 	570.11.26={ birth=yes add_trait=creature_human }
@@ -501,7 +507,7 @@
 	dna="syfgvtbtyea"
 	culture=gilnean religion=holy_light
 	martial=5 diplomacy=5 stewardship=7 intrigue=7 learning=8
-	trait=mastermind_theologian trait=kind trait=zealous trait=proud trait=diligent 
+	trait=mastermind_theologian trait=kind trait=zealous trait=proud trait=diligent
 	569.11.26={ birth=yes add_trait=creature_human }
 	581.10.3 = {
 		religion = arcane_religion
@@ -535,4 +541,4 @@
 		capital = c_southbreak
 	}
 	645.7.29={ death=yes }
-}
\ No newline at end of file
+}
diff --git a/localisation/00_greymane.csv b/localisation/00_greymane.csv
new file mode 100644
index 0000000000..895e35a4a7
--- /dev/null
+++ b/localisation/00_greymane.csv
@@ -0,0 +1,2 @@
+greymane;Blood of [This.GetFirstNameWithNick];Sang de [This.GetFirstNameWithNick];Blut von [This.GetFirstNameWithNick];;;;;;;;;;;x
+greymane_desc;Archibald Greymane was the king of Gilneas and the father of Genn Greymane. Under his rule, Gilneas prospered. His views on asking for help were that it was for the weak.;;;;;;;;;;;;;x
\ No newline at end of file
diff --git a/localisation/00_zuwc_united_localisation.csv b/localisation/00_zuwc_united_localisation.csv
index 4262aacde0..0023c52642 100644
--- a/localisation/00_zuwc_united_localisation.csv
+++ b/localisation/00_zuwc_united_localisation.csv
@@ -3058,6 +3058,8 @@ DYN12_DESC;With a score of $SCORE$ you$FAILED$ beat House Mechagon. In the dista
 DYN13_DESC;With a score of $SCORE$ you$FAILED$ beat House Maraudine. A centaur clan founded by Maraudos, their first Khan, the fourth alleged offspring of Zaetar, son of Cenarius and Theradras, the Crown Princess of the Stonemother Therazane. Being one of the five main centaur clans, the Maraudine have settled in the Valley of Spears, the entrance to the temple of Maraudon and the tomb of Zaetar. They have occupied and maintained the temple of Maraudon, the shrine of their first ancient khan and their procreators, where only the mightiest of the tribe are chosen to guard the tomb.;;Mit einem Punktestand von $SCORE$ ist es Euch$FAILED$ gelungen, das Haus Maraudine, einen Zentauren-Clan, der von Maraudos, ihrem ersten Khan, dem vierten angeblichen Nachkommen von Zaetar, Sohn des Cenarius und Theradras, der Kronprinzessin der Steinmutter Therazane, gegründet wurde, zu übertreffen. Als einer der fünf bedeutendsten Zentauren-Clans haben sich die Maraudine im Tal der Speere, dem Eingang zum Tempel des Maraudon und dem Grab von Zaetar niedergelassen. Sie haben den Maraudon-Tempel, den Schrein ihres ersten uralten Khans und ihrer Ahnen, wo nur die Mächtigsten des Stammes auserwählt wurden, das Grab zu bewachen, besetzt und in Stand gehalten.;;;;;;;;;;;x
 DYN14_DESC;With a score of $SCORE$ you$FAILED$ beat House Agamand, once a rich family that settled in the Tirisfal Glades. They formerly possessed the Agamand Mills and large swaths of lands surrounding them, even having their own family crypt as well as some prestigious weapons as family heirlooms. Their downfall came by the hand of the Scourge and Devlin Agamand, who allowed the Scourge access to the mills. Deciding to hold fast to their home, even with their youngest brother's betrayal, it proved to be in vain as most of them were later arisen to the Scourge's servitude.;;Mit einem Punktestand von $SCORE$ ist es Euch$FAILED$ gelungen, das Haus Agamand, eine einst reiche Familie, die sich in Tirisfal niederließ, zu übertreffen. Früher besaßen sie die Agamand-Mühlen und große Landstriche, die sie umgaben, und hatten sogar eine eigene Familiengruft nebst einiger prestigeträchtiger Waffen als Familienerbstücke. Ihr Untergang kam durch die Hand der Geißel und Devlin Agamand, der der Geißel Zugang zu den Mühlen gewährte. Die Entscheidung, an ihrem Haus festzuhalten, selbst mit dem Verrat ihres jüngsten Bruders, erwies sich als vergeblich, da die meisten von ihnen später in die Knechtschaft der Geißel gerieten.;;;;;;;;;;;x
 DYN15_DESC;With a score of $SCORE$ you$FAILED$ beat House Ellerian, one of Stormwind's smallest noble families. This house began their humble beginnings on the fertile lands in Westfall, originally only owning small chunks of lands within its borders. Through the marriage of Tiffin Ellerian and King Varian Wrynn, a match pre-arranged at Tiffin's birth, the house managed to secure their spot in the Stormwind House of Nobles. The most notable achievement of this family is marrying into the royal family and producing an heir to the Throne, although not of their dynasty.;;Mit einem Punktestand von $SCORE$ ist es Euch$FAILED$ gelungen, das Haus Ellerian, eines der kleineren Adelshäuser von Stormwind, zu übertreffen. Dieses Haus begann seine bescheidenen Anfänge in den fruchtbaren Landstrichen in Westfall und besaß ursprünglich nur kleine Landstücke innerhalb dieser Grenzen. Durch die Heirat von Tiffin Ellerian mit König Varian Wrynn, die bei Tiffins Geburt arrangiert wurde, konnte sich das Haus seinen Platz im Haus der Adligen in Stormwind sichern. Die bemerkenswerteste Errungenschaft dieser Familie ist die Einheirat in die königliche Familie und die Zeugung eines Thronerben, wenn auch nicht aus ihrer Dynastie.;;;;;;;;;;;x
+greymane;Blood of [This.GetFirstNameWithNick];Sang de [This.GetFirstNameWithNick];Blut von [This.GetFirstNameWithNick];;;;;;;;;;;x
+greymane_desc;Archibald Greymane was the king of Gilneas and the father of Genn Greymane. Under his rule, Gilneas prospered. His views on asking for help were that it was for the weak.;;Archibald Greymane war der König von Gilneas und der Vater von Genn Greymane. Unter seiner Herrschaft florierte Gilneas. Seine Ansichten zur Bitte um Unterstützung waren, dass dies für die Schwachen bestimmt war.;;;;;;;;;;;x
 ;;;;;;;;;;;;;;x
 ;;;;;;;;;;;;;;x
 ;;;;;;;;;;;;;;x