diff --git a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java
new file mode 100644
index 0000000000..ee4ee6d468
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java
@@ -0,0 +1,129 @@
+package mage.cards.h;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.AdditiveDynamicValue;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.AuraAttachedCount;
+import mage.abilities.dynamicvalue.common.EquipmentAttachedCount;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.constants.SubType;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.DoubleStrikeAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class HeavenlyBlademaster extends CardImpl {
+
+    public HeavenlyBlademaster(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}");
+
+        this.subtype.add(SubType.ANGEL);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(6);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Double strike
+        this.addAbility(DoubleStrikeAbility.getInstance());
+
+        // When Heavenly Blademaster enters the battlefield, you may attach any number of Auras and Equipment you control to it.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(
+                new HeavenlyBlademasterEffect(), true
+        ));
+
+        // Other creatures you control get +1/+1 for each Aura and Equipment attached to Heavenly Blademaster.
+        DynamicValue totalAmount = new AdditiveDynamicValue(
+                new EquipmentAttachedCount(1),
+                new AuraAttachedCount(1)
+        );
+        this.addAbility(new SimpleStaticAbility(
+                Zone.BATTLEFIELD,
+                new BoostControlledEffect(
+                        totalAmount, totalAmount, Duration.WhileOnBattlefield,
+                        StaticFilters.FILTER_PERMANENT_CREATURES, true
+                )
+        ));
+    }
+
+    public HeavenlyBlademaster(final HeavenlyBlademaster card) {
+        super(card);
+    }
+
+    @Override
+    public HeavenlyBlademaster copy() {
+        return new HeavenlyBlademaster(this);
+    }
+}
+
+class HeavenlyBlademasterEffect extends OneShotEffect {
+
+    private static final FilterPermanent filter
+            = new FilterControlledPermanent("Aura or Equipment you control");
+
+    static {
+        filter.add(Predicates.or(
+                new SubtypePredicate(SubType.AURA),
+                new SubtypePredicate(SubType.EQUIPMENT)
+        ));
+    }
+
+    public HeavenlyBlademasterEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "you may attach any number "
+                + "of Auras and Equipment you control to it";
+    }
+
+    public HeavenlyBlademasterEffect(final HeavenlyBlademasterEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public HeavenlyBlademasterEffect copy() {
+        return new HeavenlyBlademasterEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        Player player = game.getPlayer(source.getControllerId());
+        if (permanent == null || player == null) {
+            return false;
+        }
+        Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true);
+        if (!player.choose(outcome, target, source.getSourceId(), game)) {
+            return false;
+        }
+        target.getTargets().stream().map(
+                attachmentId -> game.getPermanent(attachmentId)
+        ).filter(
+                attachment -> attachment != null
+        ).forEachOrdered((attachment) -> {
+            attachment.attachTo(permanent.getId(), game);
+        });
+        return true;
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/Commander2018.java b/Mage.Sets/src/mage/sets/Commander2018.java
index 99be857e75..1d5eb0f1cf 100644
--- a/Mage.Sets/src/mage/sets/Commander2018.java
+++ b/Mage.Sets/src/mage/sets/Commander2018.java
@@ -43,6 +43,7 @@ public final class Commander2018 extends ExpansionSet {
         cards.add(new SetCardInfo("Forge of Heroes", 58, Rarity.COMMON, mage.cards.f.ForgeOfHeroes.class));
         cards.add(new SetCardInfo("Fury Storm", 22, Rarity.RARE, mage.cards.f.FuryStorm.class));
         cards.add(new SetCardInfo("Genesis Storm", 30, Rarity.RARE, mage.cards.g.GenesisStorm.class));
+        cards.add(new SetCardInfo("Heavenly Blademaster", 3, Rarity.RARE, mage.cards.h.HeavenlyBlademaster.class));
         cards.add(new SetCardInfo("Herald of the Pantheon", 151, Rarity.RARE, mage.cards.h.HeraldOfThePantheon.class));
         cards.add(new SetCardInfo("Hydra Omnivore", 153, Rarity.MYTHIC, mage.cards.h.HydraOmnivore.class));
         cards.add(new SetCardInfo("Kestia, the Cultivator", 42, Rarity.MYTHIC, mage.cards.k.KestiaTheCultivator.class));