===================================================================
--- original.js
+++ change.js
@@ -278,46 +278,51 @@
 			}
 		}
 	};
 });
-var Farmer = Container.expand(function (resources) {
+var Farmer = Villager.expand(function (resources, iq) {
 	var self = Container.call(this);
-	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 self = Villager.call(this, 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();
+		}
+	};
 });
-var Blacksmith = Container.expand(function (resources) {
+var Blacksmith = Villager.expand(function (resources, iq) {
 	var self = Container.call(this);
-	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 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;
+		}
+	};
 });
-var Merchant = Container.expand(function (resources) {
+var Merchant = Villager.expand(function (resources, iq) {
 	var self = Container.call(this);
-	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 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);
+		}
+	};
 });
 var DayNightCycleManager = Container.expand(function () {
 	var self = Container.call(this);
 	self.cycleDuration = 24000;
@@ -512,9 +517,11 @@
 	}
 	this.performAction();
 };
 Villager.prototype.update = function () {
-	this.decideNextAction();
+	if (!this.isDoingSomething()) {
+		this.decideNextAction();
+	}
 	this.updateStateAndPosition();
 };
 ResourceDisplay.prototype.positionDisplays = function () {
 	this.woodDisplay.position.set(100, 50);