diff --git a/release/Magarena/incomplete/Gigadrowse.txt b/release/Magarena/scripts/Gigadrowse.txt
similarity index 100%
rename from release/Magarena/incomplete/Gigadrowse.txt
rename to release/Magarena/scripts/Gigadrowse.txt
diff --git a/src/magic/card/Gigadrowse.java b/src/magic/card/Gigadrowse.java
index 69acfbc118..fb7d90cc0a 100644
--- a/src/magic/card/Gigadrowse.java
+++ b/src/magic/card/Gigadrowse.java
@@ -3,9 +3,11 @@ package magic.card;
 import magic.model.MagicGame;
 import magic.model.MagicPayedCost;
 import magic.model.MagicPermanent;
+import magic.model.MagicManaCost;
 import magic.model.action.MagicPermanentAction;
 import magic.model.action.MagicTapAction;
 import magic.model.choice.MagicTargetChoice;
+import magic.model.choice.MagicKickerChoice;
 import magic.model.event.MagicEvent;
 import magic.model.event.MagicSpellCardEvent;
 import magic.model.stack.MagicCardOnStack;
@@ -20,7 +22,7 @@ public class Gigadrowse {
             return new MagicEvent(
                     cardOnStack.getCard(),
                     cardOnStack.getController(),
-                    MagicTargetChoice.NEG_TARGET_PERMANENT,
+                    new MagicKickerChoice(MagicTargetChoice.NEG_TARGET_PERMANENT, MagicManaCost.BLUE, true, true),
                     new MagicTapTargetPicker(true,false),
                     MagicEvent.NO_DATA,
                     this,
diff --git a/src/magic/test/TestGigadrowse.java b/src/magic/test/TestGigadrowse.java
new file mode 100644
index 0000000000..23463a10b0
--- /dev/null
+++ b/src/magic/test/TestGigadrowse.java
@@ -0,0 +1,44 @@
+package magic.test;
+
+import magic.model.MagicGame;
+import magic.model.MagicPlayer;
+import magic.model.MagicPlayerDefinition;
+import magic.model.MagicPlayerProfile;
+import magic.model.MagicDuel;
+import magic.model.phase.MagicMainPhase;
+
+class TestGigadrowse extends TestGameBuilder {    
+    public MagicGame getGame() {
+		final MagicDuel duel=new MagicDuel();
+		duel.setDifficulty(6);
+		
+		final MagicPlayerProfile profile=new MagicPlayerProfile("bgruw");
+		final MagicPlayerDefinition player1=new MagicPlayerDefinition("Player",false,profile,15);
+		final MagicPlayerDefinition player2=new MagicPlayerDefinition("Computer",true,profile,14);
+		duel.setPlayers(new MagicPlayerDefinition[]{player1,player2});
+		duel.setStartPlayer(0);
+		
+		final MagicGame game=duel.nextGame(true);
+		game.setPhase(MagicMainPhase.getFirstInstance());
+		final MagicPlayer player=game.getPlayer(0);
+		final MagicPlayer opponent=game.getPlayer(1);
+
+        MagicPlayer P = player;
+
+        P.setLife(20);
+        addToLibrary(P, "Plains", 10);
+		createPermanent(game,P,"Rupture Spire",false,8);
+		createPermanent(game,P,"Sun Titan",false,1);
+	    addToHand(P,"Gigadrowse",1);
+       
+
+        P = opponent;
+		
+        P.setLife(20);
+        addToLibrary(P, "Plains", 10);
+		createPermanent(game,P,"Rupture Spire",false,8);
+		createPermanent(game,P,"Sun Titan",false,3);
+		
+		return game;
+    }
+}