Index: binaries/data/mods/public/simulation/data/technologies/pharaonic_cult.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/pharaonic_cult.json
+++ binaries/data/mods/public/simulation/data/technologies/pharaonic_cult.json
@@ -0,0 +1,21 @@
+{
+	"genericName": "Pharaonic Cult",
+	"description": "The Pharaohs were worshipped as living gods. Their word was sacrosanct and beyond reproach, at least among the common people. The Ptolemaic dynasts certainly took advantage of this ancient custom to the fullest, to varying degrees of success.",
+	"cost": {
+		"food": 300,
+		"metal": 200
+	},
+	"requirements": {
+		"all": [
+			{"tech": "phase_city"},
+			{"civ": "ptol"}
+		]
+	},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "high_priest.png",
+	"researchTime": 50,
+	"tooltip": "Heroes +2 health/second self-regen rate.",
+	"modifications": [{ "value": "Health/RegenRate", "add": 2}],
+	"affects": ["Hero"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
\ No newline at end of file
Index: binaries/data/mods/public/simulation/data/technologies/serapis_cult.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/serapis_cult.json
+++ binaries/data/mods/public/simulation/data/technologies/serapis_cult.json
@@ -0,0 +1,23 @@
+{
+	"genericName": "Serapis Cult",
+	"description": "The cult of Serapis was introduced during the 3rd century BC on the orders of Ptolemy I of Egypt as a means to unify the Greeks and Egyptians in his realm. The god was depicted as Greek in appearance, but with Egyptian trappings, and combined iconography from a great many cults, signifying both abundance and resurrection. A serapeion was any temple or religious precinct devoted to serapeion. The cult of Serapis was spread as a matter of deliberate policy by the Ptolemaic kings, who also built an immense serapeum in Alexandria.",
+	"cost": {
+		"food": 300,
+		"metal": 300
+	},
+	"requirements": {
+		"all": [
+			{"tech": "phase_city"}, 
+			{"civ": "ptol"}
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "serapis.png",
+	"researchTime": 60,
+	"tooltip": "+2.0 metal trickle per second.",
+	"modifications": [
+		{ "value": "ResourceTrickle/Rates/metal", "add": 2 }
+	],
+	"affects": ["Player"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
\ No newline at end of file
Index: binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
@@ -12,13 +12,6 @@
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <Trainer>
-    <Entities datatype="tokens">
-      units/{civ}/hero_ptolemy_i
-      units/{civ}/hero_ptolemy_iv
-      units/{civ}/hero_cleopatra_vii
-    </Entities>
-  </Trainer>
   <VisualActor>
     <Actor>structures/ptolemies/fortress.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/temple_2.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/temple_2.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/temple_2.xml
@@ -1,18 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
+  <BuildRestrictions>
+    <Category>TempleOfEdfu</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime op="mul">1.5</BuildTime>
+    <Resources>
+      <stone op="mul">1.5</stone>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="30.0" depth="33.0"/>
   </Footprint>
+  <GarrisonHolder>
+    <Max op="mul">1.5</Max>
+  </GarrisonHolder>
   <Health>
+    <Max op="mul">1.5</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
+   <GenericName>Temple of Edfu</GenericName>
     <SpecificName>Naos</SpecificName>
+   <Tooltip>Train Heroes and Healers. Research special technologies.</Tooltip>
+   <Classes datatype="tokens">CivSpecific</Classes>
+   <VisibleClasses datatype="tokens">-Town City TempleOfEdfu</VisibleClasses>
+   <Icon>structures/temple_epic.png</Icon>
+   <Requirements>
+      <Techs datatype="tokens">-phase_town phase_city</Techs>
+    </Requirements>
   </Identity>
+  <Loot>
+    <stone op="mul">1.5</stone>
+  </Loot>
   <Obstruction>
     <Static width="27.0" depth="30.0"/>
   </Obstruction>
+  <Researcher>
+    <Technologies datatype="tokens">
+      pharaonic_cult
+      serapis_cult
+    </Technologies>
+  </Researcher>
+  <Trainer>
+    <Entities datatype="tokens">
+      units/{civ}/hero_ptolemy_i
+      units/{civ}/hero_ptolemy_iv
+      units/{civ}/hero_cleopatra_vii
+    </Entities>
+  </Trainer>
   <VisualActor>
     <Actor>structures/ptolemies/temple_2.xml</Actor>
     <FoundationActor>structures/fndn_7x8.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/template_player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_player.xml
+++ binaries/data/mods/public/simulation/templates/template_player.xml
@@ -31,6 +31,7 @@
       <Pillar>0</Pillar>
       <PyramidLarge>2</PyramidLarge>
       <TempleOfAmun>1</TempleOfAmun>
+      <TempleOfEdfu>1</TempleOfEdfu>
       <TempleOfVesta>1</TempleOfVesta>
       <Theater>1</Theater>
       <Yakhchal>5</Yakhchal>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
@@ -4,6 +4,7 @@
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
+      structures/ptol/temple_2
     </Entities>
   </Builder>
   <Identity>