diff --git a/forge-game/src/main/java/forge/game/card/CardDamageMap.java b/forge-game/src/main/java/forge/game/card/CardDamageMap.java
index 10460db5c0f..b9dc7d91617 100644
--- a/forge-game/src/main/java/forge/game/card/CardDamageMap.java
+++ b/forge-game/src/main/java/forge/game/card/CardDamageMap.java
@@ -53,6 +53,7 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
                 sourceLKI.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDealtOnce, runParams, false);
                 
                 if (sourceLKI.hasKeyword("Lifelink")) {
+                    // FIXME: add sourceSA to fix Firesong and Sunspeaker
                     sourceLKI.getController().gainLife(sum, sourceLKI);
                 }
             }
diff --git a/forge-gui/res/cardsfolder/upcoming/tiana_ships_caretaker.txt b/forge-gui/res/cardsfolder/upcoming/tiana_ships_caretaker.txt
new file mode 100644
index 00000000000..bf48ebaf89d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/tiana_ships_caretaker.txt
@@ -0,0 +1,11 @@
+Name:Tiana, Ship's Caretaker
+ManaCost:3 R W
+Types:Legendary Creature Angel Artificer
+PT:3/3
+K:Flying
+K:First Strike
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Equipment.YouCtrl,Aura.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ DelayedTrig | TriggerDescription$ Whenever an Aura or Equipment you control is put into a graveyard from the battlefield, you may return that card to its owner's hand at the beginning of the next end step.
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigBounce | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to its owner's hand at the beginning of the next end step.
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ DelayTriggerRemembered
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tiana_ships_caretaker.jpg
+Oracle:Flying, first strike\nWhenever an Aura or Equipment you control is put into a graveyard from the battlefield, you may return that card to its owner's hand at the beginning of the next end step.