===================================================================
--- original.js
+++ change.js
@@ -230,14 +230,17 @@
 });
 var VillagerFactory = Container.expand(function (resources) {
 	var self = Container.call(this);
 	self.resources = resources;
-	self.createVillager = function (x, y, isBaby, iq) {
+	self.createVillager = function (isBaby, iq) {
 		var villager = new Villager(self.resources, iq);
-		villager.initializePosition(x, y);
 		villager.setAge(isBaby);
 		return villager;
 	};
+	self.initializeVillagerPosition = function (villager, x, y) {
+		villager.x = x;
+		villager.y = y;
+	};
 });
 Well.prototype.initialize = function () {
 	this.wellGraphics = this.createAsset('well', 'Well Graphics', .5, .5);
 	this.x = 2048 / 2 - 800;
@@ -301,9 +304,10 @@
 	Game.prototype.createAndAddVillagerIfPossible = function () {
 		if (this.resources && this.resources.food.amount >= 10) {
 			var x = Math.random() * 2048;
 			var y = Math.random() * 2732;
-			this.addVillager(this.villagerFactory.createVillager(x, y, false, Math.random() * 50 + 50));
+			var villager = this.villagerFactory.createVillager(false, Math.random() * 50 + 50);
+			this.addVillager(villager, x, y);
 			this.resources.food.amount -= 10;
 		}
 	};
 	Game.prototype.zoomOnVillagers = function (villagerA, villagerB) {
@@ -389,9 +393,10 @@
 			this.scale.x = 1;
 			this.scale.y = 1;
 		}
 	};
-	Game.prototype.addVillager = function (villager) {
+	Game.prototype.addVillager = function (villager, x, y) {
+		this.villagerFactory.initializeVillagerPosition(villager, x, y);
 		this.addChild(villager);
 		this.registerVillager(villager);
 		this.initializeVillager(villager);
 	};
@@ -409,30 +414,18 @@
 	self.villagers = [];
 	self.houses = [];
 	self.cloudLayer = new Container();
 	self.clouds = [];
-	self.initializeClouds = function () {
-		for (var i = 0; i < 5; i++) {
-			var cloud = new Cloud();
-			self.clouds.push(cloud);
-			self.cloudLayer.addChild(cloud);
-		}
-	};
-	self.initializeClouds();
+	for (var i = 0; i < 5; i++) {
+		var cloud = new Cloud();
+		self.clouds.push(cloud);
+		self.cloudLayer.addChild(cloud);
+	}
 	self.villagerFactory = new VillagerFactory(self.resources);
-	self.populateVillage = function () {
-		this.addVillager(this.villagerFactory.createVillager(1024, 1366, false, Math.random() * 50 + 50));
-		for (var i = 0; i < 10; i++) {
-			this.addVillager(this.villagerFactory.createVillager(Math.random() * 2048, Math.random() * 2732, false, Math.random() * 50 + 50));
-		}
-	};
-	self.populateVillage();
-	Game.prototype.populateVillage = function () {
-		this.addVillager(this.villagerFactory.createVillager(1024, 1366, false, Math.random() * 50 + 50));
-		for (var i = 0; i < 10; i++) {
-			this.addVillager(this.villagerFactory.createVillager(Math.random() * 2048, Math.random() * 2732, false, Math.random() * 50 + 50));
-		}
-	};
+	self.addVillager(self.villagerFactory.createVillager(1024, 1366, false, Math.random() * 50 + 50));
+	for (var i = 0; i < 10; i++) {
+		self.addVillager(self.villagerFactory.createVillager(Math.random() * 2048, Math.random() * 2732, false, Math.random() * 50 + 50));
+	}
 	self.market = new Market();
 	self.addChild(self.market);
 	Game.prototype.createHouse = function (x, y) {
 		var house = new House();
@@ -441,21 +434,14 @@
 		return house;
 	};
 	Game.prototype.addHouse = function (house) {
 		this.addChild(house);
-		this.self.houses.push(house);
+		this.houses.push(house);
 	};
-	Game.prototype.initializeHouses = function () {
-		var newHouse = this.createHouse(2048 / 2, 2732 / 2);
-		this.addHouse(newHouse);
-		this.houses.push(newHouse);
-	};
-	self.initializeHouses();
-	Game.prototype.initializeHouses = function () {
-		var newHouse = this.createHouse(2048 / 2, 2732 / 2);
-		this.addHouse(newHouse);
-		this.houses.push(newHouse);
-	};
+	var houses = [];
+	var newHouse = self.createHouse(2048 / 2, 2732 / 2);
+	self.addHouse(newHouse);
+	houses.push(newHouse);
 	Game.prototype.createWorkplace = function () {
 		var workplace = new EmployingWorkPlace();
 		workplace.x = Math.random() * 2048;
 		workplace.y = Math.random() * 2732;