===================================================================
--- original.js
+++ change.js
@@ -43,22 +43,26 @@
 			}
 		}
 	};
 });
-var Healer = Container.expand(function (resources) {
-	var self = Container.call(this);
-	self.healerGraphics = self.createAsset('healer', 'Healer Graphics', 0.5, 0.5);
-	self.gameResources = resources;
-	self.healingPower = 5;
+var Doctor = Villager.expand(function (resources) {
+	var self = Villager.call(this, resources, 100);
+	self.doctorGraphics = self.createAsset('doctor', 'Doctor Graphics', 0.5, 0.5);
+	self.healingPower = 10;
 	self.heal = function (villager) {
 		if (villager.health < 100) {
 			villager.health += self.healingPower;
 			if (villager.health > 100) villager.health = 100;
 		}
 	};
-	LK.on('tick', function () {
-		self.parent.villagers.forEach(self.heal);
-	});
+	self.update = function () {
+		if (self.parent) {
+			self.parent.villagers.forEach(function (v) {
+				if (v !== self) self.heal(v);
+			});
+		}
+	};
+	LK.on('tick', self.update);
 });
 var TownCrier = Container.expand(function () {
 	var self = Container.call(this);
 	self.crierGraphics = self.createAsset('townCrier', 'Town Crier Graphics', 0.5, 0.5);
@@ -375,36 +379,27 @@
 			villager.gameResources.weapon.amount += 1;
 		}
 	};
 });
-var Guard = Container.expand(function () {
-	var self = Container.call(this);
+var Guard = Villager.expand(function () {
+	var self = Villager.call(this, {
+		wood: 0,
+		rock: 0,
+		food: 0
+	}, 100);
 	self.guardGraphics = self.createAsset('guard', 'Guard Graphics', 0.5, 0.5);
-	self.addChild(self.guardGraphics);
-	self.x = Math.random() * 2048;
-	self.y = Math.random() * 2732;
 	self.speed = 2;
-	self.isDaytime = true;
 	self.patrolArea = function () {
-		if (!self.isDaytime) {
-			var patrolX = Math.random() * 2048;
-			var patrolY = Math.random() * 2732;
-			self.moveTo(patrolX, patrolY, self.speed);
-		}
+		var patrolX = Math.random() * 2048;
+		var patrolY = Math.random() * 2732;
+		self.moveTo(patrolX, patrolY, self.speed);
 	};
-	self.sleep = function () {
-		if (self.isDaytime) {
-			self.x = self.home.x;
-			self.y = self.home.y;
-		}
-	};
-	LK.on('tick', function () {
-		if (self.isDaytime) {
-			self.sleep();
-		} else {
+	self.update = function () {
+		if (!self.isDaytime) {
 			self.patrolArea();
 		}
-	});
+	};
+	LK.on('tick', self.update);
 });
 var Brewery = Container.expand(function () {
 	var self = Container.call(this);
 	self.breweryGraphics = self.createAsset('brewery', 'Brewery Graphics', 0.5, 0.5);
@@ -772,18 +767,25 @@
 	self.gameResources = resources;
 	self.forgeTool = function () {};
 	self.forgeWeapon = function () {};
 });
-var Merchant = Container.expand(function (resources) {
-	var self = Container.call(this);
+var Merchant = Villager.expand(function (resources) {
+	var self = Villager.call(this, resources, 100);
 	self.merchantGraphics = self.createAsset('merchant', 'Merchant Graphics', 0.5, 0.5);
-	self.gameResources = resources;
 	self.trade = function (villager, resourceType, amount) {
 		if (self.gameResources[resourceType].amount >= amount) {
 			self.gameResources[resourceType].amount -= amount;
 			villager.gameResources[resourceType].amount += amount;
 		}
 	};
+	self.update = function () {
+		if (self.parent) {
+			self.parent.villagers.forEach(function (v) {
+				if (v !== self) self.trade(v, 'food', 5);
+			});
+		}
+	};
+	LK.on('tick', self.update);
 });
 var DayNightCycleManager = Container.expand(function () {
 	var self = Container.call(this);
 	self.cycleDuration = 24000;