diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
index 13c6965e12f..86d43dd34ed 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -1058,6 +1058,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
                         return c.getNetPower() <= parentTarget.getNetPower();
                     case "LECMC" :
                         return c.getCMC() <= parentTarget.getCMC();
+                    case "SharedCreatureType" :
+                        return c.sharesCreatureTypeWith(parentTarget);
                 }
             }
 
diff --git a/forge-gui/res/cardsfolder/c/cliffside_market.txt b/forge-gui/res/cardsfolder/c/cliffside_market.txt
index 83c36d15875..00db712d6b2 100644
--- a/forge-gui/res/cardsfolder/c/cliffside_market.txt
+++ b/forge-gui/res/cardsfolder/c/cliffside_market.txt
@@ -5,7 +5,8 @@ T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigLife | OptionalDeci
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLife | TriggerZones$ Command | Secondary$ True | OptionalDecider$ You | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may exchange life totals with target player.
 SVar:TrigLife:DB$ ExchangeLife | Optional$ True | ValidTgts$ Player | TgtPrompt$ Select target player to exchange life totals with
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, exchange control of two target permanents that share a card type.
-SVar:RolledChaos:DB$ ExchangeControl | ValidTgts$ Permanent | TgtPrompt$ Select target permanent card | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land | TargetUnique$ True
+SVar:RolledChaos:DB$ Pump | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ DBExchange
+SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Permanent | TgtPrompt$ Select target permanent card | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land,Tribal | TargetUnique$ True
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cliffside_market.jpg
diff --git a/forge-gui/res/cardsfolder/s/shifting_loyalties.txt b/forge-gui/res/cardsfolder/s/shifting_loyalties.txt
index 717403fb436..4e45b9a0191 100644
--- a/forge-gui/res/cardsfolder/s/shifting_loyalties.txt
+++ b/forge-gui/res/cardsfolder/s/shifting_loyalties.txt
@@ -2,7 +2,7 @@ Name:Shifting Loyalties
 ManaCost:5 U
 Types:Sorcery
 A:SP$ Pump | Cost$ 5 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ DBExchange | StackDescription$ None | SpellDescription$ Exchange control of two target permanents that share a card type.
-SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Permanent | TgtPrompt$ Select target permanent shares a card type with it | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land | TargetUnique$ True
+SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Permanent | TgtPrompt$ Select target permanent shares a card type with it | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land,Tribal | TargetUnique$ True
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shifting_loyalties.jpg
diff --git a/forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt b/forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt
index 4099b92b836..87c06235ed6 100644
--- a/forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt
+++ b/forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt
@@ -1,7 +1,10 @@
 Name:Return from Extinction
 ManaCost:1 B
 Types:Sorcery
-A:SP$ Charm | Cost$ 1 B | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBChangeZone1,DBChangeZone2
+A:SP$ Charm | Cost$ 1 B | Choices$ DBChangeZone1,DBChangeZone2
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return target creature card from your graveyard to your hand.
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target creature cards that share a creature type in your graveyard | ValidTgts$ Creature.sharesCreatureTypeWith+Other+YouOwn | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ Return two target creature cards that share a creature type from your graveyard to your hand.
+SVar:DBChangeZone2:DB$ Pump | RememberObjects$ Targeted | TgtZone$ Graveyard | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select two target creature cards that share a creature type in your graveyard | SubAbility$ DBPump | SpellDescription$ Return two target creature cards that share a creature type from your graveyard to your hand.
+SVar:DBPump:DB$ Pump | RememberObjects$ Targeted | TargetsWithRelatedProperty$ SharedCreatureType | TargetUnique$ True | TgtZone$ Graveyard | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select two target creature cards that share a creature type in your graveyard | SubAbility$ DBChangeZoneAll
+SVar:DBChangeZoneAll:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Choose one -\n• Return target creature card from your graveyard to your hand.\n• Return two target creature cards that share a creature type from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt b/forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt
index 1702aaf01f3..6de5fe68456 100644
--- a/forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt
@@ -2,8 +2,8 @@ Name:Sisay, Weatherlight Captain
 ManaCost:2 W
 Types:Legendary Creature Human Soldier
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ Equipped creature gets +1/+1 for each color among permanents you control.
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+Legendary+inZoneBattlefield
-A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Legendary+cmcLEY | ChangeNum$ 1 | References$ Y |  SpellDescription$ Search your library for a legendary permanent card with converted mana cost less than CARDNAME’s power, put that card onto the battlefield, then shuffle your library.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ CARDNAME gets +1/+1 for each color among permanents you control.
+SVar:X:Count$ColorsCtrl Permanent.YouCtrl+Other+Legendary+inZoneBattlefield
+A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Legendary+cmcLTY | ChangeNum$ 1 | References$ Y |  SpellDescription$ Search your library for a legendary permanent card with converted mana cost less than CARDNAME's power, put that card onto the battlefield, then shuffle your library.
 SVar:Y:Count$CardPower
-Oracle:Sisay, Weatherlight Captain gets +1/+1 for each color among other legendary permanents you control.\n{W}{U}{B}{R}{G}: Search your library for a legendary permanent card with converted mana cost less than Sisay’s power, put that card onto the battlefield, then shuffle your library.
+Oracle:Sisay, Weatherlight Captain gets +1/+1 for each color among other legendary permanents you control.\n{W}{U}{B}{R}{G}: Search your library for a legendary permanent card with converted mana cost less than Sisay's power, put that card onto the battlefield, then shuffle your library.