===================================================================
--- original.js
+++ change.js
@@ -170,80 +170,101 @@
 		cost: 10
 	}
 };
 // Progress Management
-var ProgressManager = function () {
-	function ProgressManager() {
-		this.money = 0;
-		this.generators = {};
-		this.upgrades = {};
-		this.lastUpdateTime = Date.now();
-	}
-	ProgressManager.prototype.updateGame = function () {
+function ProgressManager() {
+	var self = this;
+	self.money = 0;
+	self.generators = {};
+	self.upgrades = {};
+	self.currentTime = Date.now();
+	self.lastUpdateTime = self.currentTime;
+	self.updateGame = function () {
 		var now = Date.now();
-		var deltaTime = now - this.lastUpdateTime;
-		for (var id in this.generators) {
-			var generator = this.generators[id];
-			this.money += generator.generate(deltaTime);
-		}
-		this.lastUpdateTime = now;
+		var deltaTime = now - self.lastUpdateTime;
+		// Update generators
+		Object.values(self.generators).forEach(function (generator) {
+			var generated = generator.generate(deltaTime);
+			self.money += generated;
+		});
+		self.lastUpdateTime = now;
 	};
-	ProgressManager.prototype.buyGenerator = function (generatorId) {
-		var generatorConfig = GENERATORS[generatorId];
-		if (!generatorConfig || this.money < generatorConfig.cost) {
+	self.buyGenerator = function (generatorId) {
+		var generatorConfig = Object.values(GENERATORS).find(function (g) {
+			return g.id === generatorId;
+		});
+		if (!generatorConfig) {
+			throw new Error("Generator with id ".concat(generatorId, " not found"));
+		}
+		if (self.money < generatorConfig.cost) {
 			return false;
 		}
-		this.money -= generatorConfig.cost;
-		this.generators[generatorId] = new Generator(generatorConfig);
+		self.money -= generatorConfig.cost;
+		self.generators[generatorId] = new Generator(generatorConfig);
 		return true;
 	};
-	ProgressManager.prototype.buyUpgrade = function (upgradeId, generatorId) {
-		var upgradeConfig = UPGRADES[upgradeId];
-		var targetGenerator = this.generators[generatorId];
-		if (!upgradeConfig || !targetGenerator || this.money < upgradeConfig.cost) {
+	self.buyUpgrade = function (upgradeId, generatorId) {
+		var upgradeConfig = Object.values(UPGRADES).find(function (u) {
+			return u.id === upgradeId;
+		});
+		var targetGenerator = self.generators[generatorId];
+		if (!upgradeConfig || !targetGenerator) {
+			throw new Error("Upgrade or Generator not found");
+		}
+		if (self.money < upgradeConfig.cost) {
 			return false;
 		}
-		this.money -= upgradeConfig.cost;
+		self.money -= upgradeConfig.cost;
 		var upgrade = new Upgrade(upgradeConfig);
 		upgrade.apply(targetGenerator);
-		this.upgrades[upgradeId] = upgrade;
+		self.upgrades[upgradeId] = upgrade;
 		return true;
 	};
-	return ProgressManager;
-}();
-var Generator = function Generator(config) {
-	this.id = config.id;
-	this.name = config.name;
-	this.description = config.description;
-	this.autoClick = config.autoClick;
-	this.clickRate = config.clickRate;
-	this.cost = config.cost;
-	this.upgradeLevel = config.upgradeLevel;
-};
-Generator.prototype.generate = function (deltaTime) {
-	if (!this.autoClick) {
-		return 0;
-	}
-	return this.clickRate * deltaTime / 1000 * Math.pow(2, this.upgradeLevel);
-};
-Generator.prototype.upgrade = function () {
-	this.upgradeLevel++;
-};
-var Upgrade = function Upgrade(config) {
-	this.id = config.id;
-	this.name = config.name;
-	this.description = config.description;
-	this.targetGenerator = config.targetGenerator;
-	this.multipliers = config.multipliers;
-	this.cost = config.cost;
-	this.currentLevel = 0;
-};
-Upgrade.prototype.apply = function (generator) {
-	if (this.currentLevel < this.multipliers.length) {
-		generator.upgrade();
-		this.currentLevel++;
-	}
-};
+}
+function Generator(config) {
+	var self = this;
+	self.id = config.id;
+	self.name = config.name;
+	self.description = config.description;
+	self.autoClick = config.autoClick;
+	self.clickRate = config.clickRate;
+	self.cost = config.cost;
+	self.upgradeLevel = config.upgradeLevel;
+	self.generate = function (deltaTime) {
+		if (!self.autoClick) {
+			return 0;
+		}
+		var clickAmount = self.clickRate * deltaTime / 1000;
+		return clickAmount * Math.pow(2, self.upgradeLevel);
+	};
+	Object.defineProperty(self, "currentMultiplier", {
+		get: function get() {
+			return Math.pow(2, self.upgradeLevel);
+		}
+	});
+	self.manualGenerate = function () {
+		return 1 * self.currentMultiplier;
+	};
+	self.upgrade = function (upgradeMultiplier) {
+		self.upgradeLevel++;
+	};
+}
+function Upgrade(config) {
+	var self = this;
+	self.id = config.id;
+	self.name = config.name;
+	self.description = config.description;
+	self.targetGenerator = config.targetGenerator;
+	self.multipliers = config.multipliers;
+	self.cost = config.cost;
+	self.currentLevel = 0;
+	self.apply = function (generator) {
+		if (self.currentLevel < self.multipliers.length) {
+			generator.upgrade(self.multipliers[self.currentLevel]);
+			self.currentLevel++;
+		}
+	};
+}
 function initializeGame() {
 	progressManager = new ProgressManager();
 	// Initialize starting generator (Me)
 	progressManager.generators[GENERATORS.ME.id] = new Generator(GENERATORS.ME);