diff --git a/Mage.Sets/src/mage/cards/m/MemoryGuardian.java b/Mage.Sets/src/mage/cards/m/MemoryGuardian.java
new file mode 100644
index 00000000000..8c1d7a971e3
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/m/MemoryGuardian.java
@@ -0,0 +1,41 @@
+package mage.cards.m;
+
+import mage.MageInt;
+import mage.abilities.keyword.AffinityForArtifactsAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class MemoryGuardian extends CardImpl {
+
+    public MemoryGuardian(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}{U}");
+
+        this.subtype.add(SubType.ROBOT);
+        this.subtype.add(SubType.ARTIFICER);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(4);
+
+        // Affinity for artifacts
+        this.addAbility(new AffinityForArtifactsAbility());
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+    }
+
+    private MemoryGuardian(final MemoryGuardian card) {
+        super(card);
+    }
+
+    @Override
+    public MemoryGuardian copy() {
+        return new MemoryGuardian(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/Aetherdrift.java b/Mage.Sets/src/mage/sets/Aetherdrift.java
index b725835670c..632e5c2edcf 100644
--- a/Mage.Sets/src/mage/sets/Aetherdrift.java
+++ b/Mage.Sets/src/mage/sets/Aetherdrift.java
@@ -113,6 +113,7 @@ public final class Aetherdrift extends ExpansionSet {
         cards.add(new SetCardInfo("Marketback Walker", 235, Rarity.RARE, mage.cards.m.MarketbackWalker.class));
         cards.add(new SetCardInfo("Marshals' Pathcruiser", 236, Rarity.UNCOMMON, mage.cards.m.MarshalsPathcruiser.class));
         cards.add(new SetCardInfo("Maximum Overdrive", 96, Rarity.COMMON, mage.cards.m.MaximumOverdrive.class));
+        cards.add(new SetCardInfo("Memory Guardian", 49, Rarity.UNCOMMON, mage.cards.m.MemoryGuardian.class));
         cards.add(new SetCardInfo("Midnight Mangler", 50, Rarity.COMMON, mage.cards.m.MidnightMangler.class));
         cards.add(new SetCardInfo("Migrating Ketradon", 170, Rarity.COMMON, mage.cards.m.MigratingKetradon.class));
         cards.add(new SetCardInfo("Mindspring Merfolk", 51, Rarity.RARE, mage.cards.m.MindspringMerfolk.class));