===================================================================
--- original.js
+++ change.js
@@ -278,58 +278,60 @@
 			}
 		}
 	};
 });
-var Farmer = Container.expand(function (resources, iq) {
+var Farmer = Container.expand(function (resources) {
 	var self = Container.call(this);
-	var self = new Villager(resources, iq);
-	self.farmingSkill = 5;
-	self.plant = function (resourceType) {
-		if (resourceType === 'food' && self.gameResources.seeds.amount > 0) {
-			var newPlant = new Plant('food', 10);
-			newPlant.x = Math.random() * 2048;
-			newPlant.y = Math.random() * 2732;
-			if (self.parent) {
-				self.parent.addChild(newPlant);
-			}
-			self.gameResources.seeds.amount--;
-		}
-	};
-	self.harvest = function (plant) {
-		if (plant instanceof Plant && plant.isMature) {
-			self.gameResources[plant.type].amount += plant.harvestAmount;
-			plant.destroy();
-		}
-	};
+	self.gameResources = resources;
+	self.currentAction = null;
+	self.targetX = null;
+	self.targetY = null;
+	self.speed = 1;
+	self.energy = 100;
+	self.tiredness = 0;
+	self.state = 'idle';
+	self.home = null;
+	self.workplace = null;
 });
-var Blacksmith = Villager.expand(function (resources, iq) {
+var Blacksmith = Container.expand(function (resources) {
 	var self = Container.call(this);
-	var self = Villager.call(this, resources, iq);
-	self.blacksmithingSkill = 5;
-	self.forge = function (itemType) {
-		if (self.gameResources.iron.amount >= 2) {
-			self.gameResources[itemType].amount++;
-			self.gameResources.iron.amount -= 2;
-		}
-	};
+	self.gameResources = resources;
+	self.currentAction = null;
+	self.targetX = null;
+	self.targetY = null;
+	self.speed = 1;
+	self.energy = 100;
+	self.tiredness = 0;
+	self.state = 'idle';
+	self.home = null;
+	self.workplace = null;
 });
-var Merchant = Villager.expand(function (resources, iq) {
+var Merchant = Container.expand(function (resources) {
 	var self = Container.call(this);
-	var self = Villager.call(this, resources, iq);
-	self.tradingSkill = 5;
-	self.trade = function (market, resourceType, amount) {
-		if (market instanceof Market && self.gameResources[resourceType].amount >= amount) {
-			self.gameResources[resourceType].amount -= amount;
-			self.gameResources.gold.amount += amount * market.getTradeValueForResource(resourceType);
-		}
-	};
+	self.gameResources = resources;
+	self.currentAction = null;
+	self.targetX = null;
+	self.targetY = null;
+	self.speed = 1;
+	self.energy = 100;
+	self.tiredness = 0;
+	self.state = 'idle';
+	self.home = null;
+	self.workplace = null;
 });
 var DayNightCycleManager = Container.expand(function () {
 	var self = Container.call(this);
 	self.cycleDuration = 24000;
 	self.startTime = Date.now();
 	self.timeOfDayText = self.createTimeOfDayText();
 	LK.gui.topCenter.addChild(self.timeOfDayText);
+	LK.on('tick', function () {
+		var currentTime = Date.now();
+		var elapsedTime = (currentTime - self.startTime) / 1000;
+		var hours = Math.floor(elapsedTime % 24);
+		var minutes = Math.floor(elapsedTime % 1 * 60);
+		self.timeOfDayText.setText(hours + ':' + (minutes < 10 ? '0' : '') + minutes);
+	});
 });
 var VillagerFactory = Container.expand(function (resources) {
 	var self = Container.call(this);
 	self.resources = resources;
@@ -394,32 +396,10 @@
 });
 var Villager = Container.expand(function (resources, iq) {
 	var self = Container.call(this);
 	Villager.prototype.seekResource = function (resourceType) {
-		var closestResource = this.findClosestResourceOfType(resourceType);
-		if (closestResource) {
-			this.moveTo(closestResource.x, closestResource.y, this.speed);
-			if (this.intersects(closestResource)) {
-				closestResource.collectResource(this);
-			}
-		}
+		console.log('Seeking ' + resourceType);
 	};
-	Villager.prototype.findClosestResourceOfType = function (resourceType) {
-		var resources = this.parent.children.filter(function (child) {
-			return child instanceof Resource && child.type === resourceType;
-		});
-		var closestResource = null;
-		var closestDistance = Infinity;
-		for (var i = 0; i < resources.length; i++) {
-			var resource = resources[i];
-			var distance = Math.sqrt(Math.pow(resource.x - this.x, 2) + Math.pow(resource.y - this.y, 2));
-			if (distance < closestDistance) {
-				closestDistance = distance;
-				closestResource = resource;
-			}
-		}
-		return closestResource;
-	};
 	self.gameResources = resources;
 	self.iq = iq;
 	self.collectingPower = 50;
 	self.x = Math.random() * 2048;
@@ -517,11 +497,8 @@
 	}
 	this.performAction();
 };
 Villager.prototype.update = function () {
-	if (!this.isDoingSomething()) {
-		this.decideNextAction();
-	}
 	this.updateStateAndPosition();
 };
 ResourceDisplay.prototype.positionDisplays = function () {
 	this.woodDisplay.position.set(100, 50);