diff --git a/src/GameLogic/Snap.cs b/src/GameLogic/Snap.cs
index 42894a1a7..939204458 100644
--- a/src/GameLogic/Snap.cs
+++ b/src/GameLogic/Snap.cs
@@ -37,6 +37,7 @@ public class Snap
 		public Snap ()
 		{
 			_deck = new Deck ();
+   			_gameTimer = SwinGame.CreateTimer ();
 		}
 
 		/// <summary>
@@ -91,7 +92,8 @@ public void Start()
 				_started = true;
 				_deck.Shuffle ();		// Return the cards and shuffle
 
-				FlipNextCard ();		// Flip the first card...
+				FlipNextCard ();
+    				 gameTimer.Start ();
 			}
 		}
 			
@@ -111,7 +113,11 @@ public void FlipNextCard()
 		/// </summary>
 		public void Update()
 		{
-			//TODO: implement update to automatically slip cards!
+			if (_gameTimer.Ticks > _flipTime)
+   			{
+      				_gameTimer.Reset ();
+	  			FlipNextCard ();
+			}//TODO: implement update to automatically slip cards!
 		}
 
 		/// <summary>