===================================================================
--- original.js
+++ change.js
@@ -3,9 +3,9 @@
 var isAnimatingEnd = false;
 var playerTurn = true;
 var playerSelecting = false;
 var computerArmOffset = 120;
-var debug = false;
+var debug = true;
 function addShadow(name, x, y) {
 	var shadow = new Container();
 	shadow.createAsset(name, name, 0, 0);
 	shadow.width = name === 'candyCaneShadow' ? shadow.width / 4 : shadow.width;
@@ -104,28 +104,8 @@
 			candyToRemove.destroy();
 		}
 	}
 }
-function startGame(self, candyCanes, playerMode) {
-	console.log("startGame... playerMode = " + playerMode, Game.candyCanes);
-	return;
-	fade(self.player, 500, true);
-	gameState = 1;
-	self.playerMode = playerMode;
-	candiesNumber = Math.floor(Math.random() * 3) + 10;
-	for (var i = 0; i < candiesNumber; i++) {
-		var candyCane = new CandyCane();
-		candyCane.x = 2048 / 2;
-		candyCane.y = 270 + i * 190;
-		candyCanes.push(candyCane);
-		self.addChild(candyCane);
-	}
-	var lastCandyCane = new LastCandyCane();
-	lastCandyCane.x = 2048 / 2 + 30;
-	lastCandyCane.y = 250 + candiesNumber * 190 + 20;
-	candyCanes.push(lastCandyCane);
-	self.addChild(lastCandyCane);
-}
 var Explosion = Container.expand(function () {
 	var self = Container.call(this);
 	var explosionGraphics = self.createAsset('explosion', 'Explosion Graphics', .5, .5);
 	self.x = 2048 / 2 + 30;
@@ -206,9 +186,9 @@
 	self.createAsset('computerPlayer', 'Computer Player', .5, .5);
 	self.alpha = 0;
 	self.update = function () {};
 });
-var PlayerModePopup = Container.expand(function () {
+var PlayerModePopup = Container.expand(function (game) {
 	var self = Container.call(this);
 	self.createAsset('playerModePopup', 'Player Mode Popup', 0.5, 0.5);
 	self.x = 2048 / 2;
 	self.y = 2732 / 2;
@@ -226,19 +206,17 @@
 	onePlayerButton.y = 140;
 	onePlayerButton.alpha = 1;
 	onePlayerButton.on('down', function () {
 		self.destroy();
-		gameState = 1;
-		startGame(1);
+		game.initGame(1);
 	});
 	var twoPlayerButton = self.createAsset('twoPlayerButton', 'Two Player Button', 0.5, 0.5);
 	twoPlayerButton.x = 300;
 	twoPlayerButton.y = 140;
 	twoPlayerButton.alpha = 1;
 	twoPlayerButton.on('down', function () {
 		self.destroy();
-		gameState = 1;
-		startGame(2);
+		game.initGame(2);
 	});
 	self.addChild(onePlayerButton);
 	self.addChild(twoPlayerButton);
 	;
@@ -307,8 +285,28 @@
 	self.computerPlayer = self.addChild(new ComputerPlayer());
 	self.computerPlayer.x = 1648;
 	self.computerPlayer.y = 1324;
 	setSelectionPositions(self, candyCanes.length > 0 ? candyCanes[0].y : 0);
+	self.initGame = function (playerMode) {
+		console.log("initGame... playerMode = " + playerMode);
+		self.playerMode = playerMode;
+		candiesNumber = Math.floor(Math.random() * 3) + 10;
+		for (var i = 0; i < candiesNumber; i++) {
+			var candyCane = new CandyCane();
+			candyCane.x = 2048 / 2;
+			candyCane.y = 270 + i * 190;
+			candyCanes.push(candyCane);
+			self.addChild(candyCane);
+		}
+		var lastCandyCane = new LastCandyCane();
+		lastCandyCane.x = 2048 / 2 + 30;
+		lastCandyCane.y = 250 + candiesNumber * 190 + 20;
+		candyCanes.push(lastCandyCane);
+		self.addChild(lastCandyCane);
+		setSelectionPositions(self, candyCanes.length > 0 ? candyCanes[0].y : 0);
+		fade(self.player, 500, true);
+		gameState = 1;
+	};
 	stage.on('down', function (obj) {
 		if (gameState === 2 && !isAnimatingEnd) {
 			LK.showGameOver();
 			return;
@@ -393,7 +391,7 @@
 			}
 			self.computerCandiesText.setText(self.computerCandiesCount ? self.computerCandiesCount.toString() : "?");
 		}
 	});
-	var playerModePopup = new PlayerModePopup();
+	var playerModePopup = new PlayerModePopup(self);
 	self.addChild(playerModePopup);
 });