===================================================================
--- original.js
+++ change.js
@@ -237,28 +237,26 @@
 	var self = Container.call(this);
 	self.isEmploying = true;
 	self.employVillager = function (villager, workplace) {};
 });
-var House = Container.expand(function () {
+var VillagerHome = Container.expand(function () {
 	var self = Container.call(this);
-	House.prototype.scheduleVillagerWork = function (villager) {
+	self.initializeRandomPosition();
+	var homeGraphics = self.createAsset('house', 'Villager Home Graphics', .5, .5);
+	self.isOccupiable = true;
+	self.occupy = function (villager) {
+		if (!this.isOccupiable) return;
+		this.isOccupiable = false;
+		villager.home = this;
 		LK.setTimeout(function () {
 			villager.state = 'goingToWork';
 			villager.moveTo(villager.workplace.x, villager.workplace.y);
 		}, 5000);
 	};
-	House.prototype.initializeRandomPosition = function () {
+	self.initializeRandomPosition = function () {
 		this.x = Math.random() * 2048;
 		this.y = Math.random() * 2732;
 	};
-	var houseGraphics = self.createAsset('house', 'House Graphics', .5, .5);
-	self.isOccupiable = true;
-	House.prototype.occupy = function (villager) {
-		if (!this.isOccupiable) return;
-		this.isOccupiable = false;
-		villager.home = this;
-		this.scheduleVillagerWork(villager);
-	};
 });
 var DayNightCycleManager = Container.expand(function () {
 	var self = Container.call(this);
 	self.cycleDuration = 24000;
@@ -335,9 +333,23 @@
 DayNightCycleManager.prototype.updateCycle = function () {};
 Villager.prototype.isDoingSomething = function () {
 	return this.currentAction !== null;
 };
-Villager.prototype.decideNextAction = function () {};
+Villager.prototype.decideNextAction = function () {
+	if (this.energy < 20 && this.home) {
+		this.targetX = this.home.x;
+		this.targetY = this.home.y;
+		this.state = 'goingHomeToRest';
+	} else if (this.energy >= 20 && this.workplace) {
+		this.targetX = this.workplace.x;
+		this.targetY = this.workplace.y;
+		this.state = 'goingToWork';
+	} else {
+		this.targetX = Math.random() * 2048;
+		this.targetY = Math.random() * 2732;
+		this.state = 'wandering';
+	}
+};
 Villager.prototype.initializePosition = function (x, y) {
 	this.x = x;
 	this.y = y;
 };
@@ -442,13 +454,11 @@
 		}
 	};
 	Game.prototype.addVillager = function (isBaby, iq, x, y) {
 		var villager = this.villagerFactory.createVillager(iq);
-		this.villagerFactory.initializeVillager(villager, isBaby, x, y);
-		this.registerVillager(villager);
-		this.initializeVillager(villager);
-	};
-	Game.prototype.initializeVillager = function (villager) {
+		villager.setAge(isBaby);
+		villager.x = x;
+		villager.y = y;
 		villager.speed = 2;
 		villager.energy = 100;
 		villager.tiredness = 0;
 		villager.state = 'idle';
@@ -456,8 +466,9 @@
 		villager.workplace = null;
 		villager.currentAction = null;
 		villager.targetX = null;
 		villager.targetY = null;
+		this.registerVillager(villager);
 	};
 	self.villagers = [];
 	self.houses = [];
 	self.cloudLayer = new Container();