===================================================================
--- original.js
+++ change.js
@@ -40,8 +40,13 @@
 			},
 			'rock': function () {
 				self.villager.state = 'seekingRock';
 			},
+			'trade': function () {
+				self.villager.state = 'trading';
+				self.villager.targetX = self.villager.marketplace.x;
+				self.villager.targetY = self.villager.marketplace.y;
+			},
 			'wander': function () {
 				self.villager.targetX = Math.random() * 2048;
 				self.villager.targetY = Math.random() * 2732;
 				self.villager.state = 'wandering';
@@ -819,13 +824,40 @@
 	positionInitializer.initializeRandomPosition(self, self.width, self.height, function () {
 		return self.checkOverlapWithOtherBuildings();
 	});
 });
+var Trader = Container.expand(function (resources) {
+	var self = Container.call(this);
+	self.traderGraphics = self.createAsset('trader', 'Trader Graphics', 0.5, 0.5);
+	self.addChild(self.traderGraphics);
+	self.gameResources = resources;
+	self.trade = function (resourceType, amount, targetResourceType) {
+		if (self.gameResources[resourceType].amount >= amount) {
+			self.gameResources[resourceType].amount -= amount;
+			self.gameResources[targetResourceType].amount += amount * self.getExchangeRate(resourceType, targetResourceType);
+		}
+	};
+	self.getExchangeRate = function (resourceType, targetResourceType) {
+		return 1;
+	};
+});
 var Villager = Container.expand(function (resources, iq) {
 	var self = Container.call(this);
 	self.gameResources = resources;
 	self.iq = iq;
 });
+var Granary = Container.expand(function () {
+	var self = Container.call(this);
+	self.granaryGraphics = self.createAsset('granary', 'Granary Graphics', 0.5, 0.5);
+	var positionInitializer = new PositionInitializer();
+	positionInitializer.initializeRandomPosition(self, self.granaryGraphics.width, self.granaryGraphics.height, function () {
+		return self.checkOverlapWithOtherBuildings();
+	});
+	self.storeFood = function (amount) {
+		self.gameResources.food.amount += amount;
+		if (self.gameResources.food.amount > 1000) self.gameResources.food.amount = 1000;
+	};
+});
 function globalSeekResource(villager, resourceType) {}
 this.weatherSystem = new WeatherSystem();
 Villager.prototype.moveTo = function (targetX, targetY, speed) {
 	var dx = targetX - this.x;
@@ -888,8 +920,14 @@
 		case 'seekingWood':
 		case 'seekingRock':
 			this.seekResource(this.state.substring(7).toLowerCase());
 			break;
+		case 'trading':
+			this.moveTo(this.targetX, this.targetY, this.speed);
+			if (this.hasReachedTarget(this.targetX, this.targetY)) {
+				this.tradeWithMarketplace();
+			}
+			break;
 		default:
 			this.wanderRandomly();
 			break;
 	}
@@ -904,8 +942,14 @@
 	var dx = this.x - targetX;
 	var dy = this.y - targetY;
 	return Math.sqrt(dx * dx + dy * dy) < 5;
 };
+Villager.prototype.tradeWithMarketplace = function () {
+	if (this.marketplace) {
+		this.marketplace.trade(this, 'wood', 10, 'food');
+		this.decideNextAction();
+	}
+};
 Villager.prototype.setRandomTarget = function () {
 	this.targetX = Math.random() * 2048;
 	this.targetY = Math.random() * 2732;
 };