diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
index 665f17e8..c7894361 100644
--- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
+++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
@@ -8,7 +8,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.model.ModelElytra;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.Entity;
@@ -36,6 +35,7 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.item.ItemComponent;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
+import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra;
 import WayofTime.bloodmagic.registry.ModItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -267,14 +267,12 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
 
         if (world.isRemote && this == ModItems.livingArmourChest)
         {
-
             if (player instanceof EntityPlayerSP) //Sanity check
             {
                 EntityPlayerSP spPlayer = (EntityPlayerSP) player;
 
                 if (FLAGS == null)
                 {
-                    ModelElytra d;
                     try
                     {
                         FLAGS = (DataParameter<Byte>) _FLAGS.get(null);
@@ -289,14 +287,22 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
 
                 if (FLAGS != null)
                 {
-                    if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.isElytraFlying() && !spPlayer.capabilities.isFlying)
+                    if (LivingArmour.hasFullSet(player))
                     {
-                        byte b0 = player.getDataManager().get(FLAGS);
-                        player.getDataManager().set(FLAGS, (byte) (b0 | 1 << 7));
-                    } else if (spPlayer.isElytraFlying() && !spPlayer.movementInput.jump && !spPlayer.onGround)
-                    {
-                        byte b0 = player.getDataManager().get(FLAGS);
-                        player.getDataManager().set(FLAGS, (byte) (b0 & ~(1 << 7)));
+                        ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
+                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack);
+                        if (upgrade instanceof LivingArmourUpgradeElytra)
+                        {
+                            if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.isElytraFlying() && !spPlayer.capabilities.isFlying)
+                            {
+                                byte b0 = player.getDataManager().get(FLAGS);
+                                player.getDataManager().set(FLAGS, (byte) (b0 | 1 << 7));
+                            } else if (spPlayer.isElytraFlying() && !spPlayer.movementInput.jump && !spPlayer.onGround)
+                            {
+                                byte b0 = player.getDataManager().get(FLAGS);
+                                player.getDataManager().set(FLAGS, (byte) (b0 & ~(1 << 7)));
+                            }
+                        }
                     }
                 }
             }
@@ -462,4 +468,18 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
         NBTTagCompound tag = stack.getTagCompound();
         return tag.getBoolean("enabled");
     }
+
+    public void setIsElytra(ItemStack stack, boolean bool)
+    {
+        NBTHelper.checkNBT(stack);
+        NBTTagCompound tag = stack.getTagCompound();
+        tag.setBoolean("elytra", bool);
+    }
+
+    public boolean isElytra(ItemStack stack)
+    {
+        NBTHelper.checkNBT(stack);
+        NBTTagCompound tag = stack.getTagCompound();
+        return tag.getBoolean("elytra");
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
index d51f8e5b..bfabd1cb 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
@@ -11,7 +11,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java
new file mode 100644
index 00000000..908bc3ee
--- /dev/null
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java
@@ -0,0 +1,60 @@
+package WayofTime.bloodmagic.livingArmour.upgrade;
+
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
+import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public class LivingArmourUpgradeElytra extends LivingArmourUpgrade
+{
+    public static final int[] costs = new int[] { 20 };
+
+    public LivingArmourUpgradeElytra(int level)
+    {
+        super(level);
+    }
+
+    @Override
+    public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour)
+    {
+
+    }
+
+    @Override
+    public String getUniqueIdentifier()
+    {
+        return Constants.Mod.MODID + ".upgrade.elytra";
+    }
+
+    @Override
+    public int getMaxTier()
+    {
+        return 1; // Set to here until I can add more upgrades to it.
+    }
+
+    @Override
+    public int getCostOfUpgrade()
+    {
+        return costs[this.level];
+    }
+
+    @Override
+    public void writeToNBT(NBTTagCompound tag)
+    {
+
+    }
+
+    @Override
+    public void readFromNBT(NBTTagCompound tag)
+    {
+
+    }
+
+    @Override
+    public String getUnlocalizedName()
+    {
+        return tooltipBase + "elytra";
+    }
+}
\ No newline at end of file