diff --git a/res/card-pictures.txt b/res/card-pictures.txt
index 318448015b6..dff1c58b864 100644
--- a/res/card-pictures.txt
+++ b/res/card-pictures.txt
@@ -38,6 +38,7 @@ snow_covered_mountain.jpg        http://www.wizards.com/global/images/magic/gene
 snow_covered_mountain1.jpg       http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg
 snow_covered_mountain2.jpg       http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
 snow_covered_mountain3.jpg       http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
+twiddle.jpg						http://www.wizards.com/global/images/magic/general/twiddle.jpg
 kor_duelist.jpg					http://www.wizards.com/global/images/magic/general/kor_duelist.jpg
 stalking_assassin.jpg		http://www.wizards.com/global/images/magic/general/stalking_assassin.jpg
 burst_lightning.jpg		http://www.wizards.com/global/images/magic/general/burst_lightning.jpg
diff --git a/res/cards.txt b/res/cards.txt
index b7350ed261c..3718548e5b8 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,8 @@
+Twiddle
+U
+Instant
+You may tap or untap target artifact, creature, or land.
+
 Kor Duelist
 W
 Creature Kor Soldier
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 04674ea0e82..625702b2ce7 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -18081,6 +18081,37 @@ public class CardFactory implements NewConstants {
             
             spell.setBeforePayMana(CardFactoryUtil.input_targetCreaturePlayer(spell, true, false));
         }//*************** END ************ END **************************
+        
+        //*****************************START*******************************
+        if(cardName.equals("Twiddle")) {
+        	/*
+        	 * You may tap or untap target artifact, creature, or land.
+        	 */
+        	final SpellAbility spell = new Spell(card) {
+				private static final long serialVersionUID = 8126471702898625866L;
+				
+				public boolean canPlayAI() {
+        			return false;
+        		}
+        		public void chooseTargetAI() {
+        			//setTargetCard(c);
+        		}//chooseTargetAI()
+        		public void resolve() {
+        			if(AllZone.GameAction.isCardInPlay(getTargetCard())) {
+        				if(getTargetCard().isTapped()) {
+        					getTargetCard().untap();
+        				}
+        				else {
+        					getTargetCard().tap();
+        				}
+        			}
+        		}
+        	};//SpellAbility
+        	spell.setBeforePayMana(CardFactoryUtil.input_targetType(spell, "Artifact;Creature;Land"));
+        	card.clearSpellAbility();
+        	card.addSpellAbility(spell);		
+        }//end Twiddle
+        //****************END*******END***********************
 
         
         // Cards with Cycling abilities