Merge pull request #82 from michaelhue/beta-ships

Include v1.4-beta ships
Include v1.4-beta ships.
2025-12-08 14:33:22 +00:00 · 2015-09-02 16:31:23 -07:00 · 2015-09-02 17:48:42 +02:00 · 2015-09-02 01:50:49 -07:00 · 2015-09-01 20:55:07 -07:00 · 2015-09-01 20:47:43 -07:00
138 changed files with 9449 additions and 3642 deletions
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@

 The Coriolis project was inspired by [E:D Shipyard](http://www.edshipyard.com/) and, of course, [Elite Dangerous](http://www.elitedangerous.com). The ultimate goal of Coriolis is to provide rich features to support in-game play and planning while engaging the E:D community to support its development.

-Coriolis was created for non-commercial purposes. Coriolis was created using assets and imagery from Elite: Dangerous, with the permission of Frontier Developments plc, for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments and no employee of Frontier Developments was involved in the making of it.
+Coriolis was created using assets and imagery from Elite: Dangerous, with the permission of Frontier Developments plc, for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments and no employee of Frontier Developments was involved in the making of it.

 ## Contributing

--- a/app/icons/a.svg
+++ b/app/icons/a.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
+  <path d="M10.063 26l1.8-6h8.274l1.8 6h3.551l-6-20h-6.976l-6 20h3.551zM14.863 10h2.274l1.8 6h-5.874l1.8-6z"></path>
+</svg>
--- a/app/index.html
+++ b/app/index.html
@@ -5,9 +5,9 @@
  <link rel="stylesheet" href="/app.css">

  <!-- Standard headers -->
-  <meta name="description" content="A ship outfitting and comparison tool for Elite Dangerous">
+  <meta name="description" content="A ship builder, outfitting and comparison tool for Elite Dangerous">
  <meta name="mobile-web-app-capable" content="yes">
-  <meta name="viewport" content="width = device-width, initial-scale = 1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
  <link rel="manifest" href="/images/logo/manifest.json">
  <link rel="icon" sizes="152x152 192x192" type="image/png" href="/images/logo/192x192.png">
  <link rel="shortcut icon" href="/images/logo/favicon.ico">
@@ -57,13 +57,13 @@
 <body style="background-color:#000;">
  <div style="height: 0; width: 0; overflow:hidden"><%= svgContent %></div>
  <shipyard-header></shipyard-header>
-  <div id="main" ui-view ng-click="bgClicked($event)"></div>
+  <div id="main" ui-view ng-click="bgClicked($event)" ng-style="{'font-size': sizeRatio + 'em'}"></div>

  <div ui-view="modal" ng-click="bgClicked($event)"></div>

  <footer>
-    <div class="right">
-      <a href="https://github.com/cmmcleod/coriolis/releases/" target="_blank" title="Coriolis Github Project">Version <%= version %> - <%= date %></a>
+    <div class="right cap">
+      <a href="https://github.com/cmmcleod/coriolis/releases/" target="_blank" title="Coriolis Github Project"><span translate="version"></span> <%= version %> - <%= date %></a>
    </div>
    <div style="max-width:50%" class="l">
      Coriolis was created using assets and imagery from Elite: Dangerous, with the permission of Frontier Developments plc, for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments and no employee of Frontier Developments was involved in the making of it.
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -1,6 +1,6 @@
-angular.module('app', ['ui.router', 'ct.ui.router.extras.sticky', 'ui.sortable', 'shipyard', 'ngLodash', 'app.templates'])
-.run(['$rootScope', '$location', '$window', '$document', '$state', 'commonArray', 'shipPurpose', 'shipSize', 'hardPointClass', 'GroupMap', 'Persist',
-function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hpc, GroupMap, Persist) {
+angular.module('app', ['ui.router', 'ct.ui.router.extras.sticky', 'ui.sortable', 'shipyard', 'ngLodash', 'app.templates', 'pascalprecht.translate'])
+.run(['$rootScope', '$location', '$window', '$document', '$state', '$translate', 'localeFormat', 'Persist', 'Discounts', 'Languages',
+function($rootScope, $location, $window, $doc, $state, $translate, localeFormat, Persist, Discounts, Languages) {
  // App is running as a standalone web app on tablet/mobile
  var isStandAlone;
  // This was causing issues on Windows phones ($window.external was causing Angular js to throw an exception). Backup is to try this and set isStandAlone to false if this fails.
@@ -21,7 +21,6 @@ function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hp
    $rootScope.prevState = { name: from.name, params: fromParams };

    if (to.url) { // Only track states that have a URL
-
      if ($window.ga) {
        ga('send', 'pageview', { page: $location.path() });
      }
@@ -33,42 +32,51 @@ function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hp
    }
  });

+  $rootScope.language = {
+    opts: Languages,
+    current: Languages[Persist.getLangCode()] ? Persist.getLangCode() : 'en'
+  };
+  $rootScope.localeFormat = d3.locale(localeFormat.get($rootScope.language.current));
+  updateNumberFormat();
+
  // Global Reference variables
-  $rootScope.CArr = CArr;
-  $rootScope.SP = shipPurpose;
-  $rootScope.SZ = sz;
-  $rootScope.HPC = hpc;
-  $rootScope.GMAP = GroupMap;
-  $rootScope.insurance = { opts: [{ name: 'Standard', pct: 0.05 }, { name: 'Alpha', pct: 0.025 }, { name: 'Beta', pct: 0.035 }] };
-  $rootScope.discounts = { opts: [{ name: 'None', pct: 1 }, { name: 'Founders World - 10%', pct: 0.90 }] };
-  $rootScope.STATUS = ['', 'DISABLED', 'OFF', 'ON'];
+  $rootScope.insurance = { opts: [{ name: 'standard', pct: 0.05 }, { name: 'alpha', pct: 0.025 }, { name: 'beta', pct: 0.0375 }] };
+  $rootScope.discounts = { opts: Discounts };
+  $rootScope.STATUS = ['', 'disabled', 'off', 'on'];
  $rootScope.STATUS_CLASS = ['', 'disabled', 'warning', 'secondary-disabled'];
+  $rootScope.sizeRatio = Persist.getSizeRatio();
  $rootScope.title = 'Coriolis';

-  $rootScope.cName = function(c) {
-    return c.c ? c.c.name ? c.c.name : GroupMap[c.c.grp] : null;
+  $rootScope.changeLanguage = function() {
+    $translate.use($rootScope.language.current);
+    $rootScope.localeFormat = d3.locale(localeFormat.get($rootScope.language.current));
+    updateNumberFormat();
+    $rootScope.$broadcast('languageChanged', $rootScope.language.current);
  };

  // Formatters
-  $rootScope.fCrd = d3.format(',.0f');
-  $rootScope.fPwr = d3.format(',.2f');
-  $rootScope.fRound = function(d) { return d3.round(d, 2); };
-  $rootScope.fRound4 = function(d) { return d3.round(d, 4); };
-  $rootScope.fPct = d3.format('.2%');
-  $rootScope.f1Pct = d3.format('.1%');
  $rootScope.fRPct = d3.format('%');
  $rootScope.fTime = function(d) { return Math.floor(d / 60) + ':' + ('00' + Math.floor(d % 60)).substr(-2, 2); };

-  if (isStandAlone) {
-    var state = Persist.getState();
-    // If a previous state has been stored, load that state
-    if (state && state.name && state.params) {
-      $state.go(state.name, state.params, { location: 'replace' });
-    } else {
-      $state.go('shipyard', null, { location: 'replace' }); // Default to home page
-    }
+  function updateNumberFormat() {
+    var locale = $rootScope.localeFormat;
+    var fGen = $rootScope.fGen = locale.numberFormat('n');
+    $rootScope.fCrd = locale.numberFormat(',.0f');
+    $rootScope.fPwr = locale.numberFormat(',.2f');
+    $rootScope.fRound = function(d) { return fGen(d3.round(d, 2)); };
+    $rootScope.fPct = locale.numberFormat('.2%');
+    $rootScope.f1Pct = locale.numberFormat('.1%');
  }

+  /**
+   * Returns the name of the component mounted in the specified slot
+   * @param  {Object} slot The slot object
+   * @return {String}      The component name
+   */
+  $rootScope.cName = function(slot) {
+    return $translate.instant(slot.c ? slot.c.name ? slot.c.name : slot.c.grp : null);
+  };
+
  // Global Event Listeners
  $doc.bind('keyup', function(e) {
    if (e.keyCode == 27) { // Escape Key
@@ -94,4 +102,14 @@ function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hp
    }, false);
  }

+  if (isStandAlone) {
+    var state = Persist.getState();
+    // If a previous state has been stored, load that state
+    if (state && state.name && state.params) {
+      $state.go(state.name, state.params, { location: 'replace' });
+    } else {
+      $state.go('shipyard', null, { location: 'replace' }); // Default to home page
+    }
+  }
+
 }]);
--- a/app/js/config.js
+++ b/app/js/config.js
@@ -4,6 +4,7 @@
 angular.module('app').config(['$provide', '$stateProvider', '$urlRouterProvider', '$locationProvider', 'ShipsDB', function($provide, $stateProvider, $urlRouterProvider, $locationProvider, ships) {
  // Use HTML5 push and replace state if possible
  $locationProvider.html5Mode({ enabled: true, requireBase: false });
+
  /**
   * Set up all states and their routes.
   */
@@ -46,7 +47,7 @@ angular.module('app').config(['$provide', '$stateProvider', '$urlRouterProvider'
    // Modal States and views
    .state('modal', { abstract: true, views: { 'modal': { templateUrl: 'views/_modal.html', controller: 'ModalController' } } })
    .state('modal.about', { views: { 'modal-content': { templateUrl: 'views/modal-about.html' } } })
-    .state('modal.export', { params: { title: null, data: null, promise: null }, views: { 'modal-content': { templateUrl: 'views/modal-export.html', controller: 'ExportController' } } })
+    .state('modal.export', { params: { title: null, data: null, promise: null, description: null }, views: { 'modal-content': { templateUrl: 'views/modal-export.html', controller: 'ExportController' } } })
    .state('modal.import', { params: { obj: null }, views: { 'modal-content': { templateUrl: 'views/modal-import.html', controller: 'ImportController' } } })
    .state('modal.link', { params: { url: null }, views: { 'modal-content': { templateUrl: 'views/modal-link.html', controller: 'LinkController' } } })
    .state('modal.delete', { views: { 'modal-content': { templateUrl: 'views/modal-delete.html', controller: 'DeleteController' } } });
--- a/app/js/controllers/controller-comparison.js
+++ b/app/js/controllers/controller-comparison.js
@@ -1,4 +1,4 @@
-angular.module('app').controller('ComparisonController', ['lodash', '$rootScope', '$filter', '$scope', '$state', '$stateParams', 'Utils', 'ShipFacets', 'ShipsDB', 'Ship', 'Persist', 'Serializer', function(_, $rootScope, $filter, $scope, $state, $stateParams, Utils, ShipFacets, Ships, Ship, Persist, Serializer) {
+angular.module('app').controller('ComparisonController', ['lodash', '$rootScope', '$filter', '$scope', '$state', '$stateParams', '$translate', 'Utils', 'ShipFacets', 'ShipsDB', 'Ship', 'Persist', 'Serializer', function(_, $rootScope, $filter, $scope, $state, $stateParams, $translate, Utils, ShipFacets, Ships, Ship, Persist, Serializer) {
  $rootScope.title = 'Coriolis - Compare';
  $scope.predicate = 'name'; // Sort by ship name as default
  $scope.desc = false;
@@ -155,7 +155,7 @@ angular.module('app').controller('ComparisonController', ['lodash', '$rootScope'
        return 'Error - ' + err.statusText;
      }
    );
-    $state.go('modal.export', { promise: promise, title: 'Forum BBCode' });
+    $state.go('modal.export', { promise: promise, title: $translate.instant('FORUM') + ' BBCode' });
  };

  /**
@@ -184,6 +184,10 @@ angular.module('app').controller('ComparisonController', ['lodash', '$rootScope'
    $scope.showBuilds = false;
  });

+  $scope.$on('languageChanged', function() {
+    $scope.tblUpdate = !$scope.tblUpdate; // Simple switch to trigger the table to update
+  });
+
  /* Initialization */
  if ($scope.compareMode) {
    if ($scope.name == 'all') {
@@ -226,7 +230,7 @@ angular.module('app').controller('ComparisonController', ['lodash', '$rootScope'
    }
  }
  // Replace fmt with actual format function as defined in rootScope and retain original index
-  facets.forEach(function(f, i) { f.fmt = $rootScope[f.fmt]; f.index = i; });
+  facets.forEach(function(f, i) { f.index = i; });
  // Remove default facets, mark as active, and add them back in selected order
  _.pullAt(facets, defaultFacets).forEach(function(f) { f.active = true; facets.unshift(f); });
  $scope.builds = $filter('orderBy')($scope.builds, $scope.predicate, $scope.desc);
--- a/app/js/controllers/controller-export.js
+++ b/app/js/controllers/controller-export.js
@@ -1,11 +1,12 @@
 angular.module('app').controller('ExportController', ['$scope', '$stateParams', function($scope, $stateParams) {

  $scope.title = $stateParams.title || 'Export';
+  $scope.description = $stateParams.description;

  if ($stateParams.promise) {
    $scope.export = 'Generating...';
    $stateParams.promise.then(function(data) {
-      $scope.export = data;
+      $scope.export = (typeof data === 'object') ? angular.toJson(data, true) : data;
    });
  } else {
    $scope.export = angular.toJson($stateParams.data, true);
--- a/app/js/controllers/controller-import.js
+++ b/app/js/controllers/controller-import.js
@@ -1,92 +1,303 @@
-angular.module('app').controller('ImportController', ['$scope', '$stateParams', 'ShipsDB', 'Ship', 'Persist', 'Serializer', function($scope, $stateParams, Ships, Ship, Persist, Serializer) {
-  $scope.jsonValid = false;
-  $scope.importData = null;
+angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$scope', '$stateParams', 'ShipsDB', 'Ship', 'Components', 'GroupMap', 'Persist', 'Serializer', function(_, $rootScope, $scope, $stateParams, Ships, Ship, Components, GroupMap, Persist, Serializer) {
+  $scope.importValid = false;
+  $scope.importString = null;
  $scope.errorMsg = null;
  $scope.canEdit = true;
  $scope.builds = $stateParams.obj || null;
  $scope.ships = Ships;

-  $scope.validateJson = function() {
-    var importObj = null;
-    $scope.jsonValid = false;
-    $scope.errorMsg = null;
-    $scope.builds = null;
+  var textBuildRegex = new RegExp('^\\[([\\w \\-]+)\\]\n');
+  var lineRegex = new RegExp('^([\\dA-Z]{1,2}): (\\d)([A-I])[/]?([FGT])?([SD])? ([\\w\\- ]+)');
+  var mountMap = { 'H': 4, 'L': 3, 'M': 2, 'S': 1, 'U': 0 };
+  var commonMap = { 'RB': 0, 'TM': 1, 'FH': 2, 'EC': 3, 'PC': 4, 'SS': 5, 'FS': 6 };
+  var bhMap = { 'lightweight alloy': 0, 'reinforced alloy': 1, 'military grade composite': 2, 'mirrored surface composite': 3, 'reactive surface composite': 4 };

-    if (!$scope.importData) { return; }
+  function isEmptySlot(slot) {
+    return slot.maxClass == this && slot.c === null;
+  }
+
+  function equalsIgnoreCase(str) {
+    return str.toLowerCase() == this.toLowerCase();
+  }
+
+  function validateBuild(shipId, code, name) {
+    var shipData = Ships[shipId];
+
+    if (!shipData) {
+      throw '"' + shipId + '" is not a valid Ship Id!';
+    }
+    if (typeof name != 'string' || name.length < 3) {
+      throw shipData.properties.name + ' build "' + name + '" must be a string at least 3 characters long!';
+    }
+    if (typeof code != 'string' || code.length < 10) {
+      throw shipData.properties.name + ' build "' + name + '" is not valid!';
+    }
+    try {
+      Serializer.toShip(new Ship(shipId, shipData.properties, shipData.slots), code);
+    } catch (e) {
+      throw shipData.properties.name + ' build "' + name + '" is not valid!';
+    }
+  }
+
+  function detailedJsonToBuild(detailedBuild) {
+    var ship;
+    if (!detailedBuild.name) {
+      throw 'Build Name missing!';
+    }

    try {
-      importObj = angular.fromJson($scope.importData);
+      ship = Serializer.fromDetailedBuild(detailedBuild);
    } catch (e) {
-      $scope.errorMsg = 'Cannot Parse JSON!';
-      return;
+      throw detailedBuild.ship + ' Build "' + detailedBuild.name + '": Invalid data';
    }

-    if (typeof importObj != 'object') {
-      $scope.errorMsg = 'Must be an object!';
-      return;
-    }
+    return { shipId: ship.id, name: detailedBuild.name, code: Serializer.fromShip(ship) };
+  }

-    if ((!importObj.builds || !Object.keys(importObj.builds).length)) {
-      $scope.errorMsg = 'No builds in data';
-      return;
+  function importBackup(importData) {
+    if (importData.builds && typeof importData.builds == 'object') {
+      for (var shipId in importData.builds) {
+        for (var buildName in importData.builds[shipId]) {
+          validateBuild(shipId, importData.builds[shipId][buildName], buildName);
+        }
+      }
+      $scope.builds = importData.builds;
+    } else {
+      throw 'builds must be an object!';
    }
-
-    for (var shipId in importObj.builds) {
-      var shipData = Ships[shipId];
-      if (shipData) {
-        for (var buildName in importObj.builds[shipId]) {
-          if (typeof importObj.builds[shipId][buildName] != 'string') {
-            $scope.errorMsg = shipData.properties.name + ' build "' + buildName + '" must be a string!';
-            return;
-          }
-          try {
-            // Actually build the ship with the code to ensure it's valid
-            Serializer.toShip(new Ship(shipId, shipData.properties, shipData.slots), importObj.builds[shipId][buildName]);
-          } catch (e) {
-            $scope.errorMsg = shipData.properties.name + ' build "' + buildName + '" is not valid!';
-            return;
+    if (importData.comparisons) {
+      for (var compName in importData.comparisons) {
+        var comparison = importData.comparisons[compName];
+        for (var i = 0, l = comparison.builds.length; i < l; i++) {
+          var build = comparison.builds[i];
+          if (!importData.builds[build.shipId] || !importData.builds[build.shipId][build.buildName]) {
+            throw build.shipId + ' build "' + build.buildName + '" data is missing!';
          }
        }
-      } else {
-        $scope.errorMsg = '"' + shipId + '"" is not a valid Ship Id!';
-        return;
      }
-      $scope.builds = importObj.builds;
+      $scope.comparisons = importData.comparisons;
+    }
+    if (importData.discounts instanceof Array && importData.discounts.length == 2) {
+      $scope.discounts = importData.discounts;
+    }
+    if (typeof importData.insurance == 'string' && importData.insurance.length > 3) {
+      $scope.insurance = importData.insurance;
+    }
+  }
+
+  function importDetailedArray(importArr) {
+    var builds = {};
+    for (var i = 0, l = importArr.length; i < l; i++) {
+      var build = detailedJsonToBuild(importArr[i]);
+      if (!builds[build.shipId]) {
+        builds[build.shipId] = {};
+      }
+      builds[build.shipId][build.name] = build.code;
+    }
+    $scope.builds = builds;
+  }
+
+  function importTextBuild(buildStr) {
+    var buildName = textBuildRegex.exec(buildStr)[1].trim();
+    var shipName = buildName.toLowerCase();
+    var shipId = null;
+
+    for (var sId in Ships) {
+      if (Ships[sId].properties.name.toLowerCase() == shipName) {
+        shipId = sId;
+        break;
+      }
    }

-    $scope.jsonValid = true;
+    if (!shipId) { throw 'No such ship found: "' + buildName + '"'; }
+
+    var lines = buildStr.split('\n');
+    var ship = new Ship(shipId, Ships[shipId].properties, Ships[shipId].slots);
+    ship.buildWith(null);
+
+    for (var i = 1; i < lines.length; i++) {
+      var line = lines[i].trim();
+
+      if (!line) { continue; }
+      if (line.substring(0, 3) == '---') { break; }
+
+      var parts = lineRegex.exec(line);
+
+      if (!parts) { throw 'Error parsing: "' + line + '"'; }
+
+      var typeSize = parts[1];
+      var cl = parts[2];
+      var rating = parts[3];
+      var mount = parts[4];
+      var missile = parts[5];
+      var name = parts[6].trim();
+      var slot, group;
+
+      if (isNaN(typeSize)) {  // Common or Hardpoint
+        if (typeSize.length == 1) { // Hardpoint
+          var slotClass = mountMap[typeSize];
+
+          if (cl > slotClass) { throw cl + rating + ' ' + name + ' exceeds slot size: "' + line + '"'; }
+
+          slot = _.find(ship.hardpoints, isEmptySlot, slotClass);
+
+          if (!slot) { throw 'No hardpoint slot available for: "' + line + '"'; }
+
+          group = _.find(GroupMap, equalsIgnoreCase, name);
+
+          var hpid = Components.findHardpointId(group, cl, rating, group ? null : name, mount, missile);
+
+          if (!hpid) { throw 'Unknown component: "' + line + '"'; }
+
+          ship.use(slot, hpid, Components.hardpoints(hpid), true);
+
+        } else if (typeSize == 'BH') {
+          var bhId = bhMap[name.toLowerCase()];
+
+          if (bhId === undefined) { throw 'Unknown bulkhead: "' + line + '"'; }
+
+          ship.useBulkhead(bhId, true);
+
+        } else if (commonMap[typeSize] != undefined) {
+          var commonIndex = commonMap[typeSize];
+
+          if (ship.common[commonIndex].maxClass < cl) { throw name + ' exceeds max class for the ' + ship.name; }
+
+          ship.use(ship.common[commonIndex], cl + rating, Components.common(commonIndex, cl + rating), true);
+
+        } else {
+          throw 'Unknown component: "' + line + '"';
+        }
+      } else {
+        if (cl > typeSize) { throw cl + rating + ' ' + name + ' exceeds slot size: "' + line + '"'; }
+
+        slot = _.find(ship.internal, isEmptySlot, typeSize);
+
+        if (!slot) { throw 'No internal slot available for: "' + line + '"'; }
+
+        group = _.find(GroupMap, equalsIgnoreCase, name);
+
+        var intId = Components.findInternalId(group, cl, rating, group ? null : name);
+
+        if (!intId) { throw 'Unknown component: "' + line + '"'; }
+
+        ship.use(slot, intId, Components.internal(intId));
+      }
+    }
+
+    var builds = {};
+    builds[shipId] = {};
+    builds[shipId]['Imported ' + buildName] = Serializer.fromShip(ship);
+    $scope.builds = builds;
+  }
+
+  $scope.validateImport = function() {
+    var importData = null;
+    var importString = $scope.importString.trim();
+    $scope.importValid = false;
+    $scope.errorMsg = null;
+    $scope.builds = $scope.discounts = $scope.comparisons = $scope.insurance = null;
+
+    if (!importString) { return; }
+
+
+    try {
+      if (textBuildRegex.test(importString)) {  // E:D Shipyard build text
+        importTextBuild(importString);
+      } else {                                  // JSON Build data
+        importData = angular.fromJson($scope.importString);
+
+        if (!importData || typeof importData != 'object') {
+          throw 'Must be an object or array!';
+        }
+
+        if (importData instanceof Array) {   // Must be detailed export json
+          importDetailedArray(importData);
+        } else if (importData.ship && importData.name) { // Using JSON from a single ship build export
+          importDetailedArray([importData]); // Convert to array with singleobject
+        } else { // Using Backup JSON
+          importBackup(importData);
+        }
+      }
+    } catch (e) {
+      $scope.errorMsg = (typeof e == 'string') ? e : 'Cannot Parse the data!';
+      return;
+    }
+
+    $scope.importValid = true;
  };

  $scope.hasBuild = function(shipId, name) {
    return Persist.getBuild(shipId, name) !== null;
  };

+  $scope.hasComparison = function(name) {
+    return Persist.getComparison(name) !== null;
+  };
+
  $scope.process = function() {
-    var builds = $scope.builds;
-    for (var shipId in builds) {
-      for (var buildName in builds[shipId]) {
-        var code = builds[shipId][buildName];
-        // Update builds object such that orginal name retained, but can be renamed
-        builds[shipId][buildName] = {
-          code: code,
-          useName: buildName
-        };
+    if ($scope.builds) {
+      var builds = $scope.builds;
+      for (var shipId in builds) {
+        for (var buildName in builds[shipId]) {
+          var code = builds[shipId][buildName];
+          // Update builds object such that orginal name retained, but can be renamed
+          builds[shipId][buildName] = {
+            code: code,
+            useName: buildName
+          };
+        }
      }
    }
+
+    if ($scope.comparisons) {
+      var comparisons = $scope.comparisons;
+      for (var name in comparisons) {
+        comparisons[name].useName = name;
+      }
+    }
+
    $scope.processed = true;
  };

  $scope.import = function() {
-    var builds = $scope.builds;
-    for (var shipId in builds) {
-      for (var buildName in builds[shipId]) {
-        var build = builds[shipId][buildName];
-        var name = build.useName.trim();
-        if (name) {
-          Persist.saveBuild(shipId, name, build.code);
+
+    if ($scope.builds) {
+      var builds = $scope.builds;
+      for (var shipId in builds) {
+        for (var buildName in builds[shipId]) {
+          var build = builds[shipId][buildName];
+          var name = build.useName.trim();
+          if (name) {
+            Persist.saveBuild(shipId, name, build.code);
+          }
        }
      }
    }
+
+    if ($scope.comparisons) {
+      var comparisons = $scope.comparisons;
+      for (var comp in comparisons) {
+        var comparison = comparisons[comp];
+        var useName = comparison.useName.trim();
+        if (useName) {
+          Persist.saveComparison(useName, comparison.builds, comparison.facets);
+        }
+      }
+    }
+
+    if ($scope.discounts) {
+      $rootScope.discounts.ship = $scope.discounts[0];
+      $rootScope.discounts.components = $scope.discounts[1];
+      $rootScope.$broadcast('discountChange');
+      Persist.setDiscount($scope.discounts);
+    }
+
+    if ($scope.insurance) {
+      $rootScope.insurance.current = $scope.insurance;
+      Persist.setInsurance($scope.insurance);
+    }
+
    $scope.$parent.dismiss();
  };

--- a/app/js/controllers/controller-outfit.js
+++ b/app/js/controllers/controller-outfit.js
@@ -1,7 +1,8 @@
-angular.module('app').controller('OutfitController', ['$window', '$rootScope', '$scope', '$state', '$stateParams', 'ShipsDB', 'Ship', 'Components', 'Serializer', 'Persist', 'calcTotalRange', 'calcSpeed', function($window, $rootScope, $scope, $state, $p, Ships, Ship, Components, Serializer, Persist, calcTotalRange, calcSpeed) {
+angular.module('app').controller('OutfitController', ['$window', '$rootScope', '$scope', '$state', '$stateParams', '$translate', 'ShipsDB', 'Ship', 'Components', 'Serializer', 'Persist', 'calcTotalRange', 'calcSpeed', function($window, $rootScope, $scope, $state, $p, $translate, Ships, Ship, Components, Serializer, Persist, calcTotalRange, calcSpeed) {
+  var win = angular.element($window);   // Angularized window object for event triggering
  var data = Ships[$p.shipId];   // Retrieve the basic ship properties, slots and defaults
  var ship = new Ship($p.shipId, data.properties, data.slots); // Create a new Ship instance
-  var win = angular.element($window);   // Angularized window object for event triggering
+  var retrofitShip = new Ship($p.shipId, data.properties, data.slots); // Create a new Ship for retrofit comparison

  //  Update the ship instance with the code (if provided) or the 'factory' defaults.
  if ($p.code) {
@@ -30,11 +31,27 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
  $scope.selectedSlot = null;
  $scope.savedCode = Persist.getBuild(ship.id, $scope.buildName);
  $scope.canSave = Persist.isEnabled();
+  $scope.allBuilds = Persist.builds;
  $scope.fuel = 0;
  $scope.pwrDesc = false;
  $scope.pwrPredicate = 'type';
+  $scope.retroDesc = false;
+  $scope.retroPredicate = 'netCost';
  $scope.costDesc = true;
  $scope.costPredicate = 'c.cost';
+  $scope.costTab = Persist.getCostTab() || 'costs';
+
+  if ($scope.savedCode) {
+    Serializer.toShip(retrofitShip, $scope.savedCode);  // Populate components from last save
+    $scope.retrofitBuild = $scope.buildName;
+  } else {
+    retrofitShip.buildWith(data.defaults);
+    $scope.retrofitBuild = null;
+  }
+
+  ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+  retrofitShip.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+  updateRetrofitCosts();

  $scope.jrSeries = {
    xMin: 0,
@@ -48,11 +65,11 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
  $scope.jrChart = {
    labels: {
      xAxis: {
-        title: 'Cargo',
+        title: 'cargo',
        unit: 'T'
      },
      yAxis: {
-        title: 'Jump Range',
+        title: 'jump range',
        unit: 'LY'
      }
    }
@@ -70,11 +87,11 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
  $scope.trChart = {
    labels: {
      xAxis: {
-        title: 'Cargo',
+        title: 'cargo',
        unit: 'T'
      },
      yAxis: {
-        title: 'Total Range',
+        title: 'total range',
        unit: 'LY'
      }
    }
@@ -93,11 +110,11 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
  $scope.speedChart = {
    labels: {
      xAxis: {
-        title: 'Cargo',
+        title: 'cargo',
        unit: 'T'
      },
      yAxis: {
-        title: 'Speed',
+        title: 'speed',
        unit: 'm/s'
      }
    }
@@ -128,7 +145,16 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
   */
  $scope.select = function(type, slot, e, id) {
    e.stopPropagation();
-    id = id || angular.element(e.target).attr('cpid');  // Get component ID
+
+    if (!id) {  // Find component id if not passed
+      var elem = e.target;
+      while (elem && elem !== e.currentTarget && !elem.getAttribute('cpid')) {
+        elem = elem.parentElement;
+      }
+      if (elem) {
+        id = elem.getAttribute('cpid');
+      }
+    }

    if (id) {
      if (id == 'empty') {
@@ -158,16 +184,46 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
  };

  /**
-   * Strip ship to D-class and no other components.
+   * Strip ship to A-class and biggest A-class shield generator with military bulkheads
   */
-  $scope.stripBuild = function() {
+  $scope.aRatedBuild = function() {
    for (var i = 0, l = ship.common.length - 1; i < l; i++) { // All except Fuel Tank
-      var id = ship.common[i].maxClass + 'D';
+      var id = ship.common[i].maxClass + 'A';
      ship.use(ship.common[i], id, Components.common(i, id));
    }
    ship.hardpoints.forEach(function(slot) { ship.use(slot, null, null); });
    ship.internal.forEach(function(slot) { ship.use(slot, null, null); });
+    ship.internal.some(function(slot) {
+      if (typeof slot.eligible === 'undefined') { // Assuming largest slot can hold an eligible shield
+        id = Components.findInternalId('Shield Generator', slot.maxClass, 'A');
+        ship.use(slot, id, Components.internal(id));
+        return true;
+      }
+    });
+    ship.useBulkhead(2);
+    updateState(Serializer.fromShip(ship));
+  };
+
+  /**
+   * Optimize for the lower mass build that can still boost and power the ship
+   * without power management.
+   */
+  $scope.optimizeMassBuild = function() {
+    var common = ship.common;
+    ship.hardpoints.forEach(function(slot) { ship.use(slot, null, null); });
+    ship.internal.forEach(function(slot) { ship.use(slot, null, null); });
    ship.useBulkhead(0);
+    ship.use(common[2], common[2].maxClass + 'A', Components.common(2, common[2].maxClass + 'A')); // FSD
+    ship.use(common[3], common[3].maxClass + 'D', Components.common(3, common[3].maxClass + 'D')); // Life Support
+    ship.use(common[5], common[5].maxClass + 'D', Components.common(5, common[5].maxClass + 'D')); // Sensors
+
+    var pd = $scope.availCS.lightestPowerDist(ship.boostEnergy); // Find lightest Power Distributor that can still boost
+    ship.use(ship.common[4], pd, Components.common(4, pd));
+    var th = $scope.availCS.lightestThruster(ship.ladenMass); // Find lightest Thruster that still works for the ship at max mass
+    ship.use(ship.common[1], th, Components.common(1, th));
+    var pp = $scope.availCS.lightestPowerPlant(ship.powerRetracted); // Find lightest Power plant that can power the ship
+    ship.use(ship.common[0], pp, Components.common(0, pp));
+
    updateState(Serializer.fromShip(ship));
  };

@@ -187,10 +243,28 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    if ($scope.code != $scope.savedCode) {
      Persist.saveBuild(ship.id, $scope.buildName, $scope.code);
      $scope.savedCode = $scope.code;
+      if ($scope.retrofitBuild === $scope.buildName) {
+        Serializer.toShip(retrofitShip, $scope.code);
+      }
      updateState($scope.code);
    }
  };

+  /**
+   * Export the build to detailed JSON
+   */
+  $scope.exportBuild = function(e) {
+    e.stopPropagation();
+
+    if ($scope.buildName) {
+      $state.go('modal.export', {
+        title: $scope.buildName + ' ' + $translate.instant('export'),
+        description: $translate.instant('PHRASE_EXPORT_DESC'),
+        data: Serializer.toDetailedBuild($scope.buildName, ship, $scope.code || Serializer.fromShip(ship))
+      });
+    }
+  };
+
  /**
   * Permanently delete the current build and redirect/reload this controller
   * with the 'factory' build of the current ship.
@@ -230,6 +304,11 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    $scope.pwrPredicate = key;
  };

+  $scope.sortRetrofit = function(key) {
+      $scope.retroDesc = $scope.retroPredicate == key ? !$scope.retroDesc : $scope.retroDesc;
+      $scope.retroPredicate = key;
+  };
+
  /**
   * Toggle the power on/off for the selected component
   * @param  {object} item The component being toggled
@@ -264,6 +343,15 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    return ship.getSlotStatus(slot, true);
  };

+  $scope.setRetrofitBase = function() {
+    if ($scope.retrofitBuild) {
+      Serializer.toShip(retrofitShip, Persist.getBuild(ship.id, $scope.retrofitBuild));
+    } else {
+      retrofitShip.buildWith(data.defaults);
+    }
+    updateRetrofitCosts();
+  };
+
  // Utilify functions

  function updateState(code) {
@@ -272,12 +360,78 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    $scope.speedSeries.xMax = $scope.trSeries.xMax = $scope.jrSeries.xMax = ship.cargoCapacity;
    $scope.jrSeries.yMax = ship.unladenRange;
    $scope.trSeries.yMax = ship.unladenTotalRange;
+    updateRetrofitCosts();
    win.triggerHandler('pwrchange');
  }

+  function updateRetrofitCosts() {
+    var costs = $scope.retrofitList = [];
+    var total = 0, i, l, item;
+
+    if (ship.bulkheads.id != retrofitShip.bulkheads.id) {
+      item = {
+        buyClassRating: ship.bulkheads.c.class + ship.bulkheads.c.rating,
+        buyName: ship.bulkheads.c.name,
+        sellClassRating: retrofitShip.bulkheads.c.class + retrofitShip.bulkheads.c.rating,
+        sellName: retrofitShip.bulkheads.c.name,
+        netCost: ship.bulkheads.discountedCost - retrofitShip.bulkheads.discountedCost
+      };
+      costs.push(item);
+      total += item.netCost;
+    }
+
+    for (var g in { common: 1, internal: 1, hardpoints: 1 }) {
+      var retroSlotGroup = retrofitShip[g];
+      var slotGroup = ship[g];
+      for (i = 0, l = slotGroup.length; i < l; i++) {
+        if (slotGroup[i].id != retroSlotGroup[i].id) {
+          item = { netCost: 0 };
+          if (slotGroup[i].id) {
+            item.buyName = slotGroup[i].c.name || slotGroup[i].c.grp;
+            item.buyClassRating = slotGroup[i].c.class + slotGroup[i].c.rating;
+            item.netCost = slotGroup[i].discountedCost;
+          }
+          if (retroSlotGroup[i].id) {
+            item.sellName = retroSlotGroup[i].c.name || retroSlotGroup[i].c.grp;
+            item.sellClassRating = retroSlotGroup[i].c.class + retroSlotGroup[i].c.rating;
+            item.netCost -= retroSlotGroup[i].discountedCost;
+          }
+          costs.push(item);
+          total += item.netCost;
+        }
+      }
+    }
+    $scope.retrofitTotal = total;
+  }
+
+  $scope.updateCostTab = function(tab) {
+    Persist.setCostTab(tab);
+    $scope.costTab = tab;
+  };
+
+  $scope.ppWarning = function(pp) {
+    return pp.pGen < ship.powerRetracted;
+  };
+
+  $scope.pdWarning = function(pd) {
+    return pd.enginecapacity < ship.boostEnergy;
+  };
+
  // Hide any open menu/slot/etc if the background is clicked
  $scope.$on('close', function() {
    $scope.selectedSlot = null;
  });

+  // Hide any open menu/slot/etc if the background is clicked
+  $scope.$on('languageChanged', function() {
+    $scope.selectedSlot = null;
+  });
+
+  // Hide any open menu/slot/etc if the background is clicked
+  $scope.$on('discountChange', function() {
+    ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+    retrofitShip.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+    updateRetrofitCosts();
+  });
+
 }]);
--- a/app/js/directives/directive-area-chart.js
+++ b/app/js/directives/directive-area-chart.js
@@ -1,4 +1,4 @@
-angular.module('app').directive('areaChart', ['$window', function($window) {
+angular.module('app').directive('areaChart', ['$window', '$translate', function($window, $translate) {
  return {
    restrict: 'A',
    scope: {
@@ -47,18 +47,19 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
      // Create Y Axis SVG Elements
      var yTxt = vis.append('g').attr('class', 'y axis')
        .append('text')
+          .attr('class', 'cap')
          .attr('transform', 'rotate(-90)')
          .attr('y', -50)
          .attr('dy', '.1em')
          .style('text-anchor', 'middle')
-          .text(labels.yAxis.title + ' (' + labels.yAxis.unit + ')');
+          .text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
      // Create X Axis SVG Elements
      var xLbl = vis.append('g').attr('class', 'x axis');
      var xTxt = xLbl.append('text')
          .attr('y', 30)
          .attr('dy', '.1em')
          .style('text-anchor', 'middle')
-          .text(labels.xAxis.title + ' (' + labels.xAxis.unit + ')');
+          .text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');

      // Create and Add tooltip
      var tip = vis.append('g').style('display', 'none');
@@ -150,8 +151,8 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
        tip.attr('transform', 'translate(' + x(x0) + ',' + y(y0) + ')');
        tip.selectAll('rect').attr('x', flip ? '-5.75em' : '0.5em').style('text-anchor', flip ? 'end' : 'start');
        tip.selectAll('text.label').attr('x', flip ? '-2em' : '1em').style('text-anchor', flip ? 'end' : 'start');
-        tip.select('text.label.x').text(fmtLong(x0) + ' ' + labels.xAxis.unit);
-        tip.select('text.label.y').text(fmtLong(y0) + ' ' + labels.yAxis.unit);
+        tip.select('text.label.x').text(fmtLong(x0) + ' ' + $translate.instant(labels.xAxis.unit));
+        tip.select('text.label.y').text(fmtLong(y0) + ' ' + $translate.instant(labels.yAxis.unit));
      }

      scope.$on('$destroy', function() {
--- a/app/js/directives/directive-bar-chart.js
+++ b/app/js/directives/directive-bar-chart.js
@@ -1,4 +1,4 @@
-angular.module('app').directive('barChart', ['$window', function($window) {
+angular.module('app').directive('barChart', ['$window', '$translate', '$rootScope', function($window, $translate, $rootScope) {

  function bName(build) {
    return build.buildName + '\n' + build.name;
@@ -11,7 +11,7 @@ angular.module('app').directive('barChart', ['$window', function($window) {
    for (var i = 0; i < words.length; i++) {
      var tspan = el.append('tspan').text(words[i]);
      if (i > 0) {
-        tspan.attr('x', -9).attr('dy', 12);
+        tspan.attr('x', -9).attr('dy', '1em');
      }
    }
  }
@@ -25,15 +25,15 @@ angular.module('app').directive('barChart', ['$window', function($window) {
    link: function(scope, element) {
      var color = d3.scale.ordinal().range([ '#7b6888', '#6b486b', '#3182bd', '#a05d56', '#d0743c']),
          labels = scope.facet.lbls,
-          fmt = scope.facet.fmt,
+          fmt = null,
+          unit = null,
          properties = scope.facet.props,
-          unit = scope.facet.unit,
-          margin = { top: 10, right: 20, bottom: 35, left: 150 },
+          margin = { top: 10, right: 20, bottom: 40, left: 150 },
          y0 = d3.scale.ordinal(),
          y1 = d3.scale.ordinal(),
          x = d3.scale.linear(),
          yAxis = d3.svg.axis().scale(y0).outerTickSize(0).orient('left'),
-          xAxis = d3.svg.axis().scale(x).ticks(5).outerTickSize(0).orient('bottom').tickFormat(d3.format('.2s'));
+          xAxis = d3.svg.axis().scale(x).ticks(5).outerTickSize(0).orient('bottom');

      // Create chart
      var svg = d3.select(element[0]).append('svg');
@@ -43,7 +43,7 @@ angular.module('app').directive('barChart', ['$window', function($window) {
      var tip = d3.tip()
        .attr('class', 'd3-tip')
        .html(function(property, propertyIndex) {
-          return (labels ? (labels[propertyIndex] + ': ') : '') + fmt(property.value) + ' ' + unit;
+          return (labels ? ($translate.instant(labels[propertyIndex]) + ': ') : '') + fmt(property.value) + ' ' + unit;
        });

      vis.call(tip);
@@ -53,25 +53,19 @@ angular.module('app').directive('barChart', ['$window', function($window) {
      vis.selectAll('g.y.axis g text').each(insertLinebreaks);
      // Create X Axis SVG Elements
      var xAxisLbl = vis.append('g')
-          .attr('class', 'x axis')
+          .attr('class', 'x axis cap')
        .append('text')
-          .attr('y', 30)
+          .attr('y', 33)
          .attr('dy', '.1em')
-          .style('text-anchor', 'middle')
-          .text(scope.facet.title + (unit ? (' (' + unit + ')') : ''));
+          .style('text-anchor', 'middle');

-
-      /**
-       * Watch for changes in the comparison array (ships added/removed, sorting)
-       */
-      scope.$watchCollection('data', render);
-      angular.element($window).bind('orientationchange resize render', render);
+      updateFormats();

      function render() {
        var data = scope.data,
            width = element[0].offsetWidth,
            w = width - margin.left - margin.right,
-            height = 45 + (30 * data.length),
+            height = 45 + (30 * data.length * $rootScope.sizeRatio),
            h = height - margin.top - margin.bottom,
            maxVal = d3.max(data, function(d) { return d3.max(properties, function(p) {return d[p]; }); });

@@ -117,6 +111,17 @@ angular.module('app').directive('barChart', ['$window', function($window) {

      }

+      function updateFormats() {
+        fmt = $rootScope[scope.facet.fmt];
+        unit = $translate.instant(scope.facet.unit);
+        xAxisLbl.text($translate.instant(scope.facet.title) + (unit ? (' (' + $translate.instant(unit) + ')') : ''));
+        xAxis.tickFormat($rootScope.localeFormat.numberFormat('.2s'));
+        render();
+      }
+
+      angular.element($window).bind('orientationchange resize render', render);
+      scope.$watchCollection('data', render); // Watch for changes in the comparison array
+      scope.$on('languageChanged', updateFormats);
      scope.$on('$destroy', function() {
        angular.element($window).unbind('orientationchange resize render', render);
        tip.destroy(); // Remove the tooltip from the DOM
--- a/app/js/directives/directive-comparison-table.js
+++ b/app/js/directives/directive-comparison-table.js
@@ -1,7 +1,7 @@
-angular.module('app').directive('comparisonTable', ['$state', function($state) {
+angular.module('app').directive('comparisonTable', ['$state', '$translate', '$rootScope', function($state, $translate, $rootScope) {

  function tblHeader(facets) {
-    var r1 = ['<tr class="main"><th rowspan="2" class="prop" prop="name">Ship</th><th rowspan="2" class="prop" prop="buildName">Build</th>'];
+    var r1 = ['<tr class="main"><th rowspan="2" class="prop" prop="name">', $translate.instant('SHIP'), '</th><th rowspan="2" class="prop" prop="buildName">', $translate.instant('BUILD'), '</th>'];
    var r2 = [];
    for (var i = 0, l = facets.length; i < l; i++) {
      if (facets[i].active) {
@@ -14,11 +14,11 @@ angular.module('app').directive('comparisonTable', ['$state', function($state) {
          r1.push(' prop="', p[0], '" class="prop"');
        } else {
          for (var j = 0; j < pl; j++) {
-            r2.push('<th prop="', p[j], '" class="prop ', j === 0 ? 'lft' : '', '">', f.lbls[j], '</th>');
+            r2.push('<th prop="', p[j], '" class="prop ', j === 0 ? 'lft' : '', '">', $translate.instant(f.lbls[j]), '</th>');
          }
        }

-        r1.push('>', f.title, '</th>');
+        r1.push('>', $translate.instant(f.title), '</th>');
      }
    }
    r1.push('</tr><tr>');
@@ -46,7 +46,7 @@ angular.module('app').directive('comparisonTable', ['$state', function($state) {
          var f = facets[j];
          var p = f.props;
          for (var k = 0, pl = p.length; k < pl; k++) {
-            body.push('<td>', f.fmt(b[p[k]]), '<u> ', f.unit, '</u></td>');
+            body.push('<td>', $rootScope[f.fmt](b[p[k]]), '<u> ', $translate.instant(f.unit), '</u></td>');
          }
        }
      }
--- a/app/js/directives/directive-component-select.js
+++ b/app/js/directives/directive-component-select.js
@@ -1,14 +1,14 @@
-angular.module('app').directive('componentSelect', function() {
+angular.module('app').directive('componentSelect', ['$translate', function($translate) {

  // Generting the HTML in this manner is MUCH faster than using an angular template.

-  function appendGroup(list, opts, cid, mass) {
+  function appendGroup(list, opts, cid, mass, checkWarning) {
    var prevClass = null, prevRating = null;
    for (var i = 0; i < opts.length; i++) {
      var o = opts[i];
      var id = o.id || (o.class + o.rating);  // Common components' ID is their class and rating

-      if (i > 0 && opts.length > 3 && o.class != prevClass && (!o.grp || o.rating != prevRating || o.mode)) {
+      if (i > 0 && opts.length > 4 && o.class != prevClass && (o.rating != prevRating || o.mode)) {
        list.push('<br/>');
      }

@@ -18,13 +18,17 @@ angular.module('app').directive('componentSelect', function() {
        list.push(' active');
      }

-      list.push((o.maxmass && mass > o.maxmass) ? ' disabled"' : '" cpid="', id, '">');
-
-      if (o.mode) {
-        list.push('<svg cpid="', id, '" class="icon lg"><use xlink:href="#mount-', o.mode, '"></use></svg> ');
+      if (checkWarning && checkWarning(opts[i])) {
+        list.push(' warning');
      }

-      list.push(o.class, o.rating);
+      list.push(((o.maxmass && (mass + (o.mass ? o.mass : 0)) > o.maxmass) ? ' disabled"' : '" cpid="' + id + '"'), '>');
+
+      if (o.mode) {
+        list.push('<svg class="icon lg"><use xlink:href="#mount-', o.mode, '"></use></svg> ');
+      }
+
+      list.push('<span>', o.class, o.rating);

      if (o.missile) {
        list.push('/' + o.missile);
@@ -32,10 +36,10 @@ angular.module('app').directive('componentSelect', function() {


      if (o.name) {
-        list.push(' ' + o.name);
+        list.push(' ' + $translate.instant(o.name));
      }

-      list.push('</li>');
+      list.push('</span></li>');
      prevClass = o.class;
      prevRating = o.rating;
    }
@@ -46,8 +50,9 @@ angular.module('app').directive('componentSelect', function() {
    scope: {
      opts: '=',    // Component Options object
      groups: '=',  // Groups of Component Options
-      mass: '=',    // Current ship unladen mass
-      s: '='       // Current Slot
+      mass: '=',    // Current ship mass
+      s: '=',       // Current Slot
+      warning: '='  // Check warning function
    },
    link: function(scope, element) {
      var list = [];
@@ -55,21 +60,21 @@ angular.module('app').directive('componentSelect', function() {
      var component = scope.s.c;  // Slot's Current Component (may be null/undefined)
      var opts = scope.opts;
      var groups = scope.groups;
-      var mass = scope.mass || 0;
+      var mass = (scope.mass ? scope.mass : 0) - (component && component.mass ? component.mass : 0); // Mass minus the currently selected component

      if (groups) {
        // At present time slots with grouped options (Hardpoints and Internal) can be empty
-        list.push('<div class="empty-c" cpid="empty">EMPTY</div>');
+        list.push('<div class="empty-c upp" cpid="empty">', $translate.instant('empty'), '</div>');
        for (var g in groups) {
          var grp = groups[g];
          var grpCode = grp[Object.keys(grp)[0]].grp; // Nasty operation to get the grp property of the first/any single component
-          list.push('<div id="', grpCode, '" class="select-group">', g, '</div><ul>');
-          appendGroup(list, grp, cid, mass);
+          list.push('<div id="', grpCode, '" class="select-group cap">', $translate.instant(g), '</div><ul>');
+          appendGroup(list, grp, cid, mass, scope.warning);
          list.push('</ul>');
        }
      } else {
        list.push('<ul>');
-        appendGroup(list, opts, cid, mass);
+        appendGroup(list, opts, cid, mass, scope.warning);
        list.push('</ul>');
      }

@@ -82,4 +87,4 @@ angular.module('app').directive('componentSelect', function() {
      }
    }
  };
-});
+}]);
--- a/app/js/directives/directive-context-menu.js
+++ b/app/js/directives/directive-context-menu.js
@@ -3,10 +3,12 @@ angular.module('app').directive('contextMenu', ['$parse', function($parse) {
    var fn = $parse(attrs.contextMenu);

    element.bind('contextmenu', function(e) {
-      scope.$apply(function() {
-        e.preventDefault();
-        fn(scope, { $event: e });
-      });
+      if (!e.shiftKey) {
+        scope.$apply(function() {
+          e.preventDefault();
+          fn(scope, { $event: e });
+        });
+      }
    });
  };
 }]);
--- a/app/js/directives/directive-header.js
+++ b/app/js/directives/directive-header.js
@@ -1,4 +1,5 @@
-angular.module('app').directive('shipyardHeader', ['lodash', '$rootScope', 'Persist', 'ShipsDB', function(_, $rootScope, Persist, ships) {
+angular.module('app').directive('shipyardHeader', ['lodash', '$window', '$rootScope', '$state', 'Persist', 'Serializer', 'ShipsDB', function(_, $window, $rootScope, $state, Persist, Serializer, ships) {
+

  return {
    restrict: 'E',
@@ -12,20 +13,12 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$rootScope', 'Pers
      scope.allComparisons = Persist.comparisons;
      scope.bs = Persist.state;

+      var win = angular.element($window);   // Angularized window object for event triggering
      var insIndex = _.findIndex($rootScope.insurance.opts, 'name', Persist.getInsurance());
+      var savedDiscounts = Persist.getDiscount() || [1, 1];
      $rootScope.insurance.current = $rootScope.insurance.opts[insIndex != -1 ? insIndex : 0];
-      $rootScope.discounts.current = $rootScope.discounts.opts[Persist.getDiscount() || 0];
-
-      // Close menus if a navigation change event occurs
-      $rootScope.$on('$stateChangeStart', function() {
-        scope.openedMenu = null;
-      });
-
-      // Listen to close event to close opened menus or modals
-      $rootScope.$on('close', function() {
-        scope.openedMenu = null;
-        $rootScope.showAbout = false;
-      });
+      $rootScope.discounts.ship = savedDiscounts[0];
+      $rootScope.discounts.components = savedDiscounts[1];

      /**
       * Save selected insurance option
@@ -38,7 +31,30 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$rootScope', 'Pers
       * Save selected discount option
       */
      scope.updateDiscount = function() {
-        Persist.setDiscount($rootScope.discounts.opts.indexOf($rootScope.discounts.current));
+        Persist.setDiscount([$rootScope.discounts.ship, $rootScope.discounts.components]);
+        $rootScope.$broadcast('discountChange');
+      };
+
+      scope.backup = function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        scope.openedMenu = null;
+        $state.go('modal.export', {
+          title: 'backup',
+          data: Persist.getAll(),
+          description: 'PHRASE_BACKUP_DESC'
+        });
+      };
+
+      scope.detailedExport = function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        scope.openedMenu = null;
+        $state.go('modal.export', {
+          title: 'detailed export',
+          data: Serializer.toDetailedExport(scope.allBuilds),
+          description: 'PHRASE_EXPORT_DESC'
+        });
      };

      scope.openMenu = function(e, menu) {
@@ -55,15 +71,30 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$rootScope', 'Pers
        scope.openedMenu = menu;
      };

-      scope.about = function(e) {
-        e.preventDefault();
-        e.stopPropagation();
+      // Close menus if a navigation change event occurs
+      $rootScope.$on('$stateChangeStart', function() {
        scope.openedMenu = null;
-        $rootScope.showAbout = true;
+      });
+
+      // Listen to close event to close opened menus or modals
+      $rootScope.$on('close', function() {
+        scope.openedMenu = null;
+      });
+
+      scope.textSizeChange = function(size) {
+        if (size != $rootScope.sizeRatio) {
+          $rootScope.sizeRatio = size;
+          document.getElementById('main').style.fontSize = size + 'em';
+          Persist.setSizeRatio(size);
+          win.triggerHandler('resize');
+        }
      };

-      $rootScope.hideAbout = function() {
-        $rootScope.showAbout = false;
+      scope.resetTextSize = function() {
+        if ($rootScope.sizeRatio != 1) {
+          scope.textSizeChange(1);
+          scope.$broadcast('reset', 1);
+        }
      };

      scope.$watchCollection('allBuilds', function() {
--- a/app/js/directives/directive-line-chart.js
+++ b/app/js/directives/directive-line-chart.js
@@ -1,4 +1,4 @@
-angular.module('app').directive('lineChart', ['$window', function($window) {
+angular.module('app').directive('lineChart', ['$window', '$translate', '$rootScope', function($window, $translate, $rootScope) {
  return {
    restrict: 'A',
    scope: {
@@ -12,8 +12,7 @@ angular.module('app').directive('lineChart', ['$window', function($window) {
          config = scope.config,
          labels = config.labels,
          margin = { top: 15, right: 15, bottom: 35, left: 60 },
-          fmt = d3.format('.3r'),
-          fmtLong = d3.format('.2f'),
+          fmtLong = null,
          func = seriesConfig.func,
          drag = d3.behavior.drag(),
          dragging = false,
@@ -21,8 +20,8 @@ angular.module('app').directive('lineChart', ['$window', function($window) {
          x = d3.scale.linear(),
          y = d3.scale.linear(),
          // Define Axes
-          xAxis = d3.svg.axis().scale(x).outerTickSize(0).orient('bottom').tickFormat(d3.format('.2r')),
-          yAxis = d3.svg.axis().scale(y).ticks(6).outerTickSize(0).orient('left').tickFormat(fmt),
+          xAxis = d3.svg.axis().scale(x).outerTickSize(0).orient('bottom'),
+          yAxis = d3.svg.axis().scale(y).ticks(6).outerTickSize(0).orient('left'),
          data = [];

      // Create chart
@@ -36,21 +35,23 @@ angular.module('app').directive('lineChart', ['$window', function($window) {
      // Create Y Axis SVG Elements
      var yTxt = vis.append('g').attr('class', 'y axis')
        .append('text')
+          .attr('class', 'cap')
          .attr('transform', 'rotate(-90)')
          .attr('y', -50)
          .attr('dy', '.1em')
          .style('text-anchor', 'middle')
-          .text(labels.yAxis.title + ' (' + labels.yAxis.unit + ')');
+          .text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
      // Create X Axis SVG Elements
      var xLbl = vis.append('g').attr('class', 'x axis');
      var xTxt = xLbl.append('text')
+          .attr('class', 'cap')
          .attr('y', 30)
          .attr('dy', '.1em')
          .style('text-anchor', 'middle')
-          .text(labels.xAxis.title + ' (' + labels.xAxis.unit + ')');
+          .text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');

      // Create and Add tooltip
-      var tipWidth = (Math.max(labels.yAxis.unit.length, labels.xAxis.unit.length) * 1.25) + 2;
+      var tipWidth = (Math.max(labels.yAxis.unit.length, labels.xAxis.unit.length) * 1.25) + 2.5;
      var tips = vis.append('g').style('display', 'none');

      var background = vis.append('rect') // Background to capture hover/drag
@@ -72,15 +73,11 @@ angular.module('app').directive('lineChart', ['$window', function($window) {
        })
        .on('drag', moveTip);

-      /**
-       * Watch for changes in the series data (mass changes, etc)
-       */
-      scope.$watchCollection('series', render);
-      angular.element($window).bind('orientationchange resize render', render);
+      updateFormats();

      function render() {
        var width = element[0].parentElement.offsetWidth,
-            height = width * 0.5,
+            height = width * 0.5 * $rootScope.sizeRatio,
            xMax = seriesConfig.xMax,
            xMin = seriesConfig.xMin,
            yMax = seriesConfig.yMax,
@@ -177,10 +174,22 @@ angular.module('app').directive('lineChart', ['$window', function($window) {
        var tip = tips.selectAll('g.tooltip').attr('transform', function(d, i) { return 'translate(' + x(x0) + ',' + y(series ? y0[series[i]] : y0) + ')'; });
        tip.selectAll('rect').attr('x', flip ? (-tipWidth - 0.5) + 'em' : '0.5em').style('text-anchor', flip ? 'end' : 'start');
        tip.selectAll('text.label').attr('x', flip ? '-1em' : '1em').style('text-anchor', flip ? 'end' : 'start');
-        tip.selectAll('text.label.x').text(fmtLong(x0) + ' ' + labels.xAxis.unit);
-        tips.selectAll('text.label.y').text(function(d, i) { return fmtLong(series ? y0[series[i]] : y0) + ' ' + labels.yAxis.unit; });
+        tip.selectAll('text.label.x').text(fmtLong(x0) + ' ' + $translate.instant(labels.xAxis.unit));
+        tips.selectAll('text.label.y').text(function(d, i) { return fmtLong(series ? y0[series[i]] : y0) + ' ' + $translate.instant(labels.yAxis.unit); });
      }

+      function updateFormats() {
+        xTxt.text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');
+        yTxt.text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
+        fmtLong = $rootScope.localeFormat.numberFormat('.2f');
+        xAxis.tickFormat($rootScope.localeFormat.numberFormat('.2r'));
+        yAxis.tickFormat($rootScope.localeFormat.numberFormat('.3r'));
+        render();
+      }
+
+      angular.element($window).bind('orientationchange resize render', render);
+      scope.$watchCollection('series', render);   // Watch for changes in the series data
+      scope.$on('languageChanged', updateFormats);
      scope.$on('$destroy', function() {
        angular.element($window).unbind('orientationchange resize render', render);
      });
--- a/app/js/directives/directive-loader.js
+++ b/app/js/directives/directive-loader.js
@@ -0,0 +1,9 @@
+angular.module('app').directive('loader', function() {
+  return {
+    restrict: 'A',
+    link: function(scope, element) {
+      element.addClass('loader');
+      element.html('<svg viewbox="0 0 40 40" width="100%" height="100%"><path d="m5,8l5,8l5,-8z" class="l1 d1" /><path d="m5,8l5,-8l5,8z" class="l1 d2" /><path d="m10,0l5,8l5,-8z" class="l1 d3" /><path d="m15,8l5,-8l5,8z" class="l1 d4" /><path d="m20,0l5,8l5,-8z" class="l1 d5" /><path d="m25,8l5,-8l5,8z" class="l1 d6" /><path d="m25,8l5,8l5,-8z" class="l1 d7" /><path d="m30,16l5,-8l5,8z" class="l1 d8" /><path d="m30,16l5,8l5,-8z" class="l1 d9" /><path d="m25,24l5,-8l5,8z" class="l1 d10" /><path d="m25,24l5,8l5,-8z" class="l1 d11" /><path d="m20,32l5,-8l5,8z" class="l1 d13" /><path d="m15,24l5,8l5,-8z" class="l1 d14" /><path d="m10,32l5,-8l5,8z" class="l1 d15" /><path d="m5,24l5,8l5,-8z" class="l1 d16" /><path d="m5,24l5,-8l5,8z" class="l1 d17" /><path d="m0,16l5,8l5,-8z" class="l1 d18" /><path d="m0,16l5,-8l5,8z" class="l1 d20" /><path d="m10,16l5,-8l5,8z" class="l2 d0" /><path d="m15,8l5,8l5,-8z" class="l2 d3" /><path d="m20,16l5,-8l5,8z" class="l2 d6" /><path d="m20,16l5,8l5,-8z" class="l2 d9" /><path d="m15,24l5,-8l5,8z" class="l2 d12" /><path d="m10,16l5,8l5,-8z" class="l2 d15" /></svg>');
+    }
+ };
+});
--- a/app/js/directives/directive-power-bands.js
+++ b/app/js/directives/directive-power-bands.js
@@ -1,4 +1,4 @@
-angular.module('app').directive('powerBands', ['$window', function($window) {
+angular.module('app').directive('powerBands', ['$window', '$translate', '$rootScope', function($window, $translate, $rootScope) {
  return {
    restrict: 'A',
    scope: {
@@ -6,60 +6,88 @@ angular.module('app').directive('powerBands', ['$window', function($window) {
      available: '='
    },
    link: function(scope, element) {
-      var margin = { top: 20, right: 130, bottom: 20, left: 40 },
-          barHeight = 20,
-          bands = null,
-          innerHeight = (barHeight * 2) + 3,
-          height = innerHeight + margin.top + margin.bottom + 1,
+      var bands = null,
+          available = 0,
+          maxBand,
+          maxPwr,
+          deployedSum = 0,
+          retractedSum = 0,
+          retBandsSelected = false,
+          depBandsSelected = false,
          wattScale = d3.scale.linear(),
          pctScale = d3.scale.linear().domain([0, 1]),
-          wattFmt = d3.format('.2f'),
-          pctFmt = d3.format('.1%'),
-          wattAxis = d3.svg.axis().scale(wattScale).outerTickSize(0).orient('top').tickFormat(d3.format('.2r')),
-          pctAxis = d3.svg.axis().scale(pctScale).outerTickSize(0).orient('bottom').tickFormat(d3.format('%')),
+          wattFmt,
+          pctFmt,
+          wattAxis = d3.svg.axis().scale(wattScale).outerTickSize(0).orient('top'),
+          pctAxis = d3.svg.axis().scale(pctScale).outerTickSize(0).orient('bottom'),
          // Create chart
          svg = d3.select(element[0]).append('svg'),
-          vis = svg.append('g').attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'),
+          vis = svg.append('g'),
          deployed = vis.append('g').attr('class', 'power-band'),
          retracted = vis.append('g').attr('class', 'power-band');

      svg.on('contextmenu', function() {
+        if (!d3.event.shiftKey) {
          d3.event.preventDefault();
          for (var i = 0, l = bands.length; i < l; i++) {
            bands[i].retSelected = false;
            bands[i].depSelected = false;
          }
-          render();
-        });
+          dataChange();
+        }
+      });

      // Create Y Axis SVG Elements
      vis.append('g').attr('class', 'watt axis');
      vis.append('g').attr('class', 'pct axis');
-      vis.append('text').attr('x', -35).attr('y', 16).attr('class', 'primary').text('RET');
-      vis.append('text').attr('x', -35).attr('y', barHeight + 18).attr('class', 'primary').text('DEP');
+      var retText = vis.append('text').attr('x', -3).style('text-anchor', 'end').attr('dy', '0.5em').attr('class', 'primary upp');
+      var depText = vis.append('text').attr('x', -3).style('text-anchor', 'end').attr('dy', '0.5em').attr('class', 'primary upp');
+      var retLbl = vis.append('text').attr('dy', '0.5em');
+      var depLbl = vis.append('text').attr('dy', '0.5em');

-      var retLbl = vis.append('text').attr('y', 16);
-      var depLbl = vis.append('text').attr('y', barHeight + 18);
+      updateFormats(true);

-      // Watch for changes to data and events
-      scope.$watchCollection('available', render);
-      angular.element($window).bind('orientationchange resize pwrchange', render);
+      function dataChange() {
+        bands = scope.bands;
+        available = scope.available;
+        maxBand = bands[bands.length - 1];
+        deployedSum = 0;
+        retractedSum = 0;
+        retBandsSelected = false;
+        depBandsSelected = false;
+        maxPwr = Math.max(available, maxBand.retractedSum, maxBand.deployedSum);
+
+        for (var b = 0, l = bands.length; b < l; b++) {
+          if (bands[b].retSelected) {
+            retractedSum += bands[b].retracted + bands[b].retOnly;
+            retBandsSelected = true;
+          }
+          if (bands[b].depSelected) {
+            deployedSum += bands[b].deployed + bands[b].retracted;
+            depBandsSelected = true;
+          }
+        }
+
+        render();
+      }

      function render() {
-        bands = scope.bands;
-
-        var available = scope.available,
+        var size = $rootScope.sizeRatio,
+            mTop = Math.round(25 * size),
+            mRight = Math.round(130 * size),
+            mBottom = Math.round(25 * size),
+            mLeft = Math.round(45 * size),
+            barHeight = Math.round(20 * size),
            width = element[0].offsetWidth,
-            w = width - margin.left - margin.right,
-            maxBand = bands[bands.length - 1],
-            deployedSum = 0,
-            retractedSum = 0,
-            retBandsSelected = false,
-            depBandsSelected = false,
-            maxPwr = Math.max(available, maxBand.retractedSum, maxBand.deployedSum);
+            innerHeight = (barHeight * 2) + 2,
+            height = innerHeight + mTop + mBottom,
+            w = width - mLeft - mRight,
+            repY = (barHeight / 2),
+            depY = (barHeight * 1.5) - 1;

        // Update chart size
        svg.attr('width', width).attr('height', height);
+        vis.attr('transform', 'translate(' + mLeft + ',' + mTop + ')');

        // Remove existing elements
        retracted.selectAll('rect').remove();
@@ -73,75 +101,68 @@ angular.module('app').directive('powerBands', ['$window', function($window) {
        vis.selectAll('.watt.axis').call(wattAxis);
        vis.selectAll('.pct.axis').attr('transform', 'translate(0,' + innerHeight + ')').call(pctAxis);

-        for (var b = 0, l = bands.length; b < l; b++) {
-          if (bands[b].retSelected) {
-            retractedSum += bands[b].retracted + bands[b].retOnly;
-            retBandsSelected = true;
-          }
-          if (bands[b].depSelected) {
-            deployedSum += bands[b].deployed + bands[b].retracted;
-            depBandsSelected = true;
-          }
-        }
-
-        updateLabel(retLbl, w, retBandsSelected, retBandsSelected ? retractedSum : maxBand.retractedSum, available);
-        updateLabel(depLbl, w, depBandsSelected, depBandsSelected ? deployedSum : maxBand.deployedSum, available);
+        retText.attr('y', repY);
+        depText.attr('y', depY);
+        updateLabel(retLbl, w, repY, retBandsSelected, retBandsSelected ? retractedSum : maxBand.retractedSum, available);
+        updateLabel(depLbl, w, depY, depBandsSelected, depBandsSelected ? deployedSum : maxBand.deployedSum, available);

        retracted.selectAll('rect').data(bands).enter().append('rect')
          .attr('height', barHeight)
-          .attr('width', function(d) { return Math.max(wattScale(d.retracted + d.retOnly) - 1, 0); })
-          .attr('x', function(d) { return wattScale(d.retractedSum) - wattScale(d.retracted + d.retOnly); })
+          .attr('width', function(d) { return Math.ceil(Math.max(wattScale(d.retracted + d.retOnly), 0)); })
+          .attr('x', function(d) { return Math.floor(Math.max(wattScale(d.retractedSum) - wattScale(d.retracted + d.retOnly), 0)); })
          .attr('y', 1)
          .on('click', function(d) {
            d.retSelected = !d.retSelected;
-            render();
+            dataChange();
          })
          .attr('class', function(d) { return getClass(d.retSelected, d.retractedSum, available); });

        retracted.selectAll('text').data(bands).enter().append('text')
          .attr('x', function(d) { return wattScale(d.retractedSum) - (wattScale(d.retracted + d.retOnly) / 2); })
-          .attr('y', 15)
+          .attr('y', repY)
+          .attr('dy', '0.5em')
          .style('text-anchor', 'middle')
          .attr('class', 'primary-bg')
          .on('click', function(d) {
            d.retSelected = !d.retSelected;
-            render();
+            dataChange();
          })
          .text(function(d, i) { return bandText(d.retracted + d.retOnly, i); });

        deployed.selectAll('rect').data(bands).enter().append('rect')
          .attr('height', barHeight)
-          .attr('width', function(d) { return Math.max(wattScale(d.deployed + d.retracted) - 1, 0); })
-          .attr('x', function(d) { return wattScale(d.deployedSum) - wattScale(d.retracted) - wattScale(d.deployed); })
-          .attr('y', barHeight + 2)
+          .attr('width', function(d) { return Math.ceil(Math.max(wattScale(d.deployed + d.retracted), 0)); })
+          .attr('x', function(d) { return Math.floor(Math.max(wattScale(d.deployedSum) - wattScale(d.retracted) - wattScale(d.deployed), 0)); })
+          .attr('y', barHeight + 1)
          .on('click', function(d) {
            d.depSelected = !d.depSelected;
-            render();
+            dataChange();
          })
          .attr('class', function(d) { return getClass(d.depSelected, d.deployedSum, available); });

        deployed.selectAll('text').data(bands).enter().append('text')
          .attr('x', function(d) { return wattScale(d.deployedSum) - ((wattScale(d.retracted) + wattScale(d.deployed)) / 2); })
-          .attr('y', barHeight + 17)
+          .attr('y', depY)
+          .attr('dy', '0.5em')
          .style('text-anchor', 'middle')
          .attr('class', 'primary-bg')
          .on('click', function(d) {
            d.depSelected = !d.depSelected;
-            render();
+            dataChange();
          })
          .text(function(d, i) { return bandText(d.deployed + d.retracted, i); });
-
      }

-      function updateLabel(lbl, width, selected, sum, available) {
+      function updateLabel(lbl, width, y, selected, sum, avail) {
        lbl
          .attr('x', width + 5 )
-          .attr('class', getClass(selected, sum, available))
-          .text(wattFmt(Math.max(0, sum)) + ' (' + pctFmt(Math.max(0, sum / available)) + ')');
+          .attr('y', y)
+          .attr('class', getClass(selected, sum, avail))
+          .text(wattFmt(Math.max(0, sum)) + ' (' + pctFmt(Math.max(0, sum / avail)) + ')');
      }

-      function getClass(selected, sum, available) {
-        return selected ? 'secondary' : (sum > available) ? 'warning' : 'primary';
+      function getClass(selected, sum, avail) {
+        return selected ? 'secondary' : (sum >= avail) ? 'warning' : 'primary';
      }

      function bandText(val, index) {
@@ -151,6 +172,23 @@ angular.module('app').directive('powerBands', ['$window', function($window) {
        return '';
      }

+      function updateFormats(preventRender) {
+        retText.text($translate.instant('ret'));
+        depText.text($translate.instant('dep'));
+        wattFmt = $rootScope.localeFormat.numberFormat('.2f');
+        pctFmt = $rootScope.localeFormat.numberFormat('.1%');
+        wattAxis.tickFormat($rootScope.localeFormat.numberFormat('.2r'));
+        pctAxis.tickFormat($rootScope.localeFormat.numberFormat('%'));
+        if (!preventRender) {
+          render();
+        }
+      }
+
+      // Watch for changes to data and events
+      angular.element($window).bind('pwrchange', dataChange);
+      angular.element($window).bind('orientationchange resize', render);
+      scope.$watchCollection('available', dataChange);
+      scope.$on('languageChanged', updateFormats);
      scope.$on('$destroy', function() {
        angular.element($window).unbind('orientationchange resize pwrchange', render);
      });
--- a/app/js/directives/directive-slider.js
+++ b/app/js/directives/directive-slider.js
@@ -3,73 +3,83 @@ angular.module('app').directive('slider', ['$window', function($window) {
  return {
    restrict: 'A',
    scope: {
+      min: '=',
+      def: '=',
      max: '=',
      unit: '=',
-      change: '&onChange'
+      change: '&onChange',
+      ignoreResize: '='
    },
    link: function(scope, element) {
-      var margin = { top: -10, right: 145, bottom: 0, left: 50 },
-          height = 40,    // Height is fixed
-          h = height - margin.top - margin.bottom,
+      var unit = scope.unit,
+          margin = unit ? { top: -10, right: 145, left: 50 } : { top: 0, right: 10, left: 10 },
+          height = unit ? 40 : 20,    // Height is fixed
+          h = height - margin.top,
          fmt = d3.format('.2f'),
          pct = d3.format('.1%'),
-          unit = scope.unit,
-          val = scope.max,
+          def = scope.def !== undefined ? scope.def : scope.max,
+          val = def,
          svg = d3.select(element[0]).append('svg'),
          vis = svg.append('g').attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'),
-          xAxis = vis.append('g').attr('class', 'x slider-axis').attr('transform', 'translate(0,' + h / 2 + ')'),
+          xAxisContainer = vis.append('g').attr('class', 'x slider-axis').attr('transform', 'translate(0,' + h / 2 + ')'),
          x = d3.scale.linear(),
+          xAxis = d3.svg.axis().scale(x).orient('bottom').tickFormat(function(d) { return d + unit; }).tickSize(0).tickPadding(12),
          slider = vis.append('g').attr('class', 'slider'),
          filled = slider.append('path').attr('class', 'filled').attr('transform', 'translate(0,' + h / 2 + ')'),
          brush = d3.svg.brush().x(x).extent([scope.max, scope.max]).on('brush', brushed),
          handle = slider.append('circle').attr('class', 'handle').attr('r', '0.6em'),
-          lbl = slider.append('g').append('text').attr('y', h / 2);
+          lbl = unit ? slider.append('g').append('text').attr('y', h / 2) : null;

      slider.call(brush);
      slider.select('.background').attr('height', h);
      handle.attr('transform', 'translate(0,' + h / 2 + ')');

+      function render() {
+        var width = element[0].offsetWidth, w = width - margin.left - margin.right;
+        svg.attr('width', width).attr('height', height);
+        x.domain([scope.min || 0, scope.max]).range([0, w]).clamp(true);
+        handle.attr('cx', x(val));
+        if (unit) {
+          xAxisContainer.call(xAxis.tickValues([0, scope.max / 4, scope.max / 2, (3 * scope.max) / 4, scope.max]));
+          lbl.attr('x', w + 20);
+        }
+        slider.call(brush.extent([val, val]));
+        drawBrush();
+        slider.selectAll('.extent,.resize').remove();
+      }
+
+      function brushed() {
+        val = x.invert(d3.mouse(this)[0]);
+        brush.extent([val, val]);
+        scope.change({ val: val });
+        drawBrush();
+      }
+
+      function drawBrush() {
+        if (unit) {
+          lbl.text(fmt(val) + ' ' + unit + ' ' + pct(val / scope.max));
+        }
+        handle.attr('cx', x(val));
+        filled.attr('d', 'M0,0V0H' + x(val) + 'V0');
+      }
+
      /**
       * Watch for changes in the max, window size
       */
      scope.$watch('max', function(newMax, oldMax) {
        val = newMax * (val / oldMax); // Retain percentage filled
+        scope.change({ val: val });
        render();
      });

-      angular.element($window).bind('orientationchange resize', render);
-
-      function render() {
-        var width = element[0].offsetWidth, w = width - margin.left - margin.right;
-
-        svg.attr('width', width).attr('height', height);
-        x.domain([0, scope.max]).range([0, w]).clamp(true);
-        handle.attr('cx', x(val));
-        xAxis
-          .call(d3.svg.axis()
-            .scale(x)
-            .orient('bottom')
-            .tickFormat(function(d) { return d + unit; })
-            .tickValues([0, scope.max / 4, scope.max / 2, (3 * scope.max) / 4, scope.max])
-            .tickSize(0)
-            .tickPadding(12))
-          .select('.domain');
-        lbl.attr('x', w + 20);
-        slider.call(brush.extent([val, val])).call(brush.event);
-        slider.selectAll('.extent,.resize').remove();
+      if (!scope.ignoreResize) {
+        angular.element($window).bind('orientationchange resize', render);
      }

-      function brushed() {
-        val = brush.extent()[0];
-        if (d3.event.sourceEvent) { // not a programmatic event
-          val = x.invert(d3.mouse(this)[0]);
-          brush.extent([val, val]);
-        }
-        lbl.text(fmt(val) + ' ' + unit + ' ' + pct(val / scope.max));
-        scope.change({ val: val });
-        handle.attr('cx', x(val));
-        filled.attr('d', 'M0,0V0H' + x(val) + 'V0');
-      }
+      scope.$on('reset', function(e, resetVal) {
+        val = resetVal;
+        drawBrush();
+      });

      scope.$on('$destroy', function() {
        angular.element($window).unbind('orientationchange resize render', render);
--- a/app/js/directives/directive-slot-hardpoint.js
+++ b/app/js/directives/directive-slot-hardpoint.js
@@ -3,8 +3,7 @@ angular.module('app').directive('slotHardpoint', ['$rootScope', function($r) {
    restrict: 'A',
    scope: {
      hp: '=',
-      size: '=',
-      lbl: '='
+      size: '='
    },
    templateUrl: 'views/_slot-hardpoint.html',
    link: function(scope) {
--- a/app/js/directives/directive-slot-internal.js
+++ b/app/js/directives/directive-slot-internal.js
@@ -3,7 +3,6 @@ angular.module('app').directive('slotInternal', ['$rootScope', function($r) {
    restrict: 'A',
    scope: {
      c: '=slot',
-      lbl: '=',
      fuel: '='
    },
    templateUrl: 'views/_slot-internal.html',
--- a/app/js/factory-utils.js
+++ b/app/js/factory-utils.js
@@ -1,7 +1,7 @@
 /**
 * BBCode Generator functions for embedding in the Elite Dangerous Forums
 */
-angular.module('app').factory('Utils', ['$window', '$state', '$http', '$q', function($window, $state, $http, $q) {
+angular.module('app').factory('Utils', ['$window', '$state', '$http', '$q', '$translate', '$rootScope', function($window, $state, $http, $q, $translate, $rootScope) {

  var shortenAPI = 'https://www.googleapis.com/urlshortener/v1/url?key=';

@@ -24,11 +24,11 @@ angular.module('app').factory('Utils', ['$window', '$state', '$http', '$q', func
        p = f.props;

        if (p.length == 1) {
-          l.push('[th][B][COLOR=#FF8C0D]', f.title, '[/COLOR][/B][/th]');
+          l.push('[th][B][COLOR=#FF8C0D]', $translate.instant(f.title).toUpperCase(), '[/COLOR][/B][/th]');
          colCount++;
        } else {
          for (j = 0; j < p.length; j++) {
-            l.push('[th][B][COLOR=#FF8C0D]', f.title, '\n', f.lbls[j], '[/COLOR][/B][/th]');
+            l.push('[th][B][COLOR=#FF8C0D]', $translate.instant(f.title).toUpperCase(), '\n', $translate.instant(f.lbls[j]).toUpperCase(), '[/COLOR][/B][/th]');
            colCount++;
          }
        }
@@ -46,7 +46,7 @@ angular.module('app').factory('Utils', ['$window', '$state', '$http', '$q', func
          f = facets[j];
          p = f.props;
          for (k = 0, pl = p.length; k < pl; k++) {
-            l.push('[td="align: right"]', f.fmt(b[p[k]]), ' [size=-2]', f.unit, '[/size][/td]');
+            l.push('[td="align: right"]', $rootScope[f.fmt](b[p[k]]), ' [size=-2]', $translate.instant(f.unit), '[/size][/td]');
          }
        }
      }
--- a/app/js/i18n/de.js
+++ b/app/js/i18n/de.js
@@ -0,0 +1,219 @@
+angular.module('app').config(['$translateProvider', 'localeFormatProvider', function($translateProvider, localeFormatProvider) {
+  // Declare number format settings
+  localeFormatProvider.addFormat('de', {
+    decimal: ',',
+    thousands: '.',
+    grouping: [3],
+    currency: ['', ' €'],
+    dateTime: '%A, der %e. %B %Y, %X',
+    date: '%d.%m.%Y',
+    time: '%H:%M:%S',
+    periods: ['AM', 'PM'], // unused
+    days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+    shortDays: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+    months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+    shortMonths: ['Jan', 'Feb', 'Mrz', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez']
+  });
+  $translateProvider.translations('de', {
+    PHRASE_EXPORT_DESC: 'Ein detaillierter JSON-Export Ihrer Konfiguration für die Verwendung in anderen Websites und Tools',
+    'A-Rated': 'A-Klasse',
+    about: 'Über',
+    action: 'Aktion',
+    added: 'Hinzugefügt',
+    Advanced: 'Verbessert',
+    'Advanced Discovery Scanner': 'Fortgeschrittener Aufklärungsscanner',
+    agility: 'Manövrierbarkeit',
+    ammo: 'Munition',
+    PHRASE_CONFIRMATION: 'Sind Sie sicher?',
+    armour: 'Panzerung',
+    am: 'Automatische Feldwartungs-Einheit',
+    available: 'Verfügbar',
+    backup: 'Sicherungsdatei',
+    'Basic Discovery Scanner': 'Einfacher Aufklärungsscanner',
+    bl: 'Strahlenlaser',
+    beta: 'Beta',
+    bins: 'Behälter',
+    boost: 'Boost',
+    build: 'Ausstattung',
+    'build name': 'Ausstattungsname',
+    builds: 'Ausstattungen',
+    bh: 'Rumpfhüllenverstärkung',
+    ul: 'Salvenlaser',
+    buy: 'Kaufen',
+    cancel: 'Abbrechen',
+    c: 'Kanone',
+    capital: 'Kapital',
+    cargo: 'Fracht',
+    'Cargo Hatch': 'Frachtluke',
+    cr: 'Frachtgestell',
+    cs: 'Frachtscanner',
+    cells: 'Zellen',
+    'Chaff Launcher': 'Düppel-Werfer',
+    close: 'Schließen',
+    cc: 'Krallensteuerung: Sammler',
+    compare: 'Vergleichen',
+    'compare all': 'Alles Vergleichen',
+    comparison: 'Vergleich',
+    comparisons: 'Vergleiche',
+    component: 'Komponente',
+    cost: 'Preis',
+    costs: 'Kosten',
+    cm: 'Gegenmaßnahme',
+    create: 'Erstellen',
+    'create new': 'Neu Erstellen',
+    Cytoscrambler: 'Zytostreuer',
+    damage: 'Schaden',
+    delete: 'Löschen',
+    'delete all': 'Alles Löschen',
+    dep: 'Ausg',
+    deployed: 'Ausgefahren',
+    'detailed export': 'Detailierter Export',
+    'Detailed Surface Scanner': 'Detailoberflächenscanner',
+    disabled: 'Deaktiviert',
+    discount: 'Rabatt',
+    Distruptor: 'Disruptor',
+    dc: 'Standard-Landecomputer',
+    done: 'Fertig',
+    'edit data': 'Bearbeiten',
+    efficiency: 'Effizienz',
+    'Electronic Countermeasure': 'Elektronische Gegenmaßnahme',
+    empty: 'leer',
+    Enforcer: 'Vollstrecker',
+    ENG: 'ANT',
+    'enter name': 'Namen eingeben',
+    export: 'Export',
+    fixed: 'Fixiert',
+    forum: 'Forum',
+    fc: 'Splitterkanone',
+    fd: 'Frameshiftantrieb',
+    ws: 'Frameshift-Sogwolkenscanner',
+    FSD: 'FSA',
+    fi: 'FSA-Unterbrecher',
+    fuel: 'Treibstoff',
+    fs: 'Treibstoffsammler',
+    ft: 'Treibstofftank',
+    fx: 'Krallensteuerung Treibstoffstransfer',
+    'full tank': 'Tank voll',
+    Gimballed: 'Kardanisch',
+    H: 'R',
+    hardpoints: 'Waffenaufhängungen',
+    hb: 'Krallen-Steuereinheit (Ladelukenöffner)',
+    'Heat Sink Launcher': 'Kühlkörperwerfer',
+    huge: 'Riesig',
+    hull: 'Hülle',
+    hr: 'Rumpfhüllenverstärkung (Paket)',
+    'Imperial Hammer': 'Imperialer Hammer',
+    import: 'Importieren',
+    'import all': 'Alles Importieren',
+    insurance: 'Versicherung',
+    'Intermediate Discovery Scanner': 'Mittlerer Aufklärungsscanner',
+    'internal compartments': 'Innenbereichskabine',
+    'jump range': 'Sprungreichweite',
+    jumps: 'Sprünge',
+    kw: 'Tötungsbefehl-Scanner',
+    L: 'G',
+    laden: 'Beladen',
+    language: 'Sprache',
+    large: 'Groß',
+    ls: 'Lebenserhaltung',
+    'Lightweight Alloy': 'Leichte Legierung',
+    'lock factor': 'Massensperrefaktor',
+    LS: 'Ls',
+    LY: 'Lj',
+    mass: 'Masse',
+    'max mass': 'maximale Masse',
+    medium: 'Mittel',
+    'Military Grade Composite': 'Militär-Komposit',
+    nl: 'Minenwerfer',
+    'Mining Lance': 'Lanzenabbaulaser',
+    ml: 'Abbaulaser',
+    'Mirrored Surface Composite': 'Gespiegelte-Oberfläche-Komposit',
+    mr: 'Raketenbatterie',
+    mc: 'Mehrfachgeschütz',
+    'net cost': 'Nettokosten',
+    no: 'Nein',
+    PHRASE_NO_BUILDS: 'Keine Konfigurationen zum Vergleich ausgewählt!',
+    PHRASE_NO_RETROCH: 'Keine Umrüständerungen',
+    none: 'Nichts',
+    'none created': 'Leer',
+    off: 'Aus',
+    on: 'An',
+    'optimal mass': 'optimale Masse',
+    'optimize mass': 'Masse optimieren',
+    overwrite: 'Überschreiben',
+    Pacifier: 'Friedensstifter',
+    'Pack-Hound': 'Schwarmwerfer',
+    PHRASE_IMPORT: 'JSON hier einfügen oder importieren',
+    pen: 'Durchdr.',
+    penetration: 'Durchdringung',
+    permalink: 'Permalink',
+    pa: 'Plasmabeschleuniger',
+    'Point Defence': 'Punktverteidigung',
+    power: 'Energie',
+    pd: 'Energieverteiler',
+    pp: 'Kraftwerk',
+    pri: 'Prio',
+    priority: 'Priorität',
+    psg: 'Prismaschildgenerator',
+    proceed: 'Fortfahren',
+    pc: 'Krallensteuerung: Erzsucher',
+    pl: 'Impulslaser',
+    PWR: 'En',
+    rg: 'Schienenkanone',
+    range: 'Reichweite',
+    rate: 'Rate',
+    'Reactive Surface Composite': 'Reaktive-Oberfläche-Komposit',
+    recharge: 'Aufladen',
+    rf: 'Raffinerie',
+    'refuel time': 'Auftankzeit',
+    'Reinforced Alloy': 'Verstärkte Legierung',
+    reload: 'Aktualisieren',
+    rename: 'Umbenennen',
+    repair: 'Reparieren',
+    reset: 'Zurücksetzen',
+    ret: 'Eing',
+    retracted: 'Eingefahren',
+    'retrofit costs': 'Änderungskosten',
+    'retrofit from': 'Nachrüsten von',
+    ROF: 'Kad',
+    S: 'K',
+    save: 'Speichern',
+    sc: 'Scanner',
+    PHRASE_SELECT_BUILDS: 'Ausstattung zum Vergleich auswählen',
+    sell: 'Verkaufen',
+    s: 'Sensoren',
+    settings: 'Einstellungen',
+    sb: 'Schild-Booster',
+    scb: 'Schildzellenbank',
+    sg: 'Schildgenerator',
+    shields: 'Schilde',
+    ship: 'Schiff',
+    ships: 'Schiffe',
+    shortened: 'Gekürzt',
+    size: 'Größe',
+    skip: 'Überspringen',
+    small: 'Klein',
+    speed: 'Geschwindigkeit',
+    standard: 'Standard',
+    'Standard Docking Computer': 'Standard-Landecomputer',
+    Stock: 'Standard',
+    T: 't',
+    T_LOAD: 'T-Lad',
+    'The Retributor': 'Retributor',
+    t: 'Schubdüsen',
+    time: 'Dauer',
+    tp: 'Torpedoaufhängung',
+    total: 'Gesamt',
+    'total range': 'Maximale Reichweite',
+    turret: 'Geschützturm',
+    type: 'Typ',
+    U: 'W',
+    unladen: 'Unbeladen',
+    PHRASE_UPDATE_RDY: 'Update verfügbar! Klicken zum Aktualisieren',
+    utility: 'Werkzeug',
+    'utility mounts': 'Werkzeug-Steckplätze',
+    WEP: 'WAF',
+    yes: 'Ja',
+    PHRASE_BACKUP_DESC: 'Export aller Coriolis-Daten, um sie zu sichern oder oder um sie zu einem anderen Browser/Gerät zu übertragen.'
+  });
+}]);
--- a/app/js/i18n/en.js
+++ b/app/js/i18n/en.js
@@ -0,0 +1,218 @@
+angular.module('app').config(['$translateProvider', function($translateProvider) {
+
+  $translateProvider
+    .translations('en', {
+      PHRASE_EXPORT_DESC: 'A detailed JSON export of your build for use in other sites and tools',
+      'A-Rated': 'A-Rated',
+      about: 'about',
+      action: 'action',
+      added: 'added',
+      Advanced: 'Advanced',
+      'Advanced Discovery Scanner': 'Advanced Discovery Scanner',
+      agility: 'agility',
+      alpha: 'alpha',
+      ammo: 'ammo',
+      PHRASE_CONFIRMATION: 'Are You Sure?',
+      armour: 'armour',
+      am: 'Auto Field-Maintenance Unit',
+      available: 'available',
+      backup: 'backup',
+      'Basic Discovery Scanner': 'Basic Discovery Scanner',
+      bl: 'Beam Laser',
+      beta: 'beta',
+      bins: 'bins',
+      boost: 'boost',
+      build: 'build',
+      'build name': 'Build Name',
+      builds: 'builds',
+      bh: 'bulkheads',
+      ul: 'Burst Laser',
+      buy: 'buy',
+      cancel: 'cancel',
+      c: 'Cannon',
+      capital: 'capital',
+      cargo: 'cargo',
+      'Cargo Hatch': 'Cargo Hatch',
+      cr: 'Cargo Rack',
+      cs: 'Cargo Scanner',
+      cells: 'cells',
+      'Chaff Launcher': 'Chaff Launcher',
+      close: 'close',
+      cc: 'Collector Limpet Controller',
+      compare: 'compare',
+      'compare all': 'compare all',
+      comparison: 'comparison',
+      comparisons: 'comparisons',
+      component: 'component',
+      cost: 'cost',
+      costs: 'costs',
+      cm: 'Countermeasure',
+      CR: 'CR',
+      create: 'create',
+      'create new': 'create new',
+      credits: 'credits',
+      Cytoscrambler: 'Cytoscrambler',
+      damage: 'damage',
+      delete: 'delete',
+      'delete all': 'delete all',
+      dep: 'dep',
+      deployed: 'deployed',
+      'detailed export': 'detailed export',
+      'Detailed Surface Scanner': 'Detailed Surface Scanner',
+      disabled: 'disabled',
+      discount: 'discount',
+      Distruptor: 'Distruptor',
+      dc: 'Docking Computer',
+      done: 'done',
+      DPS: 'DPS',
+      'edit data': 'edit data',
+      efficiency: 'efficiency',
+      'Electronic Countermeasure': 'Electronic Countermeasure',
+      empty: 'empty',
+      Enforcer: 'Enforcer',
+      ENG: 'ENG',
+      'enter name': 'Enter Name',
+      EPS: 'EPS',
+      export: 'export',
+      fixed: 'fixed',
+      forum: 'forum',
+      fc: 'Fragment Cannon',
+      fd: 'Frame Shift Drive',
+      ws: 'Frame Shift Wake Scanner',
+      FSD: 'FSD',
+      fi: 'FSD Interdictor',
+      fuel: 'fuel',
+      fs: 'Fuel Scoop',
+      ft: 'Fuel Tank',
+      fx: 'Fuel Transfer Limpet Controller',
+      'full tank': 'full tank',
+      Gimballed: 'Gimballed',
+      H: 'H',
+      hardpoints: 'hardpoints',
+      hb: 'Hatch Breaker Limpet Controller',
+      'Heat Sink Launcher': 'Heat Sink Launcher',
+      huge: 'huge',
+      hull: 'hull',
+      hr: 'Hull Reinforcement Package',
+      'Imperial Hammer': 'Imperial Hammer',
+      import: 'import',
+      'import all': 'import all',
+      insurance: 'insurance',
+      'Intermediate Discovery Scanner': 'Intermediate Discovery Scanner',
+      'internal compartments': 'internal compartments',
+      'jump range': 'jump range',
+      jumps: 'jumps',
+      kw: 'Kill Warrant Scanner',
+      L: 'L',
+      laden: 'laden',
+      language: 'language',
+      large: 'large',
+      ls: 'life support',
+      'Lightweight Alloy': 'Lightweight Alloy',
+      'lock factor': 'lock factor',
+      LS: 'Ls',
+      LY: 'LY',
+      M: 'M',
+      'm/s': 'm/s',
+      mass: 'mass',
+      max: 'max',
+      'max mass': 'max mass',
+      medium: 'medium',
+      'Military Grade Composite': 'Military Grade Composite',
+      nl: 'Mine Launcher',
+      'Mining Lance': 'Mining Lance',
+      ml: 'Mining Laser',
+      'Mirrored Surface Composite': 'Mirrored Surface Composite',
+      mr: 'Missile Rack',
+      mc: 'Multi-cannon',
+      'net cost': 'net cost',
+      no: 'no',
+      PHRASE_NO_BUILDS: 'No builds added to comparison!',
+      PHRASE_NO_RETROCH: 'No Retrofitting changes',
+      none: 'none',
+      'none created': 'none created',
+      off: 'off',
+      on: 'on',
+      optimal: 'optimal',
+      'optimal mass': 'optimal mass',
+      'optimize mass': 'optimize mass',
+      overwrite: 'overwrite',
+      Pacifier: 'Pacifier',
+      'Pack-Hound': 'Pack-Hound',
+      PHRASE_IMPORT: 'Paste JSON or import here',
+      pen: 'pen',
+      penetration: 'penetration',
+      permalink: 'permalink',
+      pa: 'Plasma Accelerator',
+      'Point Defence': 'Point Defence',
+      power: 'power',
+      pd: 'power distributor',
+      pp: 'power plant',
+      pri: 'pri',
+      priority: 'priority',
+      psg: 'Prismatic Shield Generator',
+      proceed: 'proceed',
+      pc: 'Prospector Limpet Controller',
+      pl: 'Pulse Laser',
+      PWR: 'PWR',
+      rg: 'Rail Gun',
+      range: 'range',
+      rate: 'rate',
+      'Reactive Surface Composite': 'Reactive Surface Composite',
+      recharge: 'recharge',
+      rf: 'Refinery',
+      'refuel time': 'refuel time',
+      'Reinforced Alloy': 'Reinforced Alloy',
+      reload: 'reload',
+      rename: 'rename',
+      repair: 'repair',
+      reset: 'reset',
+      ret: 'ret',
+      retracted: 'retracted',
+      'retrofit costs': 'retrofit costs',
+      'retrofit from': 'retrofit from',
+      ROF: 'ROF',
+      S: 'S',
+      save: 'save',
+      sc: 'scanner',
+      PHRASE_SELECT_BUILDS: 'Select Builds to Compare',
+      sell: 'sell',
+      s: 'sensors',
+      settings: 'settings',
+      sb: 'Shield Booster',
+      scb: 'Shield Cell Bank',
+      sg: 'Shield Generator',
+      shields: 'shields',
+      ship: 'ship',
+      ships: 'ships',
+      shortened: 'shortened',
+      size: 'size',
+      skip: 'skip',
+      small: 'small',
+      speed: 'speed',
+      standard: 'standard',
+      'Standard Docking Computer': 'Standard Docking Computer',
+      Stock: 'Stock',
+      SYS: 'SYS',
+      T: 'T',
+      T_LOAD: 't-load',
+      'The Retributor': 'The Retributor',
+      t: 'thrusters',
+      time: 'time',
+      tp: 'Torpedo Pylon',
+      total: 'total',
+      'total range': 'total range',
+      turret: 'turret',
+      type: 'type',
+      U: 'U',
+      unladen: 'unladen',
+      PHRASE_UPDATE_RDY: 'Update Available! Click to Refresh',
+      URL: 'URL',
+      utility: 'utility',
+      'utility mounts': 'utility mounts',
+      version: 'version',
+      WEP: 'WEP',
+      yes: 'yes',
+      PHRASE_BACKUP_DESC: 'Backup of all Coriolis data to save or transfer to another browser/device'
+    });
+}]);
--- a/app/js/i18n/es.js
+++ b/app/js/i18n/es.js
@@ -0,0 +1,263 @@
+angular.module('app').config(['$translateProvider', 'localeFormatProvider', function($translateProvider, localeFormatProvider) {
+
+  // Declare number format settings
+  localeFormatProvider.addFormat('es', {
+    decimal: ',',
+    thousands: '.',
+    grouping: [3],
+    currency: ['', ' €'],
+    dateTime: '%A, %e de %B de %Y, %X',
+    date: '%d/%m/%Y',
+    time: '%H:%M:%S',
+    periods: ['AM', 'PM'],
+    days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
+    shortDays: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
+    months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+    shortMonths: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic']
+  });
+
+  $translateProvider.translations('es', {
+    PHRASE_EXPORT_DESC: 'Ein detaillierter JSON-Export Ihrer Konfiguration für die Verwendung in anderen Websites und Tools',
+    A_RATED: 'A-Klasse',
+    ABOUT: 'Über',
+    ACTION: 'Aktion',
+    ADDED: 'Hinzugefügt',
+    ADDER: 'Adder',
+    ADVANCED: 'Fortgeschritten',
+    'Advanced Discovery Scanner': 'Fortgeschrittener Aufklärungsscanner',
+    'Advanced Plasma Laser': 'Fortgeschrittener Plasma-Laser',
+    AGILITY: 'Beweglichkeit',
+    ALPHA: 'Alpha',
+    AMMO: 'Munition',
+    ANACONDA: 'Anaconda',
+    PHRASE_CONFIRMATION: 'Sind Sie sicher?',
+    ARMOUR: 'Panzerung',
+    ASP_EXPLORER: 'Asp Explorer',
+    am: 'Automatische Feldwartungseinheit',
+    AVAILABLE: 'Verfügbar',
+    BACKUP: 'Sicherungsdatei',
+    'Basic Discovery Scanner': 'Einfacher Aufklärungsscanner',
+    bl: 'Strahlenlaser',
+    BELUGA_LINER: 'Beluga Liner',
+    BETA: 'beta',
+    BINS: 'Behälter',
+    BOOST: 'Boost',
+    BUILD: 'Konfiguration',
+    BUILD_NAME: 'Konfigurationsname',
+    BUILDS: 'Konfigurationen',
+    BULKHEADS: 'Rumpfhüllenverstärkung',
+    ul: 'Salvenlaser',
+    BUY: 'Kaufen',
+    CANCEL: 'Abbrechen',
+    c: 'Kanone',
+    CAPITAL: 'kapital',
+    CARGO: 'Fracht',
+    CARGO_HATCH: 'Frachtluke',
+    cr: 'Frachtgestell',
+    cs: 'Frachtscanner',
+    CELLS: 'Zellen',
+    CHAFF_LAUNCHER: 'Düppel-Werfer',
+    CLOSE: 'Schließen',
+    COBRA_MK_III: 'Cobra MK III',
+    COBRA_MK_IV: 'Cobra MK IV',
+    cc: 'Krallensteuerung: Sammler',
+    COMPARE: 'Vergleichen',
+    COMPARE_ALL: 'Alles Vergleichen',
+    COMPARISON: 'Vergleich',
+    COMPARISONS: 'Vergleiche',
+    COMPONENT: 'Komponente',
+    COST: 'Kostet',
+    COSTS: 'Kosten',
+    cm: 'Gegenmaßnahme',
+    CR: 'CR',
+    CREATE: 'Erstellen',
+    CREATE_NEW: 'Neu Erstellen',
+    CREDITS: 'Credits',
+    Cytoscrambler: 'Zytostreuer',
+    DAMAGE: 'Schaden',
+    DELETE: 'Löschen',
+    DELETE_ALL: 'Alles Löschen',
+    DEP: 'Ausg',
+    DEPLOYED: 'Ausgefahren',
+    DETAILED_EXPORT: 'Detailiertes Exportieren',
+    'Detailed Surface Scanner': 'Detailoberflächenscanner',
+    DIAMONDBACK_EXPLORER: 'Diamondback-Erkunder',
+    DIAMONDBACK_SCOUT: 'Diamondback-Aufklärer',
+    DISABLED: 'Deaktiviert',
+    DISCOUNT: 'Rabatt',
+    Distruptor: 'Disruptor',
+    dc: 'Standard-Landecomputer',
+    DOLPHIN: 'Dolphin',
+    DONE: 'Fertig',
+    DPS: 'DPS',
+    EAGLE: 'Eagle',
+    EDIT_DATA: 'Bearbeiten',
+    EFFICIENCY: 'Effizienz',
+    'Electronic Countermeasure': 'Elektronische Gegenmaßnahme',
+    EMPTY: 'leer',
+    ENFORCER: 'Vollstrecker',
+    ENG: 'FAH',
+    PHRASE_ENTER_BUILD_NAME: '',
+    EPS: 'en/s',
+    EXPORT: 'Exportieren',
+    FEDERAL_CORVETTE: 'Föderale Korvette',
+    FEDERAL_DROPSHIP: 'Föderales Abwurfschiff',
+    FEDERAL_DROPSHIP_MK_II: 'Föderales Abwurfschiff Mk II',
+    FEDERAL_GUNSHIP: 'Föderales Kanonenschiff',
+    FER_DE_LANCE: 'Fer-de-Lance',
+    FIXED: '',
+    FORUM: 'Forum',
+    fc: 'Splitterkanone',
+    fd: 'Frameshift-Antrieb',
+    ws: 'Sogwolkenscanner',
+    FSD: 'FSA',
+    fi: 'FSA-Unterbrecher',
+    FUEL: 'Treibstoff',
+    fs: 'Treibstoffsammler',
+    ft: 'Treibstofftank',
+    fx: 'Krallensteuerung Treibstoffstransfer',
+    FULL_TANK: 'Tank voll',
+    GIMBALLED: 'Kardianisch',
+    H: 'H',
+    HARDPOINTS: 'Waffenaufhängungen',
+    hb: 'Krallen-Steuereinheit (Ladelukenöffner)',
+    HAULER: 'Hauler',
+    'Heat Sink Launcher': 'Kühlkörperwerfer',
+    HUGE: 'Riesig',
+    HULL: 'Hülle',
+    hr: 'Rumpfhüllenverstärkung (Paket)',
+    IMPERIAL_CLIPPER: 'Imperialer Clipper',
+    IMPERIAL_COURIER: 'Imperialer Kurier',
+    IMPERIAL_CUTTER: 'Imperialer Cutter',
+    IMPERIAL_EAGLE: 'Imperialer Eagle',
+    IMPERIAL_HAMMER: 'Imperialer Hammer',
+    IMPORT: 'Importieren',
+    IMPORT_ALL: 'Alles Importieren',
+    INSURANCE: 'Versicherung',
+    'Intermediate Discover Scanner': 'Mittlerer Aufklärungsscanner',
+    INTERNAL_COMPARTMENTS: 'Innenbereichkabine',
+    JUMP_RANGE: 'Sprungreichweite',
+    JUMPS: 'Sprünge',
+    kw: 'Tötungsbefehlscanner',
+    KRAIT: 'Krait',
+    L: 'L',
+    LADEN: 'Beladen',
+    LANGUAGE: 'Sprache',
+    LARGE: 'Groß',
+    ls: 'Lebenserhaltung',
+    'Lightweight Alloy': 'Leichte Legierung',
+    LOCK_FACTOR: 'Massensperrefaktor',
+    LS: 'LS',
+    LY: 'LJ',
+    M: 'M',
+    'm/s': 'M/Sec.',
+    MASS: 'Masse',
+    MAX: 'max',
+    MAX_MASS: 'maximale Masse',
+    MEDIUM: 'Mittel',
+    'Military Grade Composite': 'Militär-Komposit',
+    nl: 'Minenwerfer',
+    'Mining Lance': 'Lanzenabbaulaser',
+    ml: 'Abbaulaser',
+    'Mirrored Surface Composite': 'Gespiegelte-Oberfläche-Komposit',
+    mr: 'Raketenbatterie',
+    mc: 'Mehrfachgeschütz',
+    NET_COST: 'Nettokosten',
+    NO: 'Nein',
+    NO_RETROFITTING_CHANGES: 'Keine Umrüständerungen',
+    NONE: 'Nichts',
+    NONE_CREATED: 'Nichts erstellt',
+    OFF: 'Aus',
+    ON: 'An',
+    OPTIMAL: 'optimal',
+    OPTIMAL_MASS: 'optimale Masse',
+    OPTIMIZE_MASS: 'Masse optimieren',
+    ORCA: 'Orca',
+    OVERWRITE: 'Überschreiben',
+    Pacifier: 'Friedensstifter',
+    'Pack-Hound': 'Schwarmwerfer',
+    PANTHER_CLIPPER: 'Panter Clipper',
+    PHRASE_IMPORT: 'JSON hier einfügen oder hier importieren',
+    PEN: 'Durchdr',
+    PENETRATION: 'Durchdringung',
+    PERMALINK: 'Permalink',
+    pa: 'Plasmabeschleuniger',
+    POINT_DEFENCE: 'Punktverteidigung',
+    POWER: 'Energie',
+    pd: 'Energieverteiler',
+    pp: 'Kraftwerk',
+    PRI: 'Prio',
+    PRIORITY: 'Priorität',
+    psg: 'Prismaschildgenerator',
+    PROCEED: 'Fortfahren',
+    pc: 'Krallensteuerung: Erzsucher',
+    pl: 'Impulslaser',
+    PWR: 'En',
+    PYTHON: 'Python',
+    rg: 'Schienenkanone',
+    RANGE: 'Reichweite',
+    RATE: 'Rate',
+    'Reactive Surface Composite': 'Reaktive-Oberfläche-Komposit',
+    RECHARGE: 'Aufladen',
+    rf: 'Raffinerie',
+    REFUEL_TIME: 'Auftankzeit',
+    'Reinforced Alloy': 'Verstärkte Legierungen',
+    RELOAD: 'Aktualisieren',
+    RENAME: 'Umbenennen',
+    REPAIR: 'Reparieren',
+    RESET: 'Zurücksetzen',
+    RET: 'eing',
+    RETRACTED: 'Eingefahren',
+    RETROFIT_COSTS: 'Nachrüstkosten',
+    RETROFIT_FROM: 'Nachrüsten von',
+    ROF: 'Kad',
+    S: 'S',
+    SAVE: 'Speichern',
+    sc: 'Scanner',
+    PHRASE_SELECT_BUILDS: 'Wähle Konfigurationen zum Vergleichen',
+    SELL: 'Verkaufen',
+    s: 'Sensoren',
+    SETTINGS: 'Konfiguration',
+    sb: 'Schildverstärker',
+    scb: 'Schildzellenbank',
+    sg: 'Schildgenerator',
+    SHIELDS: 'Schilde',
+    SHIP: 'Schiff',
+    SHIPS: 'Schiffe',
+    SHORTENED: 'Gekürzt',
+    SIDEWINDER: 'Sidewinder',
+    SIZE: 'Größe',
+    SKIP: 'Überspringen',
+    SMALL: 'S',
+    SPEED: 'Geschwindigkeit',
+    STANDARD: 'Standard',
+    STANDARD_DOCKING_COMPUTER: 'Landecomputer',
+    STOCK: 'Standard',
+    SYS: 'SYS',
+    T: 'T',
+    T_LOAD: 'T-Lad',
+    THE_HUNTER: 'The Hunter',
+    'The Retributor': 'Retributor',
+    t: 'Schubdüsen',
+    TIME: 'Dauer',
+    tp: 'Torpedoaufhängung',
+    TOTAL: 'Gesamt',
+    TOTAL_RANGE: 'Maximale Reichweite',
+    TURRET: 'Geschützturm',
+    TYPE: 'Typ',
+    TYPE_6_TRANSPORTER: 'Typ-6 Transporter',
+    TYPE_7_TRANSPORTER: 'Typ-7 Transporter',
+    TYPE_9_HEAVY: 'Typ-9 Transporter (schwer)',
+    U: 'U',
+    UNLADEN: 'Unbeladen',
+    UPDATE_NOTIFICATION: 'Update verfügbar! Klicken zum Aktualisieren',
+    URL: 'URL',
+    UTILITY: 'Werkzeug',
+    UTILITY_MOUNTS: 'Werkzeug-Steckplatz',
+    VERSION: 'Version',
+    VIPER: 'Viper',
+    VULTURE: 'Vulture',
+    WEP: 'WAF',
+    YES: 'Ja'
+  });
+}]);
--- a/app/js/i18n/fr.js
+++ b/app/js/i18n/fr.js
@@ -0,0 +1,200 @@
+angular.module('app').config(['$translateProvider', 'localeFormatProvider', function($translateProvider, localeFormatProvider) {
+  // Declare number format settings
+  localeFormatProvider.addFormat('fr', {
+    decimal: ',',
+    thousands: '.',
+    grouping: [3],
+    currency: ['', ' €'],
+    dateTime: '%A, le %e %B %Y, %X',
+    date: '%d/%m/%Y',
+    time: '%H:%M:%S',
+    periods: ['AM', 'PM'], // unused
+    days: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
+    shortDays: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
+    months: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
+    shortMonths: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.']
+  });
+  $translateProvider.translations('fr', {
+    PHRASE_EXPORT_DESC: 'Un export détaillé en JSON de votre configuration pour l\'utilisation dans d\'autres sites et outils',
+    'A-Rated': 'Classe-A ',
+    about: 'à propos',
+    added: 'ajouté',
+    Advanced: 'Avancé',
+    'Advanced Discovery Scanner': 'Scanner de découverte avancé',
+    agility: 'agilité',
+    ammo: 'munition',
+    PHRASE_CONFIRMATION: 'Êtes-vous sûr?',
+    armour: 'Armure',
+    am: 'Unité de réparation automatique',
+    available: 'Disponibilité',
+    backup: 'sauvegarde',
+    'Basic Discovery Scanner': 'Scanner de découverte de base',
+    bl: 'Laser rayon',
+    bins: 'bacs',
+    build: 'Configuration',
+    'build name': 'Nom de la configuration',
+    builds: 'Configurations',
+    bh: 'Coque',
+    ul: 'Laser salves',
+    buy: 'Acheter',
+    cancel: 'Annuler',
+    c: 'Canon',
+    cargo: 'Soute',
+    'Cargo Hatch': 'hublot de chargement',
+    cr: 'Compartiment de soute',
+    cs: 'Scanner de soute',
+    cells: 'Cellule',
+    'Chaff Launcher': 'Lanceur de paillettes',
+    close: 'fermer',
+    cc: 'Contrôleur de prospecteur',
+    compare: 'comparer',
+    'compare all': 'tout comparer',
+    comparison: 'comparaison',
+    comparisons: 'comparaisons',
+    component: 'composant',
+    cost: 'coût',
+    costs: 'coûts',
+    cm: 'Contre-mesure',
+    create: 'Créer',
+    'create new': 'Créer nouveau',
+    credits: 'crédits',
+    damage: 'Dégâts',
+    delete: 'supprimer',
+    'delete all': 'tout supprimer',
+    dep: 'depl',
+    deployed: 'déployé',
+    'detailed export': 'export détaillé',
+    'Detailed Surface Scanner': 'Scanner de surface détaillé',
+    disabled: 'désactivé',
+    discount: 'ristourne',
+    Distruptor: 'Disrupteur',
+    dc: 'Ordinateur d\'appontage',
+    done: 'Fait',
+    'edit data': 'Editer donnée',
+    efficiency: 'efficience',
+    'Electronic Countermeasure': 'Contre mesure électronique',
+    empty: 'Vide',
+    'enter name': 'Entrer nom',
+    fixed: 'fixé',
+    fc: 'Canon à fragmentation',
+    fd: 'Réacteur FSD',
+    ws: 'Détecteur de sillage FSD',
+    fi: 'Intercepteur de réacteur FSD',
+    fuel: 'carburant',
+    fs: 'Récupérateur de carburant',
+    ft: 'Réservoir de carburant',
+    fx: 'Drone de ravitaillement',
+    'full tank': 'Réservoir plein',
+    Gimballed: 'Point',
+    hardpoints: 'Points d\'emport',
+    hb: 'Contrôle de patelle perce-soute',
+    'Heat Sink Launcher': 'Ejecteur de dissipateur thermique',
+    huge: 'Très grand',
+    hull: 'Coque',
+    hr: 'Renfort de soute',
+    'Imperial Hammer': 'Marteau impérial',
+    import: 'Importer',
+    'import all': 'Importer tout',
+    insurance: 'Assurance',
+    'Intermediate Discovery Scanner': 'Scanner de découverte de portée intermédiaire',
+    'internal compartments': 'compartiments internes',
+    'jump range': 'Distance de saut',
+    jumps: 'Sauts',
+    kw: 'Détecteur d\'avis de recherche',
+    L: 'Langage',
+    laden: 'chargé',
+    language: 'Langage',
+    large: 'grand',
+    ls: 'Support vital',
+    'Lightweight Alloy': 'alliage léger',
+    'lock factor': 'facteur inhibition de masse',
+    LS: 'SL',
+    LY: 'AL',
+    mass: 'Masse',
+    'max mass': 'masse max',
+    'Military Grade Composite': 'Composite militaire',
+    nl: 'Lance-mines',
+    'Mining Lance': 'Lance de minage',
+    ml: 'Laser minier',
+    'Mirrored Surface Composite': 'Composite à surface mirroir',
+    mr: 'Lance missiles',
+    mc: 'Canon multiple',
+    'net cost': 'coûts nets',
+    no: 'non',
+    PHRASE_NO_BUILDS: 'Défaut de configuration pour comparaison',
+    PHRASE_NO_RETROCH: 'configuration non modifiée',
+    none: 'aucun',
+    'none created': 'Rien de créé',
+    off: 'éteint',
+    on: 'allumé',
+    'optimal mass': 'masse optimale',
+    'optimize mass': 'optimiser masse',
+    overwrite: 'écraser',
+    Pacifier: 'Pacificateur',
+    PHRASE_IMPORT: 'Coller JSON ou importer ici',
+    pen: 'pén.',
+    penetration: 'pénétration',
+    permalink: 'lien durable',
+    pa: 'accélérateur plasma',
+    'Point Defence': 'Défense ponctuelle',
+    power: 'énergie',
+    pd: 'distributeur d\'énérgie',
+    pp: 'centrale d\'énergie',
+    priority: 'priorité',
+    psg: 'générateur de bouclier prisme',
+    proceed: 'continuer',
+    pc: 'Drône de minage',
+    pl: 'Laser à impulsion',
+    PWR: 'Puissance',
+    rg: 'Canon électromagnétique',
+    range: 'portée',
+    rate: 'cadence',
+    'Reactive Surface Composite': 'Composite à surface réactive',
+    recharge: 'recharger',
+    rf: 'Raffinerie',
+    'refuel time': 'Temps de remplissage',
+    'Reinforced Alloy': 'alliage renforcé',
+    reload: 'recharger',
+    rename: 'renommer',
+    repair: 'réparer',
+    reset: 'Réinitialisation',
+    ret: 'esc',
+    retracted: 'escamoté',
+    'retrofit costs': 'Valeur de rachat',
+    'retrofit from': 'Racheter de',
+    ROF: 'cadence',
+    save: 'sauvegarder',
+    sc: 'scanner',
+    PHRASE_SELECT_BUILDS: 'Sélectionner configurations à comparer',
+    sell: 'vendre',
+    s: 'détecteurs',
+    settings: 'paramètres',
+    sb: 'Survolteur de bouclier',
+    scb: 'Réserve de cellules d\'énergie',
+    sg: 'Générateur de bouclier',
+    shields: 'boucliers',
+    ship: 'vaisseau',
+    ships: 'vaisseaux',
+    shortened: 'raccourci',
+    size: 'taille',
+    skip: 'Suivant',
+    small: 'petit',
+    speed: 'vitesse',
+    'Standard Docking Computer': 'ordinateur amarrage standard',
+    Stock: 'de base',
+    T_LOAD: 'degrés',
+    'The Retributor': 'Le Rétributeur',
+    t: 'propulseurs',
+    time: 'temps',
+    tp: 'Tube lance-torpille',
+    'total range': 'Distance maximale',
+    turret: 'tourelle',
+    unladen: 'Non chargé',
+    PHRASE_UPDATE_RDY: 'Mise à jour disponible ! Cliquez pour rafraichir',
+    utility: 'utilitaire',
+    'utility mounts': 'Support utilitaire',
+    WEP: 'ARM',
+    yes: 'oui',
+    PHRASE_BACKUP_DESC: 'Exportation détaillée des données Coriolis pour l\'utilisation dans d\'autres sites et outils'
+  });
+}]);
--- a/app/js/i18n/languages.js
+++ b/app/js/i18n/languages.js
@@ -0,0 +1,21 @@
+angular.module('app').config(['$translateProvider', function($translateProvider) {
+  $translateProvider
+    .useSanitizeValueStrategy('escapeParameters')
+    .useStorage('Persist')
+    .fallbackLanguage('en')   // Use English as default/fallback language
+    .registerAvailableLanguageKeys(['en', 'de', 'fr', 'ru'], {  // TODO: add 'es' to the array when ready
+      'en*': 'en',
+      'de*': 'de',
+      //'es*': 'es',
+      'fr*': 'fr',
+      'ru*': 'ru'
+    })
+    .determinePreferredLanguage();
+}])
+.value('Languages', {
+  en: 'English',
+  de: 'Deutsh',
+  //es: 'Español',
+  fr: 'Français',
+  ru: 'ру́сский язы́к'
+});
--- a/app/js/i18n/ru.js
+++ b/app/js/i18n/ru.js
@@ -0,0 +1,233 @@
+angular.module('app').config(['$translateProvider', 'localeFormatProvider', function($translateProvider, localeFormatProvider) {
+
+  // Declare number format settings
+  localeFormatProvider.addFormat('ru', {
+    decimal: ',',
+    thousands: '\xa0',
+    grouping: [3],
+    currency: ['', ' руб.'],
+    dateTime: '%A, %e %B %Y г. %X',
+    date: '%d.%m.%Y',
+    time: '%H:%M:%S',
+    periods: ['AM', 'PM'],
+    days: ['воскресенье', 'понедельник', 'вторник', 'среда', 'четверг', 'пятница', 'суббота'],
+    shortDays: ['вс', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб'],
+    months: ['января', 'февраля', 'марта', 'апреля', 'мая', 'июня', 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'],
+    shortMonths: ['янв', 'фев', 'мар', 'апр', 'май', 'июн', 'июл', 'авг', 'сен', 'окт', 'ноя', 'дек']
+  });
+
+  $translateProvider.translations('ru', {
+    PHRASE_EXPORT_DESC: 'Подробный экспорта JSON вашего телосложения для использования в других местах и инструментов',
+    'A-Rated': 'А-Класса',
+    about: 'О сайте',
+    action: 'Действие',
+    added: 'Добавлено',
+    Advanced: 'Продвинутый',
+    'Advanced Discovery Scanner': 'Продвинутый астросканер',
+    agility: 'Маневренность',
+    alpha: 'Альфа',
+    ammo: 'Боекомплект',
+    PHRASE_CONFIRMATION: 'Вы уверены?',
+    armour: 'Броня',
+    am: 'Ремонтный модуль',
+    available: 'доступно',
+    backup: 'бэкап',
+    'Basic Discovery Scanner': 'Стандартный исследовательский сканер',
+    bl: 'Лучевой лазер',
+    beta: 'Бета',
+    bins: 'контейнеры',
+    boost: 'форсаж',
+    build: 'cборка',
+    'build name': 'название сборки',
+    builds: 'cборки',
+    bh: 'Переборки',
+    ul: 'Мультиимпульсный лазер',
+    buy: 'купить',
+    cancel: 'отменить',
+    c: 'Крупнокалиберное орудие',
+    capital: 'Крупный',
+    cargo: 'Груз',
+    'Cargo Hatch': 'Грузовой люк',
+    cr: 'Грузовой отсек',
+    cs: 'Сканер груза',
+    cells: 'Ячейки',
+    'Chaff Launcher': 'Постановщик помех',
+    close: 'закрыть',
+    cc: 'Контроллер "дрон-сборщик"',
+    compare: 'сравнить ',
+    'compare all': 'сравнить все',
+    comparison: 'сравнение',
+    comparisons: 'сравнения',
+    component: 'Компонент',
+    cost: 'Стоимость',
+    costs: 'Расходы',
+    cm: 'Контрмеры',
+    CR: 'кр.',
+    create: 'создать',
+    'create new': 'Создать новый',
+    credits: 'Кредиты',
+    Cytoscrambler: 'сайтоскрамблер',
+    damage: 'Урон',
+    delete: 'Удалить',
+    'delete all': 'Удалить все',
+    dep: 'Вып',
+    deployed: 'Готово',
+    'detailed export': 'Подробный экспорт',
+    'Detailed Surface Scanner': 'Подробный сканер поверхности',
+    disabled: 'Отключено',
+    discount: 'Скидка',
+    Distruptor: 'Дисраптор',
+    dc: 'Стыковочный компьютер',
+    done: 'готово',
+    DPS: 'ПВС',
+    'edit data': 'Редактирование',
+    efficiency: 'Эффективность',
+    'Electronic Countermeasure': 'Электронное противодействие',
+    empty: 'пусто',
+    Enforcer: 'Энфорсер',
+    ENG: 'ДВГ',
+    'enter name': 'Введите имя',
+    EPS: 'э/с',
+    export: 'Экспорт',
+    fixed: 'Фиксированое',
+    forum: 'Форум',
+    fc: 'Осколочное Орудие',
+    fd: 'Двигатель FSD',
+    ws: 'FSD Сканнер',
+
+    fi: 'Перехватчик FSD',
+    fuel: 'Топливо',
+    fs: 'Топливозаборник',
+    ft: 'Топливный бак',
+    fx: 'Контроллер Дрона-заправщика',
+    'full tank': 'Полный бак',
+    Gimballed: 'Доводимое',
+    H: 'O',
+    hardpoints: 'Орудийные порты',
+    hb: 'Контроллер "дрон-взломщик"',
+    'Heat Sink Launcher': 'Теплоотводная ПУ',
+    huge: 'огромный',
+    hull: 'Корпус',
+    hr: 'Набор усиления корпуса',
+    'Imperial Hammer': 'Имперский Молот',
+    import: 'импортировать ',
+    'import all': 'импортировать все',
+    insurance: 'Страховка',
+    'Intermediate Discovery Scanner': 'Средний исследовательский сканер',
+    'internal compartments': 'внутренние отсеки',
+    'jump range': 'Дальность прыжка',
+    jumps: 'Прыжков',
+    kw: 'Полицейский сканер',
+    L: 'б',
+    laden: 'Груженый',
+    language: 'Язык',
+    large: 'большой',
+    ls: 'Система жизнеобеспечения',
+    'Lightweight Alloy': 'Легкий сплав',
+    'lock factor': 'Масс. блок',
+    LS: 'Св.сек',
+    LY: 'Св.лет',
+    M: 'С',
+    'm/s': 'м/с',
+    mass: 'Масса',
+    max: 'Макс',
+    'max mass': 'Максимальная масса',
+    medium: 'Средний',
+    'Military Grade Composite': 'Композит военного класса',
+    nl: 'Минный аппарат',
+    'Mining Lance': 'Бурильная сулица',
+    ml: 'Горный лазер',
+    'Mirrored Surface Composite': 'Композит с зеркальной поверхностью',
+    mr: 'Ракетная установка',
+    mc: 'Скорострельное орудие',
+    'net cost': 'разница в цене',
+    no: 'Нет',
+    PHRASE_NO_BUILDS: 'Нечего сравнивать',
+    PHRASE_NO_RETROCH: 'нет ранних версий сборки\конфигурации',
+    none: 'ни один',
+    'none created': 'не создано',
+    off: 'выкл',
+    on: 'вкл',
+    optimal: 'Оптимальный',
+    'optimal mass': 'Оптимальная масса',
+    'optimize mass': 'Оптимизировать массу',
+    overwrite: 'перезаписать',
+    Pacifier: 'Миротворец',
+    'Pack-Hound': 'Ракеты "Собачья стая" or original name(eng)',
+    PHRASE_IMPORT: 'Для импорта вставьте код в эту форму',
+    pen: 'ПБ',
+    penetration: 'Пробитие',
+    permalink: 'Постоянная ссылка',
+    pa: 'Ускоритель плазмы',
+    'Point Defence': 'Противоракетная защита',
+    power: 'Мощность',
+    pd: 'Распределитель энергии',
+    pp: 'Реактор',
+    pri: 'Осн',
+    priority: 'Приоритет',
+    psg: 'Генератор призматического щита',
+    proceed: 'продолжить',
+    pc: 'Контроллер "Дрон-исследователь"',
+    pl: 'Импульсный лазер',
+    PWR: 'Эн',
+    rg: 'Рельсовая пушка',
+    range: 'Дальность',
+    rate: 'скорость',
+    'Reactive Surface Composite': 'Композитно-реактивная поверхность',
+    recharge: 'Перезарядка',
+    rf: 'Переработка',
+    'refuel time': 'Время дозаправки',
+    'Reinforced Alloy': 'Усиленный сплав',
+    reload: 'Перезарядить',
+    rename: 'Переименовать',
+    repair: 'Починка',
+    reset: 'Сброс',
+    ret: 'Убр.',
+    retracted: 'Убрано',
+    'retrofit costs': 'цена модификации',
+    'retrofit from': 'модификация от',
+    ROF: 'В/сек',
+    S: 'М',
+    save: 'Сохранить',
+    sc: 'Сканер',
+    PHRASE_SELECT_BUILDS: 'Выберите конфигурацию для сравнения',
+    sell: 'Продать',
+    s: 'Сенсоры',
+    settings: 'Настройки',
+    sb: 'Усилитель щита',
+    scb: 'Батареи перезарядки щита',
+    sg: 'Генератор щита',
+    shields: 'Щиты',
+    ship: 'Корабль',
+    ships: 'Корабли',
+    shortened: 'Укороченный',
+    size: 'размер',
+    skip: 'пропустить',
+    small: 'Малый',
+    speed: 'скорость',
+    standard: 'Стандартный',
+    'Standard Docking Computer': 'Стандартный стыковочный компьютер',
+    Stock: 'Стандартная комплектация',
+    SYS: 'СИС',
+    T: 'Т',
+    T_LOAD: 'Тепл.',
+    'The Retributor': 'Орудие Возмездия',
+    t: 'Ускорители',
+    time: 'Время',
+    tp: 'Торпедный аппарат',
+    total: 'Всего',
+    'total range': 'Общий радиус',
+    turret: 'Туррель',
+    type: 'Тип',
+    U: 'В',
+    unladen: 'Пустой',
+    PHRASE_UPDATE_RDY: 'Доступно обновление. Нажмите для обновления.',
+    URL: 'Ссылка',
+    utility: 'Вспомогательное',
+    'utility mounts': 'Вспомогательное оборудование',
+    version: 'Версия',
+    WEP: 'ОРУ',
+    yes: 'Да',
+    PHRASE_BACKUP_DESC: 'Сохраните все данные перед переносом в другой браузер или устройство'
+  });
+}]);
--- a/app/js/provider-locale-format.js
+++ b/app/js/provider-locale-format.js
@@ -0,0 +1,36 @@
+
+angular.module('app').provider('localeFormat', function localeFormatProvider() {
+  var formats = {
+    en: {
+      decimal: '.',
+      thousands: ',',
+      grouping: [3],
+      currency: ['$', ''],
+      dateTime: '%a %b %e %X %Y',
+      date: '%m/%d/%Y',
+      time: '%H:%M:%S',
+      periods: ['AM', 'PM'],
+      days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+      shortDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+      months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+      shortMonths: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+    }
+  };
+
+  function LocaleFormat(formatMap) {
+    this.formatMap = formatMap;
+
+    this.get = function(lang) {
+      return this.formatMap[lang] ? this.formatMap[lang] : this.formatMap.en;
+    };
+  }
+
+  this.addFormat = function(langCode, formatDetails) {
+    formats[langCode] = formatDetails;
+  };
+
+  this.$get = [function() {
+    return new LocaleFormat(formats);
+  }];
+
+});
--- a/app/js/service-persist.js
+++ b/app/js/service-persist.js
@@ -4,6 +4,10 @@
 angular.module('app').service('Persist', ['$window', 'lodash', function($window, _) {
  var LS_KEY_BUILDS = 'builds';
  var LS_KEY_COMPARISONS = 'comparisons';
+  var LS_KEY_LANG = 'NG_TRANSLATE_LANG_KEY';
+  var LS_KEY_COST_TAB = 'costTab';
+  var LS_KEY_INSURANCE = 'insurance';
+  var LS_KEY_DISCOUNTS = 'discounts';
  var localStorage = $window.localStorage;
  var buildJson = null;
  var comparisonJson = null;
@@ -28,6 +32,22 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
    hasBuilds: buildCount > 0,
    hasComparisons: Object.keys(this.comparisons).length > 0
  };
+
+  this.put = function(name, value) {
+    if (!this.lsEnabled) {
+      return;
+    }
+    localStorage.setItem(name, value);
+  };
+
+  this.get = function(name) {
+    return this.lsEnabled ? localStorage.getItem(name) : null;
+  };
+
+  this.getLangCode = function() {
+    return this.lsEnabled ? localStorage.getItem(LS_KEY_LANG) : null;
+  };
+
  /**
   * Persist a ship build in local storage.
   *
@@ -117,7 +137,7 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
    }
    this.comparisons[name] = {
      facets: facets,
-      builds: _.map(builds, function(b) { return { shipId: b.id, buildName: b.buildName }; })
+      builds: _.map(builds, function(b) { return { shipId: b.id || b.shipId, buildName: b.buildName }; })
    };
    localStorage.setItem(LS_KEY_COMPARISONS, angular.toJson(this.comparisons));
    this.state.hasComparisons = true;
@@ -162,13 +182,23 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
    }
  };

+  this.getAll = function() {
+    var data = {};
+    data[LS_KEY_BUILDS] = this.builds;
+    data[LS_KEY_COMPARISONS] = this.comparisons;
+    data[LS_KEY_INSURANCE] = this.getInsurance();
+    data[LS_KEY_DISCOUNTS] = this.getDiscount();
+
+    return data;
+  };
+
  /**
   * Get the saved insurance type
   * @return {string} The name of the saved insurance type of null
   */
  this.getInsurance = function() {
    if (this.lsEnabled) {
-      return localStorage.getItem('insurance');
+      return localStorage.getItem(LS_KEY_INSURANCE);
    }
    return null;
  };
@@ -179,7 +209,7 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
   */
  this.setInsurance = function(name) {
    if (this.lsEnabled) {
-      return localStorage.setItem('insurance', name);
+      return localStorage.setItem(LS_KEY_INSURANCE, name);
    }
  };

@@ -189,7 +219,7 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
   */
  this.setDiscount = function(val) {
    if (this.lsEnabled) {
-      return localStorage.setItem('discount', val);
+      return localStorage.setItem(LS_KEY_DISCOUNTS, angular.toJson(val));
    }
  };

@@ -199,14 +229,35 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
   */
  this.getDiscount = function() {
    if (this.lsEnabled) {
-      return localStorage.getItem('discount');
+      return angular.fromJson(localStorage.getItem(LS_KEY_DISCOUNTS));
+    }
+    return null;
+  };
+
+  /**
+   * Persist selected cost tab
+   * @param {number} val Discount value/amount
+   */
+  this.setCostTab = function(tabName) {
+    if (this.lsEnabled) {
+      return localStorage.setItem(LS_KEY_COST_TAB, tabName);
+    }
+  };
+
+  /**
+   * Get the saved  discount
+   * @return {number} val Discount value/amount
+   */
+  this.getCostTab = function() {
+    if (this.lsEnabled) {
+      return localStorage.getItem(LS_KEY_COST_TAB);
    }
    return null;
  };

  /**
   * Retrieve the last router state from local storage
-   * @param {object} state State object containing state name and params
+   * @return {object} state State object containing state name and params
   */
  this.getState = function() {
    if (this.lsEnabled) {
@@ -228,6 +279,30 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
    }
  };

+  /**
+   * Retrieve the last router state from local storage
+   * @return {number} size Ratio
+   */
+  this.getSizeRatio = function() {
+    if (this.lsEnabled) {
+      var ratio = localStorage.getItem('sizeRatio');
+      if (!isNaN(ratio) && ratio > 0.6) {
+        return ratio;
+      }
+    }
+    return 1;
+  };
+
+  /**
+   * Save the current size ratio to localstorage
+   * @param {number} sizeRatio
+   */
+  this.setSizeRatio = function(sizeRatio) {
+    if (this.lsEnabled) {
+      localStorage.setItem('sizeRatio', sizeRatio);
+    }
+  };
+
  /**
   * Check if localStorage is enabled/active
   * @return {Boolean} True if localStorage is enabled
--- a/app/js/service-serializer.js
+++ b/app/js/service-serializer.js
@@ -1,7 +1,7 @@
 /**
 * Service managing seralization and deserialization of models for use in URLs and persistene.
 */
-angular.module('app').service('Serializer', ['lodash', function(_) {
+angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', 'ShipsDB', 'Ship', 'Components', '$state', function(_, GroupMap, MountMap, ShipsDB, Ship, Components, $state) {

 /**
   * Serializes the ships selected components for all slots to a URL friendly string.
@@ -10,8 +10,8 @@ angular.module('app').service('Serializer', ['lodash', function(_) {
   */
  this.fromShip = function(ship) {
    var power = {
-      enabled: [ship.cargoScoop.enabled ? 1 : 0],
-      priorities: [ship.cargoScoop.priority]
+      enabled: [ship.cargoHatch.enabled ? 1 : 0],
+      priorities: [ship.cargoHatch.priority]
    };

    var data = [
@@ -32,8 +32,8 @@ angular.module('app').service('Serializer', ['lodash', function(_) {
   * Updates an existing ship instance's slots with components determined by the
   * code.
   *
-   * @param {Ship}    ship  The ship instance to be updated
-   * @param {string}  code  The string to deserialize
+   * @param {Ship}    ship        The ship instance to be updated
+   * @param {string}  dataString  The string to deserialize
   */
  this.toShip = function(ship, dataString) {
    var common = new Array(ship.common.length),
@@ -54,10 +54,6 @@ angular.module('app').service('Serializer', ['lodash', function(_) {

    decodeToArray(code, internal, decodeToArray(code, hardpoints, decodeToArray(code, common, 1)));

-    // get the remaining substring / split into parts for
-    // - priorities
-    // - enabled/disabled
-
    ship.buildWith(
      {
        bulkheads: code.charAt(0) * 1,
@@ -70,6 +66,117 @@ angular.module('app').service('Serializer', ['lodash', function(_) {
    );
  };

+  this.toDetailedBuild = function(buildName, ship, code) {
+    var standard = ship.common,
+        hardpoints = ship.hardpoints,
+        internal = ship.internal;
+
+    var data = {
+      $schema: 'http://cdn.coriolis.io/schemas/ship-loadout/2.json#',
+      name: buildName,
+      ship: ship.name,
+      references: [{
+        name: 'Coriolis.io',
+        url: $state.href('outfit', { shipId: ship.id, code: code, bn: buildName }, { absolute: true }),
+        code: code,
+        shipId: ship.id
+      }],
+      components: {
+        standard: {
+          bulkheads: ship.bulkheads.c.name,
+          cargoHatch: { enabled: Boolean(ship.cargoHatch.enabled), priority: ship.cargoHatch.priority + 1 },
+          powerPlant: { class: standard[0].c.class, rating: standard[0].c.rating, enabled: Boolean(standard[0].enabled), priority: standard[0].priority + 1 },
+          thrusters: { class: standard[1].c.class, rating: standard[1].c.rating, enabled: Boolean(standard[1].enabled), priority: standard[1].priority + 1 },
+          frameShiftDrive: { class: standard[2].c.class, rating: standard[2].c.rating, enabled: Boolean(standard[2].enabled), priority: standard[2].priority + 1 },
+          lifeSupport: { class: standard[3].c.class, rating: standard[3].c.rating, enabled: Boolean(standard[3].enabled), priority: standard[3].priority + 1 },
+          powerDistributor: { class: standard[4].c.class, rating: standard[4].c.rating, enabled: Boolean(standard[4].enabled), priority: standard[4].priority + 1 },
+          sensors: { class: standard[5].c.class, rating: standard[5].c.rating, enabled: Boolean(standard[5].enabled), priority: standard[5].priority + 1 },
+          fuelTank: { class: standard[6].c.class, rating: standard[6].c.rating, enabled: Boolean(standard[6].enabled), priority: standard[6].priority + 1 }
+        },
+        hardpoints: _.map(_.filter(hardpoints, function(slot) { return slot.maxClass > 0; }), slotToSchema),
+        utility: _.map(_.filter(hardpoints, function(slot) { return slot.maxClass === 0; }), slotToSchema),
+        internal: _.map(internal, slotToSchema)
+      },
+      stats: {}
+    };
+
+    for (var stat in ship) {
+      if (!isNaN(ship[stat])) {
+        data.stats[stat] = Math.round(ship[stat] * 100) / 100;
+      }
+    }
+
+    return data;
+  };
+
+  this.fromDetailedBuild = function(detailedBuild) {
+    var shipId = _.findKey(ShipsDB, { properties: { name: detailedBuild.ship } });
+
+    if (!shipId) {
+      throw 'No such ship: ' + detailedBuild.ship;
+    }
+
+    var comps = detailedBuild.components;
+    var standard = comps.standard;
+    var priorities = [ standard.cargoHatch && standard.cargoHatch.priority !== undefined ? standard.cargoHatch.priority - 1 : 0 ];
+    var enabled = [ standard.cargoHatch && standard.cargoHatch.enabled !== undefined ? standard.cargoHatch.enabled : true ];
+    var shipData = ShipsDB[shipId];
+    var ship = new Ship(shipId, shipData.properties, shipData.slots);
+    var bulkheads = Components.bulkheadIndex(standard.bulkheads);
+
+    if (bulkheads < 0) {
+      throw 'Invalid bulkheads: ' + standard.bulkheads;
+    }
+
+    var common = _.map(
+      ['powerPlant', 'thrusters', 'frameShiftDrive', 'lifeSupport', 'powerDistributor', 'sensors', 'fuelTank'],
+      function(c) {
+        if (!standard[c].class || !standard[c].rating) {
+          throw 'Invalid value for ' + c;
+        }
+        priorities.push(standard[c].priority === undefined ? 0 : standard[c].priority - 1);
+        enabled.push(standard[c].enabled === undefined ? true : standard[c].enabled);
+        return standard[c].class + standard[c].rating;
+      }
+    );
+
+    var internal = _.map(comps.internal, function(c) { return c ? Components.findInternalId(c.group, c.class, c.rating, c.name) : 0; });
+
+    var hardpoints = _.map(comps.hardpoints, function(c) {
+      return c ? Components.findHardpointId(c.group, c.class, c.rating, c.name, MountMap[c.mount], c.missile) : 0;
+    });
+    hardpoints = hardpoints.concat(_.map(comps.utility, function(c) {
+      return c ? Components.findHardpointId(c.group, c.class, c.rating, c.name, MountMap[c.mount]) : 0;
+    }));
+
+    // The ordering of these arrays must match the order in which they are read in Ship.buildWith
+    priorities = priorities.concat(_.map(comps.hardpoints, function(c) { return (!c || c.priority === undefined) ? 0 : c.priority - 1; }),
+                                   _.map(comps.utility, function(c) { return (!c || c.priority === undefined) ? 0 : c.priority - 1; }),
+                                   _.map(comps.internal, function(c) { return (!c || c.priority === undefined) ? 0 : c.priority - 1; }));
+    enabled = enabled.concat(_.map(comps.hardpoints, function(c) { return (!c || c.enabled === undefined) ? true : c.enabled * 1; }),
+                             _.map(comps.utility, function(c) { return (!c || c.enabled === undefined) ? true : c.enabled * 1; }),
+                             _.map(comps.internal, function(c) { return (!c || c.enabled === undefined) ? true : c.enabled * 1; }));
+
+    ship.buildWith({ bulkheads: bulkheads, common: common, hardpoints: hardpoints, internal: internal }, priorities, enabled);
+
+    return ship;
+  };
+
+  this.toDetailedExport = function(builds) {
+    var data = [];
+
+    for (var shipId in builds) {
+      for (var buildName in builds[shipId]) {
+        var code = builds[shipId][buildName];
+        var shipData = ShipsDB[shipId];
+        var ship = new Ship(shipId, shipData.properties, shipData.slots);
+        this.toShip(ship, code);
+        data.push(this.toDetailedBuild(buildName, ship, code));
+      }
+    }
+    return data;
+  };
+
  this.fromComparison = function(name, builds, facets, predicate, desc) {
    var shipBuilds = [];

@@ -118,4 +225,22 @@ angular.module('app').service('Serializer', ['lodash', function(_) {
    return codePos;
  }

+  function slotToSchema(slot) {
+    if (slot.c) {
+      var o = { class: slot.c.class, rating: slot.c.rating, enabled: Boolean(slot.enabled), priority: slot.priority + 1, group: GroupMap[slot.c.grp] };
+      if (slot.c.name) {
+        o.name = slot.c.name;
+      }
+      if (slot.c.mode) {
+        o.mount = MountMap[slot.c.mode];
+      }
+      if (slot.c.missile) {
+        o.missile = slot.c.missile;
+      }
+      return o;
+    }
+    return null;
+  }
+
+
 }]);
--- a/app/js/shipyard/factory-component-set.js
+++ b/app/js/shipyard/factory-component-set.js
@@ -6,6 +6,13 @@ angular.module('shipyard').factory('ComponentSet', ['lodash', function(_) {
    });
  }

+  function getKey(maxClass, eligible) {
+    if (eligible) {
+      return maxClass + Object.keys(eligible).join('-');
+    }
+    return maxClass;
+  }
+
  function ComponentSet(components, mass, maxCommonArr, maxInternal, maxHardPoint) {
    this.mass = mass;
    this.common = {};
@@ -14,53 +21,112 @@ angular.module('shipyard').factory('ComponentSet', ['lodash', function(_) {
    this.hpClass = {};
    this.intClass = {};

-    for (var i = 0; i < components.common.length; i++) {
-      var max = maxCommonArr[i];
-      switch (i) {
-        // Slots where component class must be equal to slot class
-        case 3: // Life Support
-        case 5: // Sensors
-          this.common[i] = filter(components.common[i], max, max, this.mass);
-          break;
-        // Other slots can have a component of class lower than the slot class
-        default:
-          this.common[i] = filter(components.common[i], max, 0, this.mass);
-      }
-    }
+    this.common[0] = filter(components.common[0], maxCommonArr[0], 0, mass);  // Power Plant
+    this.common[2] = filter(components.common[2], maxCommonArr[2], 0, mass);  // FSD
+    this.common[4] = filter(components.common[4], maxCommonArr[4], 0, mass);  // Power Distributor
+    this.common[6] = filter(components.common[6], maxCommonArr[6], 0, mass);  // Fuel Tank
+
+    // Thrusters, filter components by class only (to show full list of ratings for that class)
+    var minThrusterClass = _.reduce(components.common[1], function(minClass, thruster) {
+      return (thruster.maxmass >= mass && thruster.class < minClass) ? thruster.class : minClass;
+    }, maxCommonArr[1]);
+    this.common[1] = filter(components.common[1], maxCommonArr[1], minThrusterClass, 0);  // Thrusters
+
+    // Slots where component class must be equal to slot class
+    this.common[3] = filter(components.common[3], maxCommonArr[3], maxCommonArr[3], 0);     // Life Supprt
+    this.common[5] = filter(components.common[5], maxCommonArr[5], maxCommonArr[5], mass);  // Sensors

    for (var h in components.hardpoints) {
-      this.hardpoints[h] = filter(components.hardpoints[h], maxHardPoint, 0, this.mass);
+      this.hardpoints[h] = filter(components.hardpoints[h], maxHardPoint, 0, mass);
    }

    for (var g in components.internal) {
-      this.internal[g] = filter(components.internal[g], maxInternal, 0, this.mass);
+      this.internal[g] = filter(components.internal[g], maxInternal, 0, mass);
    }
+
+    /**
+     * Create a memoized function for determining the components that are
+     * eligible for an internal slot
+     * @param  {integer} c        The max class component that can be mounted in the slot
+     * @param  {Object} eligible) The map of eligible internal groups
+     * @return {object}           A map of all eligible components by group
+     */
+    this.getInts = _.memoize(
+      function(c, eligible) {
+        var o = {};
+        for (var key in this.internal) {
+          if (eligible && !eligible[key]) {
+            continue;
+          }
+          var data = filter(this.internal[key], c, 0, this.mass);
+          if (data.length) {  // If group is not empty
+            o[key] = data;
+          }
+        }
+        return o;
+      },
+      getKey
+    );
+
+    /**
+     * Create a memoized function for determining the components that are
+     * eligible for an hardpoint slot
+     * @param  {integer} c        The max class component that can be mounted in the slot
+     * @param  {Object} eligible) The map of eligible hardpoint groups
+     * @return {object}           A map of all eligible components by group
+     */
+    this.getHps = _.memoize(
+      function(c, eligible) {
+        var o = {};
+        for (var key in this.hardpoints) {
+          if (eligible && !eligible[key]) {
+            continue;
+          }
+          var data = filter(this.hardpoints[key], c, c ? 1 : 0, this.mass);
+          if (data.length) {  // If group is not empty
+            o[key] = data;
+          }
+        }
+        return o;
+      },
+      getKey
+    );
  }

-  ComponentSet.prototype.getHps = function(c) {
-    if (!this.hpClass[c]) {
-      var o = this.hpClass[c] = {};
-      for (var key in this.hardpoints) {
-        var data = filter(this.hardpoints[key], c, c ? 1 : 0, this.mass);
-        if (data.length) {  // If group is not empty
-          o[key] = data;
-        }
+  ComponentSet.prototype.lightestPowerDist = function(boostEnergy) {
+    var pds = this.common[4];
+    var pd = pds[0];
+
+    for (var i = 1; i < pds.length; i++) {
+      if (pds[i].mass < pd.mass && pds[i].enginecapacity >= boostEnergy) {
+        pd = pds[i];
      }
    }
-    return this.hpClass[c];
+    return pd.class + pd.rating;
  };

-  ComponentSet.prototype.getInts = function(c) {
-    if (!this.intClass[c]) {
-      var o = this.intClass[c] = {};
-      for (var key in this.internal) {
-        var data = filter(this.internal[key], c, 0, this.mass);
-        if (data.length) {  // If group is not empty
-          o[key] = data;
-        }
+  ComponentSet.prototype.lightestThruster = function(ladenMass) {
+    var ths = this.common[1];
+    var th = ths[0];
+
+    for (var i = 1; i < ths.length; i++) {
+      if (ths[i].mass < th.mass && ths[i].maxmass >= ladenMass) {
+        th = ths[i];
      }
    }
-    return this.intClass[c];
+    return th.class + th.rating;
+  };
+
+  ComponentSet.prototype.lightestPowerPlant = function(powerUsed) {
+    var pps = this.common[0];
+    var pp = null;
+
+    for (var i = 0; i < pps.length; i++) {
+      if (pp == null || (pps[i].mass < pp.mass && pps[i].pGen >= powerUsed)) {
+        pp = pps[i];
+      }
+    }
+    return pp.class + (pp.rating != 'D' ? 'A' : 'D'); // Use A rated if C,E
  };

  return ComponentSet;
--- a/app/js/shipyard/factory-ship.js
+++ b/app/js/shipyard/factory-ship.js
@@ -1,4 +1,4 @@
-angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', 'calcJumpRange', 'calcTotalRange', 'lodash', function(Components, calcShieldStrength, calcJumpRange, calcTotalRange, _) {
+angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', 'calcJumpRange', 'calcTotalRange', 'lodash', 'ArmourMultiplier', function(Components, calcShieldStrength, calcJumpRange, calcTotalRange, _, ArmourMultiplier) {

  /**
   * Returns the power usage type of a slot and it's particular component
@@ -27,8 +27,8 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
   */
  function Ship(id, properties, slots) {
    this.id = id;
-    this.cargoScoop = { c: Components.cargoScoop(), type: 'SYS' };
-    this.bulkheads = { incCost: true, maxClass: 8, discount: 1 };
+    this.cargoHatch = { c: Components.cargoHatch(), type: 'SYS' };
+    this.bulkheads = { incCost: true, maxClass: 8 };

    for (var p in properties) { this[p] = properties[p]; }  // Copy all base properties from shipData

@@ -36,17 +36,22 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      var slotGroup = slots[slotType];
      var group = this[slotType] = [];   // Initialize Slot group (Common, Hardpoints, Internal)
      for (var i = 0; i < slotGroup.length; i++) {
-        group.push({ id: null, c: null, incCost: true, maxClass: slotGroup[i], discount: 1 });
+        if (typeof slotGroup[i] == 'object') {
+          group.push({ id: null, c: null, incCost: true, maxClass: slotGroup[i].class, eligible: slotGroup[i].eligible });
+        } else {
+          group.push({ id: null, c: null, incCost: true, maxClass: slotGroup[i] });
+        }
      }
    }
-    this.c = { incCost: true, discount: 1, c: { name: this.name, cost: this.cost } };  // Make a 'Ship' component similar to other components
+    // Make a Ship 'slot'/item similar to other slots
+    this.c = { incCost: true, type: 'SHIP', discountedCost: this.hullCost, c: { name: this.name, cost: this.hullCost } };

    this.costList = _.union(this.internal, this.common, this.hardpoints);
    this.costList.push(this.bulkheads);  // Add The bulkheads
    this.costList.unshift(this.c); // Add the ship itself to the list

    this.powerList = _.union(this.internal, this.hardpoints);
-    this.powerList.unshift(this.cargoScoop);
+    this.powerList.unshift(this.cargoHatch);
    this.powerList.unshift(this.common[1]);  // Add Thrusters
    this.powerList.unshift(this.common[5]);  // Add Sensors
    this.powerList.unshift(this.common[4]);  // Add Power Distributor
@@ -54,6 +59,9 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    this.powerList.unshift(this.common[2]);  // Add FSD
    this.powerList.unshift(this.common[0]);  // Add Power Plant

+    this.shipCostMultiplier = 1;
+    this.componentCostMultiplier = 1;
+
    this.priorityBands = [
      { deployed: 0, retracted: 0, retOnly: 0 },
      { deployed: 0, retracted: 0, retOnly: 0 },
@@ -80,15 +88,16 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    this.cargoCapacity = 0;
    this.ladenMass = 0;
    this.armourAdded = 0;
+    this.armourMultiplier = 1;
    this.shieldMultiplier = 1;
-    this.totalCost = this.cost;
-    this.unladenMass = this.mass;
-    this.armourTotal = this.armour;
+    this.totalCost = this.c.incCost ? this.c.discountedCost : 0;
+    this.unladenMass = this.hullMass;
+    this.totalDps = 0;

    this.bulkheads.c = null;
-    this.useBulkhead(comps.bulkheads || 0, true);
-    this.cargoScoop.priority = priorities ? priorities[0] * 1 : 0;
-    this.cargoScoop.enabled = enabled ? enabled[0] * 1 : true;
+    this.useBulkhead(comps && comps.bulkheads ? comps.bulkheads : 0, true);
+    this.cargoHatch.priority = priorities ? priorities[0] * 1 : 0;
+    this.cargoHatch.enabled = enabled ? enabled[0] * 1 : true;

    for (i = 0, l = this.priorityBands.length; i < l; i++) {
      this.priorityBands[i].deployed = 0;
@@ -96,8 +105,8 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      this.priorityBands[i].retOnly = 0;
    }

-    if (this.cargoScoop.enabled) {
-      bands[this.cargoScoop.priority].retracted += this.cargoScoop.c.power;
+    if (this.cargoHatch.enabled) {
+      bands[this.cargoHatch.priority].retracted += this.cargoHatch.c.power;
    }

    for (i = 0; i < cl; i++) {
@@ -106,7 +115,11 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      common[i].priority = priorities ? priorities[i + 1] * 1 : 0;
      common[i].type = 'SYS';
      common[i].c = common[i].id = null; // Resetting 'old' component if there was one
-      this.use(common[i], comps.common[i], Components.common(i, comps.common[i]), true);
+      common[i].discountedCost = 0;
+
+      if (comps) {
+        this.use(common[i], comps.common[i], Components.common(i, comps.common[i]), true);
+      }
    }

    common[1].type = 'ENG'; // Thrusters
@@ -119,8 +132,9 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      hps[i].priority = priorities ? priorities[cl + i] * 1 : 0;
      hps[i].type = hps[i].maxClass ? 'WEP' : 'SYS';
      hps[i].c = hps[i].id = null; // Resetting 'old' component if there was one
+      hps[i].discountedCost = 0;

-      if (comps.hardpoints[i] !== 0) {
+      if (comps && comps.hardpoints[i] !== 0) {
        this.use(hps[i], comps.hardpoints[i], Components.hardpoints(comps.hardpoints[i]), true);
      }
    }
@@ -133,22 +147,27 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      internal[i].priority = priorities ? priorities[cl + i] * 1 : 0;
      internal[i].type = 'SYS';
      internal[i].id = internal[i].c = null; // Resetting 'old' component if there was one
+      internal[i].discountedCost = 0;

-      if (comps.internal[i] !== 0) {
+      if (comps && comps.internal[i] !== 0) {
        this.use(internal[i], comps.internal[i], Components.internal(comps.internal[i]), true);
      }
    }

    // Update aggragated stats
-    this.updatePower();
-    this.updateJumpStats();
-    this.updateShieldStrength();
+    if (comps) {
+      this.updatePower();
+      this.updateJumpStats();
+      this.updateShieldStrength();
+    }
  };

  Ship.prototype.useBulkhead = function(index, preventUpdate) {
    var oldBulkhead = this.bulkheads.c;
    this.bulkheads.id = index;
    this.bulkheads.c = Components.bulkheads(this.id, index);
+    this.bulkheads.discountedCost = this.bulkheads.c.cost * this.componentCostMultiplier;
+    this.armourMultiplier = ArmourMultiplier[index];
    this.updateStats(this.bulkheads, this.bulkheads.c, oldBulkhead, preventUpdate);
  };

@@ -164,18 +183,20 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
  Ship.prototype.use = function(slot, id, component, preventUpdate) {
    if (slot.id != id) { // Selecting a different component
      // Slot is an internal slot, is not being emptied, and the selected component group/type must be of unique
-      if (slot.cat == 2 && component && _.includes(['sg', 'rf', 'fs'], component.grp)) {
+      if (slot.cat == 2 && component && _.includes(['psg', 'sg', 'rf', 'fs'], component.grp)) {
        // Find another internal slot that already has this type/group installed
        var similarSlot = this.findInternalByGroup(component.grp);
        // If another slot has an installed component with of the same type
        if (!preventUpdate && similarSlot && similarSlot !== slot) {
          this.updateStats(similarSlot, null, similarSlot.c, true);  // Update stats but don't trigger a global update
          similarSlot.id = similarSlot.c = null;  // Empty the slot
+          similarSlot.discountedCost = 0;
        }
      }
      var oldComponent = slot.c;
      slot.id = id;
      slot.c = component;
+      slot.discountedCost = (component && component.cost) ? component.cost * this.componentCostMultiplier : 0;
      this.updateStats(slot, component, oldComponent, preventUpdate);
    }
  };
@@ -199,9 +220,17 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
   * @return {number}       The index of the slot in ship.internal
   */
  Ship.prototype.findInternalByGroup = function(group) {
-    var index = _.findIndex(this.internal, function(slot) {
-      return slot.c && slot.c.grp == group;
-    });
+    var index;
+    if (group == 'sg' || group == 'psg') {
+      index = _.findIndex(this.internal, function(slot) {
+        return slot.c && (slot.c.grp == 'sg' || slot.c.grp == 'psg');
+      });
+    } else {
+      index = _.findIndex(this.internal, function(slot) {
+        return slot.c && slot.c.grp == group;
+      });
+    }
+
    if (index !== -1) {
      return this.internal[index];
    }
@@ -232,7 +261,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',

  Ship.prototype.setCostIncluded = function(item, included) {
    if (item.incCost != included && item.c) {
-      this.totalCost += included ? item.c.cost : -item.c.cost;
+      this.totalCost += included ? item.discountedCost : -item.discountedCost;
    }
    item.incCost = included;
  };
@@ -243,11 +272,13 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      if (slot.c) {
        this.priorityBands[slot.priority][powerUsageType(slot, slot.c)] += enabled ? slot.c.power : -slot.c.power;

-        if (slot.c.grp == 'sg') {
+        if (slot.c.grp == 'sg' || slot.c.grp == 'psg') {
          this.updateShieldStrength();
        } else if (slot.c.grp == 'sb') {
          this.shieldMultiplier += slot.c.shieldmul * (enabled ? 1 : -1);
          this.updateShieldStrength();
+        } else if (slot.c.dps) {
+          this.totalDps += slot.c.dps * (enabled ? 1 : -1);
        }

        this.updatePower();
@@ -261,12 +292,12 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    } else if (!slot.enabled) {
      return 1;   // Disabled
    } else if (deployed && !slot.c.retractedOnly) {  // Certain component (e.g. Detaild Surface scanner) are power only while retracted
-      return this.priorityBands[slot.priority].deployedSum > this.powerAvailable ? 2 : 3; // Offline : Online
+      return this.priorityBands[slot.priority].deployedSum >= this.powerAvailable ? 2 : 3; // Offline : Online
      // Active hardpoints have no retracted status
    } else if ((deployed && slot.c.retractedOnly) || (slot.cat === 1 && !slot.c.passive)) {
      return 0;  // No Status (Not possible)
    }
-    return this.priorityBands[slot.priority].retractedSum > this.powerAvailable ? 2 : 3;    // Offline : Online
+    return this.priorityBands[slot.priority].retractedSum >= this.powerAvailable ? 2 : 3;    // Offline : Online
  };

  /**
@@ -292,12 +323,16 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      }

      if (slot.incCost && old.cost) {
-        this.totalCost -= old.cost;
+        this.totalCost -= old.cost * this.componentCostMultiplier;
      }

      if (old.power && slot.enabled) {
        this.priorityBands[slot.priority][powerUsageType(slot, old)] -= old.power;
        powerChange = true;
+
+        if (old.dps) {
+          this.totalDps -= old.dps;
+        }
      }
      this.unladenMass -= old.mass || 0;
    }
@@ -310,9 +345,6 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
        case 'cr':
          this.cargoCapacity += n.capacity;
          break;
-        case 't':
-          this.maxMass = n.maxmass;
-          break;
        case 'hr':
          this.armourAdded += n.armouradd;
          break;
@@ -322,18 +354,22 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      }

      if (slot.incCost && n.cost) {
-        this.totalCost += n.cost;
+        this.totalCost += n.cost * this.componentCostMultiplier;
      }

      if (n.power && slot.enabled) {
        this.priorityBands[slot.priority][powerUsageType(slot, n)] += n.power;
        powerChange = true;
+
+        if (n.dps) {
+          this.totalDps += n.dps;
+        }
      }
      this.unladenMass += n.mass || 0;
    }

    this.ladenMass = this.unladenMass + this.cargoCapacity + this.fuelCapacity;
-    this.armourTotal = this.armourAdded + this.armour;
+    this.armour = this.armourAdded + Math.round(this.baseArmour * this.armourMultiplier);

    if (!preventUpdate) {
      if (powerChange) {
@@ -361,7 +397,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',

  Ship.prototype.updateShieldStrength = function() {
    var sgSlot = this.findInternalByGroup('sg');      // Find Shield Generator slot Index if any
-    this.shieldStrength = sgSlot && sgSlot.enabled ? calcShieldStrength(this.mass, this.shields, sgSlot.c, this.shieldMultiplier) : 0;
+    this.shieldStrength = sgSlot && sgSlot.enabled ? calcShieldStrength(this.hullMass, this.baseShieldStrength, sgSlot.c, this.shieldMultiplier) : 0;
  };

  /**
@@ -377,5 +413,28 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    this.maxJumpCount = Math.ceil(this.fuelCapacity / fsd.maxfuel);
  };

+  /**
+   * Recalculate all item costs and total based on discounts.
+   * @param  {number} shipCostMultiplier      Ship cost multiplier discount (e.g. 0.9 === 10% discount)
+   * @param  {number} componentCostMultiplier Component cost multiplier discount (e.g. 0.75 === 25% discount)
+   */
+  Ship.prototype.applyDiscounts = function(shipCostMultiplier, componentCostMultiplier) {
+    var total = 0;
+    var costList = this.costList;
+
+    for (var i = 0, l = costList.length; i < l; i++) {
+      var item = costList[i];
+      if (item.c && item.c.cost) {
+        item.discountedCost = item.c.cost * (item.type == 'SHIP' ? shipCostMultiplier : componentCostMultiplier);
+        if (item.incCost) {
+          total += item.discountedCost;
+        }
+      }
+    }
+    this.shipCostMultiplier = shipCostMultiplier;
+    this.componentCostMultiplier = componentCostMultiplier;
+    this.totalCost = total;
+  };
+
  return Ship;
 }]);
--- a/app/js/shipyard/module-shipyard.js
+++ b/app/js/shipyard/module-shipyard.js
@@ -7,19 +7,17 @@
 * @requires ngLodash
 */
 angular.module('shipyard', ['ngLodash'])
-  // Create 'angularized' references to DB.This will aid testing
+  // Create 'angularized' references to DB. This will aid testing
  .constant('ShipsDB', DB.ships)
  .constant('ComponentsDB', DB.components)
-  .value('commonArray', [
-    'Power Plant',
-    'Thrusters',
-    'Frame Shift Drive',
-    'Life Support',
-    'Power Distributor',
-    'Sensors',
-    'Fuel Tank'
+  .value('ArmourMultiplier', [
+    1,      // Lightweight
+    1.4,    // Reinforced
+    1.945,  // Military
+    1.945,  // Mirrored
+    1.945   // Reactive
  ])
-  // Map to lookup group labels/names for component grp
+  // Map to lookup group labels/names for component grp, used for JSON Serialization
  .value('GroupMap', {
    // Common
    pp: 'Power Plant',
@@ -32,19 +30,20 @@ angular.module('shipyard', ['ngLodash'])

    // Internal
    fs: 'Fuel Scoop',
-    sc: 'Scanners',
-    am: 'Auto Field-Maint. Unit',
-    cr: 'Cargo Racks',
+    sc: 'Scanner',
+    am: 'Auto Field-Maintenance Unit',
+    cr: 'Cargo Rack',
    fi: 'FSD Interdictor',
-    hb: 'Hatch Breaker Limpet Ctrl',
+    hb: 'Hatch Breaker Limpet Controller',
    hr: 'Hull Reinforcement Package',
    rf: 'Refinery',
    scb: 'Shield Cell Bank',
    sg: 'Shield Generator',
+    psg: 'Prismatic Shield Generator',
    dc: 'Docking Computer',
-    fx: 'Fuel Transfer Limpet Ctrl',
-    pc: 'Prospector Limpet Ctrl',
-    cc: 'Collector Limpet Ctrl',
+    fx: 'Fuel Transfer Limpet Controller',
+    pc: 'Prospector Limpet Controller',
+    cc: 'Collector Limpet Controller',

    // Hard Points
    bl: 'Beam Laser',
@@ -65,27 +64,14 @@ angular.module('shipyard', ['ngLodash'])
    sb: 'Shield Booster',
    tp: 'Torpedo Pylon'
  })
-  .value('shipPurpose', {
-    mp: 'Multi Purpose',
-    fr: 'Freighter',
-    ex: 'Explorer',
-    co: 'Combat',
-    pa: 'Passenger Transport'
+  .value('MountMap', {
+    'F': 'Fixed',
+    'G': 'Gimballed',
+    'T': 'Turret',
+    'Fixed': 'F',
+    'Gimballed': 'G',
+    'Turret': 'T'
  })
-  .value('shipSize', [
-    'N/A',
-    'Small',
-    'Medium',
-    'Large',
-    'Capital'
-  ])
-  .value('hardPointClass', [
-    'Utility',
-    'Small',
-    'Medium',
-    'Large',
-    'Huge'
-  ])
  /**
   * Array of all Ship properties (facets) organized into groups
   * used for ship comparisons.
@@ -94,77 +80,95 @@ angular.module('shipyard', ['ngLodash'])
   */
  .value('ShipFacets', [
    {                   // 0
-      title: 'Agility',
+      title: 'agility',
      props: ['agility'],
      unit: '',
      fmt: 'fCrd'
    },
    {                   // 1
-      title: 'Speed',
+      title: 'speed',
      props: ['speed', 'boost'],
-      lbls: ['Thrusters', 'Boost'],
+      lbls: ['thrusters', 'boost'],
      unit: 'm/s',
      fmt: 'fRound'
    },
    {                   // 2
-      title: 'Armour',
-      props: ['armourTotal'],
+      title: 'armour',
+      props: ['armour'],
      unit: '',
      fmt: 'fCrd'
    },
    {                   // 3
-      title: 'Shields',
+      title: 'shields',
      props: ['shieldStrength'],
      unit: 'MJ',
      fmt: 'fRound'
    },
    {                   // 4
-      title: 'Jump Range',
+      title: 'jump range',
      props: ['unladenRange', 'fullTankRange', 'ladenRange'],
-      lbls: ['Max', 'Full Tank', 'Laden'],
+      lbls: ['max', 'full tank', 'laden'],
      unit: 'LY',
      fmt: 'fRound'
    },
    {                   // 5
-      title: 'Mass',
+      title: 'mass',
      props: ['unladenMass', 'ladenMass'],
-      lbls: ['Unladen', 'Laden'],
+      lbls: ['unladen', 'laden'],
      unit: 'T',
      fmt: 'fRound'
    },
    {                   // 6
-      title: 'Cargo',
+      title: 'cargo',
      props: ['cargoCapacity'],
      unit: 'T',
      fmt: 'fRound'
    },
    {                   // 7
-      title: 'Fuel',
+      title: 'fuel',
      props: ['fuelCapacity'],
      unit: 'T',
      fmt: 'fRound'
    },
    {                   // 8
-      title: 'Power',
+      title: 'power',
      props: ['powerRetracted', 'powerDeployed', 'powerAvailable'],
-      lbls: ['Retracted', 'Deployed', 'Available'],
+      lbls: ['retracted', 'deployed', 'available'],
      unit: 'MW',
      fmt: 'fPwr'
    },
    {                   // 9
-      title: 'Cost',
+      title: 'cost',
      props: ['totalCost'],
      unit: 'CR',
      fmt: 'fCrd'
    },
    {                   // 10
-      title: 'Total Range',
+      title: 'total range',
      props: ['unladenTotalRange', 'ladenTotalRange'],
-      lbls: ['Unladen', 'Laden'],
+      lbls: ['unladen', 'laden'],
      unit: 'LY',
      fmt: 'fRound'
+    },
+    {                   // 11
+      title: 'DPS',
+      props: ['totalDps'],
+      lbls: ['DPS'],
+      unit: '',
+      fmt: 'fRound'
    }
  ])
+  /**
+   * Set of all available / theoretical discounts
+   */
+  .value('Discounts', {
+    '0%': 1,
+    '5%': 0.95,
+    '10%': 0.90,
+    '15%': 0.85,
+    '20%': 0.80,
+    '25%': 0.75
+  })
  /**
   * Calculate the maximum single jump range based on mass and a specific FSD
   *
@@ -186,13 +190,13 @@ angular.module('shipyard', ['ngLodash'])
   */
  .value('calcTotalRange', function(mass, fsd, fuel) {
    var fuelRemaining = fuel % fsd.maxfuel;  // Fuel left after making N max jumps
-    var jumps = fuel / fsd.maxfuel;
+    var jumps = Math.floor(fuel / fsd.maxfuel);
    mass += fuelRemaining;
    // Going backwards, start with the last jump using the remaining fuel
    var totalRange = fuelRemaining > 0 ? Math.pow(fuelRemaining / fsd.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass : 0;
-    // For each max fuel jump, calculate the max jump range based on fuel left in the tank
-    for (var j = 0, l = Math.floor(jumps); j < l; j++) {
-      fuelRemaining += fsd.maxfuel;
+    // For each max fuel jump, calculate the max jump range based on fuel mass left in the tank
+    for (var j = 0; j < jumps; j++) {
+      mass += fsd.maxfuel;
      totalRange += Math.pow(fsd.maxfuel / fsd.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass;
    }
    return totalRange;
--- a/app/js/shipyard/service-components.js
+++ b/app/js/shipyard/service-components.js
@@ -1,6 +1,12 @@
-angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'ShipsDB', 'ComponentSet', function(_, C, Ships, ComponentSet) {
+angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'ShipsDB', 'ComponentSet', 'GroupMap', function(_, C, Ships, ComponentSet, GroupMap) {

-  this.cargoScoop = function() {
+  var GrpNameToCodeMap = {};
+
+  for (var grp in GroupMap) {
+    GrpNameToCodeMap[GroupMap[grp]] = grp;
+  }
+
+  this.cargoHatch = function() {
    return { name: 'Cargo Hatch', class: 1, rating: 'H', power: 0.6 };
  };

@@ -32,6 +38,63 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi
    return null;
  };

+  this.findInternalId = function(groupName, clss, rating, name) {
+    var groups = {};
+
+    if (groupName) {
+      var grpCode = GrpNameToCodeMap[groupName];
+      if (grpCode && !C.internal[grpCode]) {
+        throw 'Invalid internal group: ' + groupName;
+      }
+      groups[grpCode] = C.internal[grpCode];
+    } else if (name) {
+      groups = C.internal;
+    } else {
+      throw 'Invalid group or name not provided';
+    }
+
+    for (var g in groups) {
+      var group = groups[g];
+      for (var i = 0, l = group.length; i < l; i++) {
+        if (group[i].class == clss && group[i].rating == rating && ((!name && !group[i].name) || group[i].name == name)) {
+          return group[i].id;
+        }
+      }
+    }
+
+    return 0;
+  };
+
+  this.findHardpointId = function(groupName, clss, rating, name, mode, missile) {
+    var groups = {};
+
+    if (groupName) {
+      var grpCode = GrpNameToCodeMap[groupName];
+      if (grpCode && !C.hardpoints[grpCode]) {
+        throw 'Invalid internal group: ' + groupName;
+      }
+      groups[grpCode] = C.hardpoints[grpCode];
+    } else if (name) {
+      groups = C.hardpoints;
+    } else {
+      throw 'Invalid group or name not provided';
+    }
+
+    for (var g in groups) {
+      var group = groups[g];
+      for (var i = 0, l = group.length; i < l; i++) {
+        if (group[i].class == clss && group[i].rating == rating && group[i].mode == mode
+            && ((!name && !group[i].name) || group[i].name == name)
+            && ((!missile && !group[i].missile) || group[i].missile == missile)
+            ) {
+          return group[i].id;
+        }
+      }
+    }
+
+    return 0;
+  };
+
  /**
   * Looks up the bulkhead component for a specific ship and bulkhead
   * @param  {string} shipId       Unique ship Id/Key
@@ -42,6 +105,10 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi
    return C.bulkheads[shipId][bulkheadsId];
  };

+  this.bulkheadIndex = function(bulkheadName) {
+    return ['Lightweight Alloy', 'Reinforced Alloy', 'Military Grade Composite', 'Mirrored Surface Composite', 'Reactive Surface Composite'].indexOf(bulkheadName);
+  };
+
  /**
   * Creates a new ComponentSet that contains all available components
   * that the specified ship is eligible to use.
@@ -51,7 +118,8 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi
   */
  this.forShip = function(shipId) {
    var ship = Ships[shipId];
-    return new ComponentSet(C, ship.properties.mass + 5, ship.slots.common, ship.slots.internal[0], ship.slots.hardpoints[0]);
+    var maxInternal = isNaN(ship.slots.internal[0]) ? ship.slots.internal[0].class : ship.slots.internal[0];
+    return new ComponentSet(C, ship.minMassFilter || ship.properties.hullMass + 5, ship.slots.common, maxInternal, ship.slots.hardpoints[0]);
  };

 }]);
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -19,10 +19,15 @@
@import 'buttons';
@import 'error';
@import 'sortable';
+@import 'loader';

 html, body {
  height: 100%;
+  width: 100%;
  text-rendering: optimizeLegibility;
+  overflow-x: hidden;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
 }

 body {
@@ -32,6 +37,8 @@ body {
  padding: 0;
  font-family: @fStandard;
  letter-spacing: 0.05em;
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch;
 }

 div, a, li {
@@ -40,7 +47,9 @@ div, a, li {

 #main {
  margin: 0;
-  padding: 0.5em 0;
+  padding: 0.5em 0.5em;
+  width: 100%;
+  box-sizing: border-box;
  min-height: 90%;
  clear: both;
  text-align: center;
@@ -78,6 +87,14 @@ div, a, li {
  text-align: center;
 }

+.cap {
+  text-transform: capitalize;
+}
+
+.upp {
+  text-transform: uppercase;
+}
+
 .scroll-x {
  overflow-x: auto;
  -webkit-overflow-scrolling: touch;
@@ -108,6 +125,7 @@ h3 {
 u { // Unit (Mj, Km, etc)
  font-size: 0.8em;
  text-decoration: none;
+  text-transform: none;
 }

 a, a:visited {
--- a/app/less/buttons.less
+++ b/app/less/buttons.less
@@ -5,7 +5,9 @@ button {
    fill: @primary;
  }
  border: none;
+  text-transform: capitalize;
  font-family: @fStandard;
+  font-size: 0.75em;
  vertical-align: middle;
  padding: 0.5em;
  cursor: pointer;
--- a/app/less/colors.less
+++ b/app/less/colors.less
@@ -66,3 +66,7 @@
  color: @warning-disabled;
  fill: @warning-disabled;
 }
+
+.bg-warning-disabled {
+  background-color: @warning-disabled;
+}
--- a/app/less/comparison.less
+++ b/app/less/comparison.less
@@ -29,6 +29,7 @@
    height: 100%;
    display: inline-block;
    padding: 0.3em;
+    font-size: 1em;
    vertical-align: middle;
    border: none;
    border-right: 1px solid @primary-disabled;
--- a/app/less/header.less
+++ b/app/less/header.less
@@ -50,6 +50,7 @@ header {
    padding : 0 1em;
    cursor: pointer;
    color: @warning;
+    text-transform: capitalize;
    // Less than 600px screen width: hide text

    &.disabled {
@@ -64,7 +65,7 @@ header {
    .menu-item-label {
      margin-left: 1em;

-      .largePhone({
+      .smallTablet({
        display: none;
      });
    }
@@ -84,6 +85,19 @@ header {
    -webkit-overflow-scrolling: touch;
    max-height: 500px;

+    &::-webkit-scrollbar {
+      width: 0.5em;
+    }
+
+    &::-webkit-scrollbar-track {
+      background-color: transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background-color: @warning-disabled;
+    }
+
+
    .smallTablet({
      max-height: 400px;
      left: 0;
--- a/app/less/loader.less
+++ b/app/less/loader.less
@@ -0,0 +1,37 @@
+@keyframes hideshow {
+  0% { opacity: 0; }
+  10% { opacity: 1; }
+  100% { opacity: 0; }
+}
+
+@keyframes inner {
+  0% { opacity: 0; }
+  10% { opacity: 1; }
+  100% { opacity: 0; }
+}
+
+@animationTime: 750ms;
+@outerTriangles: 19;
+@animationDelay: @animationTime / @outerTriangles;
+
+.loader {
+
+  path {
+    stroke: #000;
+    stroke-width: 0;
+    opacity: 0;
+  }
+}
+
+.l1 { animation: hideshow @animationTime linear infinite; }
+.l2 { animation: inner @animationTime linear infinite; }
+
+.mixin-loop (@i) when (@i > 0) {
+  .d@{i} {
+    animation-delay: @i * @animationDelay;
+  }
+  .mixin-loop(@i - 1);
+}
+
+.mixin-loop(@outerTriangles);
+
--- a/app/less/outfit.less
+++ b/app/less/outfit.less
@@ -59,7 +59,7 @@
  input {
    background: none;
    line-height: 1.3em;
-    width: 20em;
+    width: 15em;
    font-size: 0.9em;
    box-sizing: border-box;
    display: inline-block;
@@ -71,16 +71,17 @@
      color: @primary;
    }

-    .largePhone({
-      width: 70%;
+    .smallTablet({
+      width: 60%;
    });

-    .medPhone({
+    .largePhone({
      width: 100%;
    });
+
  }

-  .largePhone({
+  .smallTablet({
    float: left;
    clear: left;
    width: 100%;
@@ -99,6 +100,12 @@
  text-overflow: ellipsis;
 }

+.optional-hide {
+  .largePhone({
+    display: none;
+  });
+}
+
 table.total {
  width: 100%;

@@ -113,6 +120,26 @@ table.total {
  }
 }

+.tabs {
+  width: 100%;
+  box-sizing: border-box;
+  margin-bottom: 1px;
+
+  &, th {
+    border-collapse: collapse;
+    color: @primary-disabled;
+    background-color: @primary-bg;
+    border: 1px solid @primary-disabled;
+    padding-top: 1px;
+  }
+
+  .active {
+    color: @primary-bg;
+    background-color: @primary-disabled;
+  }
+
+}
+
 .group {
  width: 25%;
  padding: 0.5em 0.2em;
@@ -122,11 +149,6 @@ table.total {
  .user-select-none();
  cursor: default;

-  [ng-click] {
-    cursor: pointer;
-  }
-
-
  h1 {
    font-family: @fStandard;
    color: @bgBlack;
@@ -139,13 +161,14 @@ table.total {
    font-weight: normal;
  }

-  tbody tr:hover {
-    background-color: @warning-bg;
-  }
-
-
  .smallTablet({
    width: 50%;
+
+    .axis.x {
+      g.tick:nth-child(2n + 1) text {
+        display: none;
+      }
+    }
  });

  .largePhone({
@@ -169,24 +192,29 @@ table.total {
  &.third {
    width: 33%;

-    .smallTablet({
-      .axis.x {
-        g.tick:nth-child(2n + 1) text {
-          display: none;
-        }
-      }
-    });
-
    .largePhone({
      width: 100% !important;
    });
  }
+
+  .smallTablet({
+    .axis.x {
+      g.tick:nth-child(2n + 1) text {
+        display: none;
+      }
+    }
+  });
 }

 .power-band {
  text, rect {
    cursor: pointer;
  }
+
+  rect {
+    stroke-width: 1px;
+    stroke: #000;
+  }
 }

 #componentPriority {
@@ -233,9 +261,6 @@ table.total {
      &:nth-child(3) {
        display: none;
      }
-      &:nth-child(2) {
-        font-size: 0.7em;
-      }
    }
  });

--- a/app/less/select.less
+++ b/app/less/select.less
@@ -1,3 +1,27 @@
+select {
+  .border-radius(0);
+  cursor: pointer;
+  background: none;
+  color: @primary-disabled;
+  font-family: @fStandard;
+  font-size: 1em;
+  background-color: transparent;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding: 0.1em 0.5em;
+  outline:none;
+  border: 0;
+
+  &:focus {
+    outline:none;
+  }
+
+  &::-moz-focus-inner {
+    border: 0;
+  }
+}
+
 .select {
  color: @primary-disabled;
  position: absolute;
@@ -5,85 +29,112 @@
  padding: 0.5em 0;
  width: 100%;
  margin: 0;
-  max-height: 300px;
+  max-height: 400px;
  overflow-y: auto;
  overflow-x: hidden;
  z-index: 0;
  -webkit-overflow-scrolling: touch;
  background-color: @bg;
  border: 1px solid @primary;
-  white-space: nowrap;
  text-align: center;

+  .tablet({
+    max-height: 300px;
+  });
+
+  &::-webkit-scrollbar {
+    width: 0.5em;
+  }
+
+  &::-webkit-scrollbar-track {
+    background-color: transparent;
+    border-left: 1px solid @primary;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: @primary-disabled;
+  }
+
  .select-group {
+    white-space: nowrap;
    line-height: 1.5em;
    text-align: left;
    margin: 0.5em 0;
    padding-left: 5px;
    border-top: 1px solid @primary-disabled;
    border-bottom: 1px solid @primary-disabled;
+    overflow: hidden;
+    text-overflow: ellipsis;
  }

-  .empty-c, .c, .lc {
-    cursor: pointer;
+  @optionSpacing: 2em;

+  .empty-c, .c, .lc {
+    white-space: nowrap;
+    text-align: center;
+    cursor: pointer;
+    line-height:@optionSpacing;
    color: @primary-disabled;
-    stroke-width: 1em;
+    stroke-width: 0.5em;
    stroke: @primary-disabled;

    &:hover {
-      color: @warning;
-      stroke: @warning;
+      border-color: @primary;
+      color: @primary;
+      stroke: @primary;
    }
+  }
+
+  .lc, .c {
+    border:1px solid @primary-disabled;
+    padding: 0.1em 0.2em;
+    margin: 0.3em;
+
+    &.warning {
+      border-color: @warning-disabled;
+      color: @warning-disabled;
+      stroke: @warning-disabled;
+
+      &:hover {
+        border-color: @warning;
+        color: @warning;
+        stroke: @warning;
+      }
+    }
+
    &.disabled {
      cursor: not-allowed;
+      border-color: @disabled;
      color: @disabled;
      stroke: @disabled;
    }
    &.active {
+      border-color: @secondary;
      color: @secondary;
      stroke: @secondary;
    }
  }

-  @optionSpacing: 2em;
-
  .lc {
-    line-height:@optionSpacing;
-    text-align: left;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-transform: capitalize;
  }

-  .empty-c {
-    line-height:@optionSpacing;
-    text-align: center;
-  }
-
-
  .c {
-    border:1px solid @primary-disabled;
    display: inline-block;
-    padding: 0.1em;
-    margin: 0.3em;
    width: 2em;
-    line-height: @optionSpacing;
-    text-align: center;
+  }

-    &:hover {
-      border:1px solid @warning;
-    }
-
-    &.disabled {
-      border:1px solid @disabled;
-    }
-    &.active {
-      border:1px solid @secondary;
-    }
+  span {
+    vertical-align: middle;
  }

  ul {
    display: inline-block;
    text-align: left;
-    min-width: 15em;
+    min-width: 16em;
+    max-width: 100%;
    margin: 0 auto;
    padding: 0;
    list-style: none;
@@ -91,7 +142,7 @@

  &.hardpoint {
    .c {
-      width: 4.4em;
+      width: 4.5em;
      padding: 0.1em 0.2em;
    }
    ul {
--- a/app/less/slider.less
+++ b/app/less/slider.less
@@ -41,3 +41,58 @@
    cursor: crosshair;
  }
 }
+
+input[type=range] {
+    -webkit-appearance: none;
+    border: 1px solid @bgBlack;
+    /*required for proper track sizing in FF*/
+    width: 300px;
+
+  &::-moz-range-track, &::-webkit-slider-runnable-track {
+    width: 300px;
+    height: 5px;
+    background: @primary;
+    border: none;
+    border-radius: 3px;
+  }
+  &::-moz-range-thumb, &::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    border: none;
+    height: 1em;
+    width: 1em;
+    border-radius: 50%;
+    background: @primary;
+  }
+  &:focus {
+    outline: none;
+  }
+  /*hide the outline behind the border*/
+  &:-moz-focusring{
+      outline: 1px solid @bgBlack;
+      outline-offset: -1px;
+  }
+
+  &::-ms-track {
+    width: 300px;
+    height: 5px;
+    background: transparent;
+    border-color: transparent;
+    border-width: 6px 0;
+    color: transparent;
+  }
+  &::-ms-fill-lower {
+    background: @primary;
+    border-radius: 10px;
+  }
+  &::-ms-fill-upper {
+    background: @primary;
+    border-radius: 10px;
+  }
+  &::-ms-thumb {
+    border: none;
+    height: 16px;
+    width: 16px;
+    border-radius: 50%;
+    background: goldenrod;
+  }
+}
--- a/app/less/slot.less
+++ b/app/less/slot.less
@@ -24,11 +24,19 @@
    text-transform: none;
  }

+  .name {
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 80%;
+    text-overflow: ellipsis;
+  }
+
  .cb {
    overflow: hidden;
  }

  .l {
+    text-transform: capitalize;
    margin-right: 0.8em;
  }

@@ -44,10 +52,11 @@
    border-right: 1px solid @primary-disabled;
    box-sizing: border-box;
    padding-top: 0.2em;
-    padding-left: 0.1em;
+    padding-left: 0.05em;
  }

  .empty {
+    text-transform: uppercase;
    font-size: 1.3em;
    color: lighten(@primary-bg, 12%);
    text-align: center;
--- a/app/less/table.less
+++ b/app/less/table.less
@@ -8,6 +8,10 @@ table {
    color: @primary;
    text-decoration: none;
  }
+
+  [ng-click] {
+    cursor: pointer;
+  }
 }

 thead {
@@ -43,7 +47,6 @@ thead {
  }
 }

-
 tbody tr {

  &.tr {
@@ -55,6 +58,12 @@ tbody tr {
    }
  }

+  &.highlight {
+    &:hover {
+      background-color: @warning-bg;
+    }
+  }
+
  td {
    line-height: 1.4em;
    padding: 0 0.3em;
--- a/app/schemas/ship-loadout/1.json
+++ b/app/schemas/ship-loadout/1.json
@@ -0,0 +1,281 @@
+{
+  "$schema":            "http://json-schema.org/draft-04/schema#",
+  "id":                 "http://cdn.coriolis.io/schemas/ship-loadout/1-draft.json#",
+  "title":              "Ship Loadout",
+  "type":               "object",
+  "description":        "The details for a specific ship build/loadout",
+  "required":           ["name", "ship", "components"],
+  "properties": {
+    "name": {
+      "description":    "The name of the build/loadout",
+      "type":           "string",
+      "minLength":      2
+    },
+    "ship": {
+      "description":    "The full display name of the ship",
+      "type":           "string",
+      "minimum":        3
+    },
+    "manufacturer": {
+      "description":    "The ship manufacturer",
+      "type":           "string"
+    },
+    "references" : {
+      "description":    "3rd Party references and/or links to this build/loadout",
+      "type":           "array",
+      "items": {
+        "type":                 "object",
+        "required":             ["name","url"],
+        "additionalProperties": true,
+        "properties": {
+          "name": {
+            "description":  "The name of the 3rd party, .e.g 'Coriolis.io' or 'E:D Shipyard'",
+            "type":         "string"
+          },
+          "url": {
+            "description":  "The link/url to the 3rd party referencing this build/loadout",
+            "type":         "string"
+          }
+        }
+      }
+    },
+    "components": {
+      "description":                "The components used by this build",
+      "type":                       "object",
+      "additionalProperties":       false,
+      "required":                   ["standard", "internal", "hardpoints", "utility"],
+      "properties": {
+        "standard": {
+          "description":            "The set of standard components across all ships",
+          "type":                   "object",
+          "additionalProperties":   false,
+          "required":               ["bulkheads", "powerPlant", "thrusters", "frameShiftDrive", "lifeSupport", "powerDistributor", "sensors", "fuelTank"],
+          "properties": {
+            "bulkheads": {
+              "enum":               ["Lightweight Alloy", "Reinforced Alloy", "Military Grade Composite", "Mirrored Surface Composite", "Reactive Surface Composite"]
+            },
+            "powerPlant": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            },
+            "thrusters": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            },
+            "frameShiftDrive": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            },
+            "lifeSupport": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 6 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            },
+            "powerDistributor": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            },
+            "sensors": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            },
+            "fuelTank": {
+              "required": ["class", "rating"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 6 },
+                "rating": { "$ref": "#/definitions/standardRatings" }
+              }
+            }
+          }
+        },
+        "internal": {
+          "type": "array",
+          "items": {
+            "type": ["object", "null"],
+            "required": ["class", "rating", "group"],
+            "properties" : {
+              "class": { "type": "integer", "minimum": 1, "maximum": 8 },
+              "rating": { "$ref": "#/definitions/standardRatings" },
+              "group": {
+                "description": "The group of the component, e.g. 'Shield Generator', or 'Cargo Rack'",
+                "type": "string"
+              },
+              "name": {
+                "description": "The name identifying the component (if applicable), e.g. 'Advance Discovery Scanner', or 'Detailed Surface Scanner'",
+                "type": "string"
+              }
+            }
+          },
+          "minItems": 3
+        },
+        "hardpoints": {
+          "type": "array",
+          "items": {
+            "type": ["object", "null"],
+            "required": ["class", "rating", "group", "mount"],
+            "properties" : {
+              "class": { "type": "integer", "minimum": 1, "maximum": 4 },
+              "rating": { "$ref": "#/definitions/allRatings" },
+              "mount": { "type": "string", "enum": ["Fixed", "Gimballed", "Turret"] },
+              "group": {
+                "description": "The group of the component, e.g. 'Beam Laser', or 'Missile Rack'",
+                "type": "string"
+              },
+              "name": {
+                "description": "The name identifing the component (if applicable), e.g. 'Retributor', or 'Mining Lance'",
+                "type": "string"
+              }
+            }
+          },
+          "minItems": 1
+        },
+        "utility": {
+          "type": "array",
+          "items": {
+            "type": ["object", "null"],
+            "required": ["class", "rating", "group"],
+            "properties" : {
+              "class": { "type": "integer", "minimum": 0, "maximum": 0 },
+              "rating": { "$ref": "#/definitions/allRatings" },
+              "group": {
+                "description": "The group of the component, e.g. 'Shield Booster', or 'Kill Warrant Scanner'",
+                "type": "string"
+              },
+              "name": {
+                "description": "The name identifing the component (if applicable), e.g. 'Point Defence', or 'Electronic Countermeasure'",
+                "type": "string"
+              }
+            }
+          },
+          "minItems": 1
+        }
+      }
+    },
+    "stats": {
+      "description":          "Optional statistics from the build",
+      "type":                 "object",
+      "additionalProperties": true,
+      "properties": {
+        "agility": {
+          "type":         "integer",
+          "minimum":      0
+        },
+        "armour": {
+          "description":  "Sum of base armour + any hull reinforcements",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "armourAdded":{
+          "description":  "Armour added through Hull reinforcement",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "baseShieldStrength": {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "baseArmour":  {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "boost": {
+          "description":  "Maximum boost speed of the ships (4 pips, straight-line)",
+          "type":         "number",
+          "minimum":      1
+        },
+        "cargoCapacity": {
+          "type":         "integer",
+          "minimum":      0
+        },
+        "class": {
+          "description":  "Ship Class/Size [Small, Medium, Large]",
+          "enum":         [1,2,3]
+        },
+        "dps": {
+          "description":  "Cumulative DPS based on the in-game 1-10 statistic",
+          "type":         "integer",
+          "minimum":      0
+        },
+        "hullCost": {
+          "description":  "Cost of the ship's hull",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "hullMass": {
+          "description":  "Mass of the Ship hull only",
+          "type":         "number",
+          "minimum":      1
+        },
+        "fuelCapacity": {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "fullTankRange": {
+          "description":  "Single Jump range with a full tank (unladenMass + fuel)",
+          "type":         "number",
+          "minimum":      0
+        },
+        "ladenMass": {
+          "description":  "Mass of the Ship + fuel + cargo (hull + all components + fuel tank + cargo capacity)",
+          "type":         "number",
+          "minimum":      1
+        },
+        "ladenRange": {
+          "description":  "Single Jump range with full cargo load, see ladenMass",
+          "type":         "number",
+          "minimum":      0
+        },
+        "masslock": {
+          "description":  "Mass Lock Factor of the Ship",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "shieldStrength": {
+          "description":  "Shield strengh in Mega Joules (Mj)",
+          "type":         "number",
+          "minimum":      0
+        },
+        "speed": {
+          "description":  "Maximum speed of the ships (4 pips, straight-line)",
+          "type":         "number",
+          "minimum":      1
+        },
+        "totalCost":  {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "unladenRange": {
+          "description":  "Single Jump range when unladen, see unladenMass",
+          "type":         "number",
+          "minimum":      0
+        },
+        "unladenMass": {
+          "description":  "Mass of the Ship (hull + all components)",
+          "type":         "number",
+          "minimum":      1
+        }
+      }
+    }
+  },
+  "definitions": {
+    "standardRatings":  { "enum": ["A", "B", "C", "D", "E"] },
+    "allRatings":       { "enum": ["A", "B", "C", "D", "E", "F", "I" ] }
+  }
+}
--- a/app/schemas/ship-loadout/2.json
+++ b/app/schemas/ship-loadout/2.json
@@ -0,0 +1,308 @@
+{
+  "$schema":            "http://json-schema.org/draft-04/schema#",
+  "id":                 "http://cdn.coriolis.io/schemas/ship-loadout/2.json#",
+  "title":              "Ship Loadout",
+  "type":               "object",
+  "description":        "The details for a specific ship build/loadout",
+  "required":           ["name", "ship", "components"],
+  "properties": {
+    "name": {
+      "description":    "The name of the build/loadout",
+      "type":           "string",
+      "minLength":      2
+    },
+    "ship": {
+      "description":    "The full display name of the ship",
+      "type":           "string",
+      "minimum":        3
+    },
+    "manufacturer": {
+      "description":    "The ship manufacturer",
+      "type":           "string"
+    },
+    "references" : {
+      "description":    "3rd Party references and/or links to this build/loadout",
+      "type":           "array",
+      "items": {
+        "type":                 "object",
+        "required":             ["name","url"],
+        "additionalProperties": true,
+        "properties": {
+          "name": {
+            "description":  "The name of the 3rd party, .e.g 'Coriolis.io' or 'E:D Shipyard'",
+            "type":         "string"
+          },
+          "url": {
+            "description":  "The link/url to the 3rd party referencing this build/loadout",
+            "type":         "string"
+          }
+        }
+      }
+    },
+    "components": {
+      "description":                "The components used by this build",
+      "type":                       "object",
+      "additionalProperties":       false,
+      "required":                   ["standard", "internal", "hardpoints", "utility"],
+      "properties": {
+        "standard": {
+          "description":            "The set of standard components across all ships",
+          "type":                   "object",
+          "additionalProperties":   false,
+          "required":               ["bulkheads", "powerPlant", "thrusters", "frameShiftDrive", "lifeSupport", "powerDistributor", "sensors", "fuelTank", "cargoHatch"],
+          "properties": {
+            "bulkheads": {
+              "enum":               ["Lightweight Alloy", "Reinforced Alloy", "Military Grade Composite", "Mirrored Surface Composite", "Reactive Surface Composite"]
+            },
+            "cargoHatch": {
+              "required": ["enabled", "priority"],
+              "properties": {
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "powerPlant": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "thrusters": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "frameShiftDrive": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "lifeSupport": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 6 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "powerDistributor": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "sensors": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 8 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            },
+            "fuelTank": {
+              "required": ["class", "rating", "enabled", "priority"],
+              "properties": {
+                "class": { "type": "integer", "minimum": 1, "maximum": 6 },
+                "rating": { "$ref": "#/definitions/standardRatings" },
+                "enabled": { "type": "boolean" },
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+              }
+            }
+          }
+        },
+        "internal": {
+          "type": "array",
+          "items": {
+            "type": ["object", "null"],
+            "required": ["class", "rating", "enabled", "priority", "group"],
+            "properties" : {
+              "class": { "type": "integer", "minimum": 1, "maximum": 8 },
+              "rating": { "$ref": "#/definitions/standardRatings" },
+              "enabled": { "type": "boolean" },
+              "priority": { "type": "integer", "minimum": 1, "maximum": 5 },
+              "group": {
+                "description": "The group of the component, e.g. 'Shield Generator', or 'Cargo Rack'",
+                "type": "string"
+              },
+              "name": {
+                "description": "The name identifying the component (if applicable), e.g. 'Advance Discovery Scanner', or 'Detailed Surface Scanner'",
+                "type": "string"
+              }
+            }
+          },
+          "minItems": 3
+        },
+        "hardpoints": {
+          "type": "array",
+          "items": {
+            "type": ["object", "null"],
+            "required": ["class", "rating", "enabled", "priority", "group", "mount"],
+            "properties" : {
+              "class": { "type": "integer", "minimum": 1, "maximum": 4 },
+              "rating": { "$ref": "#/definitions/allRatings" },
+              "enabled": { "type": "boolean" },
+              "priority": { "type": "integer", "minimum": 1, "maximum": 5 },
+              "mount": { "type": "string", "enum": ["Fixed", "Gimballed", "Turret"] },
+              "group": {
+                "description": "The group of the component, e.g. 'Beam Laser', or 'Missile Rack'",
+                "type": "string"
+              },
+              "name": {
+                "description": "The name identifing the component (if applicable), e.g. 'Retributor', or 'Mining Lance'",
+                "type": "string"
+              }
+            }
+          },
+          "minItems": 1
+        },
+        "utility": {
+          "type": "array",
+          "items": {
+            "type": ["object", "null"],
+            "required": ["class", "rating", "enabled", "priority", "group"],
+            "properties" : {
+              "class": { "type": "integer", "minimum": 0, "maximum": 0 },
+              "rating": { "$ref": "#/definitions/allRatings" },
+              "enabled": { "type": "boolean" },
+              "priority": { "type": "integer", "minimum": 1, "maximum": 5 },
+              "group": {
+                "description": "The group of the component, e.g. 'Shield Booster', or 'Kill Warrant Scanner'",
+                "type": "string"
+              },
+              "name": {
+                "description": "The name identifing the component (if applicable), e.g. 'Point Defence', or 'Electronic Countermeasure'",
+                "type": "string"
+              }
+            }
+          },
+          "minItems": 1
+        }
+      }
+    },
+    "stats": {
+      "description":          "Optional statistics from the build",
+      "type":                 "object",
+      "additionalProperties": true,
+      "properties": {
+        "agility": {
+          "type":         "integer",
+          "minimum":      0
+        },
+        "armour": {
+          "description":  "Sum of base armour + any hull reinforcements",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "armourAdded":{
+          "description":  "Armour added through Hull reinforcement",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "baseShieldStrength": {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "baseArmour":  {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "boost": {
+          "description":  "Maximum boost speed of the ships (4 pips, straight-line)",
+          "type":         "number",
+          "minimum":      1
+        },
+        "cargoCapacity": {
+          "type":         "integer",
+          "minimum":      0
+        },
+        "class": {
+          "description":  "Ship Class/Size [Small, Medium, Large]",
+          "enum":         [1,2,3]
+        },
+        "dps": {
+          "description":  "Cumulative DPS based on the in-game 1-10 statistic",
+          "type":         "integer",
+          "minimum":      0
+        },
+        "hullCost": {
+          "description":  "Cost of the ship's hull",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "hullMass": {
+          "description":  "Mass of the Ship hull only",
+          "type":         "number",
+          "minimum":      1
+        },
+        "fuelCapacity": {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "fullTankRange": {
+          "description":  "Single Jump range with a full tank (unladenMass + fuel)",
+          "type":         "number",
+          "minimum":      0
+        },
+        "ladenMass": {
+          "description":  "Mass of the Ship + fuel + cargo (hull + all components + fuel tank + cargo capacity)",
+          "type":         "number",
+          "minimum":      1
+        },
+        "ladenRange": {
+          "description":  "Single Jump range with full cargo load, see ladenMass",
+          "type":         "number",
+          "minimum":      0
+        },
+        "masslock": {
+          "description":  "Mass Lock Factor of the Ship",
+          "type":         "integer",
+          "minimum":      1
+        },
+        "shieldStrength": {
+          "description":  "Shield strengh in Mega Joules (Mj)",
+          "type":         "number",
+          "minimum":      0
+        },
+        "speed": {
+          "description":  "Maximum speed of the ships (4 pips, straight-line)",
+          "type":         "number",
+          "minimum":      1
+        },
+        "totalCost":  {
+          "type":         "integer",
+          "minimum":      1
+        },
+        "unladenRange": {
+          "description":  "Single Jump range when unladen, see unladenMass",
+          "type":         "number",
+          "minimum":      0
+        },
+        "unladenMass": {
+          "description":  "Mass of the Ship (hull + all components)",
+          "type":         "number",
+          "minimum":      1
+        }
+      }
+    }
+  },
+  "definitions": {
+    "standardRatings":  { "enum": ["A", "B", "C", "D", "E"] },
+    "allRatings":       { "enum": ["A", "B", "C", "D", "E", "F", "I" ] }
+  }
+}
--- a/app/views/_header.html
+++ b/app/views/_header.html
@@ -1,5 +1,5 @@
 <div id="app-update" ng-show="appCacheUpdate">
-  <a href="#" onclick="window.location.reload()">Update Available! Click to Refresh</a>
+  <a href="#" onclick="window.location.reload()">{{ 'PHRASE_UPDATE_RDY' | translate }}</a>
 </div>

 <header>
@@ -7,8 +7,8 @@

  <div class="l menu">
    <div class="menu-header" ng-class="{selected: openedMenu=='s'}" ng-click="openMenu($event,'s')">
-      <svg class="icon warning"><use xlink:href="#rocket"></use></svg><span class="menu-item-label"> Ships</span>
-</div>
+      <svg class="icon warning"><use xlink:href="#rocket"></use></svg><span class="menu-item-label"> {{'ships' | translate}}</span>
+    </div>
    <div class="menu-list dbl no-wrap" ng-if="openedMenu=='s'">
      <a class="block" ng-repeat="(shipId,ship) in ships" ui-sref-active="active" ui-sref="outfit({shipId:shipId, code:null, bn:null})">{{::ship.properties.name}}</a>
    </div>
@@ -16,7 +16,7 @@

  <div class="l menu">
    <div class="menu-header" ng-class="{selected: openedMenu=='b', disabled: !bs.hasBuilds}" ng-click="openMenu($event,'b')">
-      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#hammer"></use></svg><span class="menu-item-label"> Builds</span>
+      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#hammer"></use></svg><span class="menu-item-label"> {{'builds' | translate}}</span>
    </div>
    <div class="menu-list" ng-if="openedMenu=='b'" ng-click="$event.stopPropagation();">
      <div class="dbl" >
@@ -32,39 +32,59 @@

  <div class="l menu">
    <div class="menu-header" ng-class="{selected: openedMenu=='comp', disabled: !bs.hasBuilds}" ng-click="openMenu($event,'comp')">
-      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#stats-bars"></use></svg><span class="menu-item-label"> Compare</span>
-</div>
+      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#stats-bars"></use></svg><span class="menu-item-label"> {{'compare' | translate}}</span>
+    </div>
    <div class="menu-list" ng-if="openedMenu=='comp'" ng-click="$event.stopPropagation();" style="white-space: nowrap;">
-      <span ng-if="!bs.hasComparisons">None Created</span>
+      <span class="cap" ng-if="!bs.hasComparisons" translate="none created"></span>
      <a ng-repeat="(name, comp) in allComparisons" ui-sref-active="active" class="block name" ui-sref="compare({name:name})" ng-bind="name"></a>
      <hr />
-      <a ui-sref="compare({name: 'all'})" class="block">Compare All</a>
-      <a ui-sref="compare({name: null})" class="block">Create New</a>
+      <a ui-sref="compare({name: 'all'})" class="block cap" translate="compare all"></a>
+      <a ui-sref="compare({name: null})" class="block cap" translate="create new"></a>
    </div>
  </div>

  <div class="r menu">
    <div class="menu-header" ng-class="{selected: openedMenu=='settings'}" ng-click="openMenu($event,'settings')">
-      <svg class="icon xl warning"><use xlink:href="#cogs"></use></svg><span class="menu-item-label"> Settings</span>
+      <svg class="icon xl warning"><use xlink:href="#cogs"></use></svg><span class="menu-item-label"> {{'settings' | translate}}</span>
    </div>
-    <div class="menu-list no-wrap" ng-if="openedMenu=='settings'" ng-click="$event.stopPropagation();">
+    <div class="menu-list no-wrap cap" ng-if="openedMenu=='settings'" ng-click="$event.stopPropagation();">
      <ul>
-        Insurance
-        <li><select ng-model="insurance.current" ng-options="ins.name for (i,ins) in insurance.opts" ng-change="updateInsurance()"></select></li>
+        {{'language' | translate}}
+        <li><select class="cap" ng-model="language.current" ng-options="langCode as langName for (langCode,langName) in language.opts" ng-change="changeLanguage()"></select></li>
      </ul><br>
      <ul>
-        Discount
-        <li><select ng-model="discounts.current" ng-options="d.name for (i,d) in discounts.opts" ng-change="updateDiscount()"></select></li>
+        {{'insurance' | translate}}
+        <li><select class="cap" ng-model="insurance.current" ng-options="ins.name | translate for (i,ins) in insurance.opts" ng-change="updateInsurance()"></select></li>
+      </ul><br>
+      <ul>
+        {{'ship' | translate}} {{'discount' | translate}}
+        <li><select class="cap" ng-model="discounts.ship" ng-options="i for (i,d) in discounts.opts" ng-change="updateDiscount()"></select></li>
+      </ul><br>
+      <ul>
+        {{'component' | translate}} {{'discount' | translate}}
+        <li><select class="cap" ng-model="discounts.components" ng-options="i for (i,d) in discounts.opts" ng-change="updateDiscount()"></select></li>
      </ul>
      <hr />
      <ul>
-        Builds & Comparisons
-        <li><a href="#" class="block" ui-sref="modal.export({data: {builds: allBuilds}})">Export</a></li>
-        <li><a href="#" class="block" ui-sref="modal.import">Import</a></li>
-        <li><a href="#" class="block" ui-sref="modal.delete">Delete All</a></li>
+        {{'builds' | translate}} & {{'comparisons' | translate}}
+        <li><a href="#" class="block" ng-click="backup($event)" translate="backup"></a></li>
+        <li><a href="#" class="block" ng-click="detailedExport($event)" translate="detailed export"></a></li>
+        <li><a href="#" class="block" ui-sref="modal.import" translate="import"></a></li>
+        <li><a href="#" class="block" ui-sref="modal.delete" translate="delete all"></a></li>
      </ul>
      <hr />
-      <a href="#" ui-sref="modal.about" class="block">About</a>
+      <table style="width: 300px;background-color:transparent">
+        <tr>
+          <td style="width: 20px"><u>A</u></td>
+          <td slider min="0.65" def="sizeRatio" max="1.2" on-change="textSizeChange(val)" ignore-resize="true"></td>
+          <td style="width: 20px"><span style="font-size: 30px">A</span></td>
+        </tr>
+        <tr>
+         <td></td><td style="text-align:center" class="primary-disabled cap" ng-click="resetTextSize()" translate="reset"></td><td></td>
+        </tr>
+      </table>
+      <hr />
+      <a href="#" ui-sref="modal.about" class="block" translate="about"></a>
    </div>
  </div>

--- a/app/views/_slot-hardpoint.html
+++ b/app/views/_slot-hardpoint.html
@@ -1,17 +1,17 @@
-<div class="sz">{{::['U','S','M','L','H'][hp.maxClass]}}</div>
-<div class="empty" ng-if="!hp.c">EMPTY</div>
+<div class="sz">{{['U','S','M','L','H'][hp.maxClass] | translate}}</div>
+<div class="empty" ng-if="!hp.c" translate="empty"></div>
 <div ng-if="hp.c">
-  {{hp.c.class}}{{hp.c.rating}}<span ng-if="hp.c.mode">/{{hp.c.mode}}{{hp.c.missile}}</span> {{hp.c.name || lbl}}
+  {{hp.c.class}}{{hp.c.rating}}<span ng-if="hp.c.mode">/{{hp.c.mode}}{{hp.c.missile}}</span> {{hp.c.name || hp.c.grp  | translate}}
  <div class="r">{{hp.c.mass}} <u>T</u></div>
  <div class="cb">
-    <div class="l" ng-if="hp.c.damage">Damage: {{hp.c.damage}} <span ng-if="hp.c.ssdam">({{$r.fCrd(hp.c.ssdam)}} <u>Mj</u>)</span></div>
-    <div class="l" ng-if="hp.c.dps">DPS: {{hp.c.dps}} <span ng-if="hp.c.mjdps">({{$r.fCrd(hp.c.mjdps)}} <u>Mj</u>)</span></div>
-    <div class="l" ng-if="hp.c.thermload">T-Load: {{hp.c.thermload}}</div>
-    <div class="l" ng-if="hp.c.type">Type: {{hp.c.type}}</div>
-    <div class="l" ng-if="hp.c.rof">ROF: {{hp.c.rof}}<u>/s</u></div>
-    <div class="l" ng-if="hp.c.armourpen">Pen: {{hp.c.armourpen}}</div>
+    <div class="l" ng-if="hp.c.damage">{{'damage' | translate}}: {{hp.c.damage}} <span ng-if="hp.c.ssdam">({{$r.fCrd(hp.c.ssdam)}} <u>MJ</u>)</span></div>
+    <div class="l" ng-if="hp.c.dps">{{'DPS' | translate}}: {{hp.c.dps}} <span ng-if="hp.c.mjdps">({{$r.fCrd(hp.c.mjdps)}} <u>MJ</u>)</span></div>
+    <div class="l" ng-if="hp.c.thermload">{{'T_LOAD' | translate}}: {{hp.c.thermload}}</div>
+    <div class="l" ng-if="hp.c.type">{{'type' | translate}}: {{hp.c.type}}</div>
+    <div class="l" ng-if="hp.c.rof">{{'ROF' | translate}}: {{hp.c.rof}}<u>/s</u></div>
+    <div class="l" ng-if="hp.c.armourpen">{{'pen' | translate}}: {{hp.c.armourpen}}</div>
    <div class="l" ng-if="hp.c.shieldmul">+{{$r.fRPct(hp.c.shieldmul)}}</div>
-    <div class="l" ng-if="hp.c.range">{{hp.c.range}} <u>KM</u></div>
-    <div class="l" ng-if="hp.c.ammo">Ammo: {{$r.fCrd(hp.c.clip)}}/{{$r.fCrd(hp.c.ammo)}}</div>
+    <div class="l" ng-if="hp.c.range">{{hp.c.range}} <u>km</u></div>
+    <div class="l" ng-if="hp.c.ammo">{{'ammo' | translate}}: {{$r.fCrd(hp.c.clip)}}/{{$r.fCrd(hp.c.ammo)}}</div>
  </div>
 </div>
--- a/app/views/_slot-internal.html
+++ b/app/views/_slot-internal.html
@@ -1,22 +1,22 @@
 <div class="sz" ng-bind="c.maxClass"></div>
-<div class="empty" ng-if="!c.c">EMPTY</div>
+<div class="empty" ng-if="!c.c" translate="empty"></div>
 <div ng-if="c.c">
-  {{c.c.class}}{{c.c.rating}} {{c.c.name || lbl}}
-  <div class="r">{{c.c.mass || c.c.capacity || '0'}} <u>T</u></div>
+  <div class="l name">{{c.c.class}}{{c.c.rating}} {{c.c.name || c.c.grp | translate}}</div>
+  <div class="r">{{c.c.mass || c.c.capacity || '0'}} <u translate="T"></u></div>
  <div class="cb"></div>
-  <div class="l" ng-if="c.c.optmass">Opt: {{c.c.optmass}} <u>T</u></div>
-  <div class="l" ng-if="c.c.maxmass">Max: {{c.c.maxmass}} <u>T</u></div>
-  <div class="l" ng-if="c.c.bins">{{c.c.bins}} <u>Bins</u></div>
-  <div class="l" ng-if="c.c.rate">Rate: {{c.c.rate}} <u>Kg/s</u>&nbsp;&nbsp;&nbsp;Refuel Time: {{$r.fTime(fuel * 1000 / c.c.rate)}}</div>
-  <div class="l" ng-if="c.c.ammo">Ammo: {{c.c.ammo}}</div>
-  <div class="l" ng-if="c.c.cells">Cells: {{c.c.cells}}</div>
-  <div class="l" ng-if="c.c.recharge">Recharge: {{c.c.recharge}} <u>MJ</u></div>
-  <div class="l" ng-if="c.c.repair">Repair: {{c.c.repair}}</div>
-  <div class="l" ng-if="c.c.range">Range {{c.c.range}} <u>km</u></div>
-  <div class="l" ng-if="c.c.time">Time: {{$r.fTime(c.c.time)}}</div>
-  <div class="l" ng-if="c.c.maximum">Max: {{(c.c.maximum)}}</div>
-  <div class="l" ng-if="c.c.rangeLS">{{c.c.rangeLS}} <u>LS</u></div>
-  <div class="l" ng-if="c.c.rangeLS === null"><svg class="icon"><use xlink:href="#infinite"></use></svg> <u>LS</u></div>
-  <div class="l" ng-if="c.c.rangeRating">Range: {{c.c.rangeRating}}</div>
-  <div class="l" ng-if="c.c.armouradd">+{{c.c.armouradd}} <u>Armour</u></div>
-</div>
+  <div class="l" ng-if="c.c.optmass">{{'optimal mass' | translate}}: {{c.c.optmass}} <u translate="T"></u></div>
+  <div class="l" ng-if="c.c.maxmass">{{'max mass' | translate}}: {{c.c.maxmass}} <u translate="T"></u></div>
+  <div class="l" ng-if="c.c.bins">{{c.c.bins}} <u translate="bins"></u></div>
+  <div class="l" ng-if="c.c.rate">{{'rate' | translate}}: {{c.c.rate}} <u>Kg/s</u>&nbsp;&nbsp;&nbsp;{{'refuel time' | translate}}: {{$r.fTime(fuel * 1000 / c.c.rate)}}</div>
+  <div class="l" ng-if="c.c.ammo">{{'ammo' | translate}}: {{c.c.ammo}}</div>
+  <div class="l" ng-if="c.c.cells">{{'cells' | translate}}: {{c.c.cells}}</div>
+  <div class="l" ng-if="c.c.recharge">{{'recharge' | translate}}: {{c.c.recharge}} <u>MJ</u>&nbsp;&nbsp;&nbsp;{{'total' | translate}}: {{c.c.cells * c.c.recharge}} <u>MJ</u></div>
+  <div class="l" ng-if="c.c.repair">{{'repair' | translate}}: {{c.c.repair}}</div>
+  <div class="l" ng-if="c.c.range">{{'range' | translate}} {{c.c.range}} <u>km</u></div>
+  <div class="l" ng-if="c.c.time">{{'time' | translate}}: {{$r.fTime(c.c.time)}}</div>
+  <div class="l" ng-if="c.c.maximum">{{'max' | translate}}: {{(c.c.maximum)}}</div>
+  <div class="l" ng-if="c.c.rangeLS">{{c.c.rangeLS}} <u translate="LS"></u></div>
+  <div class="l" ng-if="c.c.rangeLS === null"><svg class="icon"><use xlink:href="#infinite"></use></svg> <u translate="LS"></u></div>
+  <div class="l" ng-if="c.c.rangeRating">{{'range' | translate}}: {{c.c.rangeRating}}</div>
+  <div class="l" ng-if="c.c.armouradd">+{{c.c.armouradd}} <u translate="armour"></u></div>
+</div>
--- a/app/views/modal-about.html
+++ b/app/views/modal-about.html
@@ -26,4 +26,4 @@

 <p>Help keep the lights on! Donations will be used to cover costs of running and maintaining Coriolis. Thanks for helping!</p>

-<button class="r dismiss" ng-click="dismiss()">Close</button>
+<button class="r dismiss cap" ng-click="dismiss()" translate="close"></button>
--- a/app/views/modal-delete.html
+++ b/app/views/modal-delete.html
@@ -1,4 +1,4 @@
-<h2>Delete All</h2>
-<p style="text-align:center;">Are you sure?</p>
-<button class="l" ng-click="deleteAll()">Yes</button>
-<button class="r" ng-click="dismiss()">No</button>
+<h2 translate="delete all"></h2>
+<p style="text-align:center;" translate="PHRASE_CONFIRMATION"></p>
+<button class="l cap" ng-click="deleteAll()" translate="yes"></button>
+<button class="r cap" ng-click="dismiss()" translate="no"></button>
--- a/app/views/modal-export.html
+++ b/app/views/modal-export.html
@@ -1,5 +1,6 @@
-<h2 ng-bind="title"></h2>
+<h2 ng-bind="title | translate"></h2>
+<div ng-if="description" ng-bind="description | translate"></div>
 <div>
  <textarea class="cb json" ng-click="onTextClick($event)" ng-bind="export"></textarea>
 </div>
-<button class="r dismiss" ng-click="dismiss()">Close</button>
+<button class="r dismiss cap" ng-click="dismiss()" translate="close"></button>
--- a/app/views/modal-import.html
+++ b/app/views/modal-import.html
@@ -1,26 +1,46 @@
-<h2>Import</h2>
+<h2 translate="import"></h2>
 <div ng-show="!processed">
-  <textarea class="cb json"  ng-model="importData" ng-change="validateJson()" placeholder="Paste JSON Here"></textarea>
-  <button class="l" ng-click="process()" ng-disabled="!jsonValid">Proceed</button>
+  <textarea class="cb json"  ng-model="importString" ng-change="validateImport()" placeholder="{{'PHRASE_IMPORT' | translate}}"></textarea>
+  <button class="l cap" ng-click="process()" ng-disabled="!importValid" translate="proceed"></button>
  <div class="l warning" style="margin-left:3em;">{{errorMsg}}</div>
 </div>

 <div ng-show="processed">
-  <table class="l" style="overflow:hidden;margin: 1em 0;">
-    <thead><tr><th>Ship</th><th>Build Name</th><th>Action</th></tr></thead>
+  <table class="l" style="overflow:hidden;margin: 1em 0; width: 100%;">
+    <thead>
+      <tr>
+        <th style="text-align:left" translate="ship"></th>
+        <th style="text-align:left" translate="build name"></th>
+        <th translate="action"></th>
+      </tr>
+    </thead>
    <tbody ng-repeat="(shipId,shipBuilds) in builds">
      <tr class="cb" ng-repeat="(buildName, b) in shipBuilds">
        <td>{{ships[shipId].properties.name}}</td>
        <td><input type="text" ng-model="b.useName"/></td>
-        <td ng-class="{warning: hasBuild(shipId, b.useName) == true, disabled: b.useName == ''}">
-          <span ng-show="b.useName">{{ hasBuild(shipId, b.useName)? 'Overwrite' : 'Create' }}</span>
-          <span ng-show="b.useName == ''">Skip</span>
+        <td style="text-align:center" ng-class="{warning: hasBuild(shipId, b.useName) == true, disabled: b.useName == ''}">
+          <span ng-show="b.useName" translate="{{ hasBuild(shipId, b.useName)? 'overwrite' : 'create' }}"></span>
+          <span ng-show="b.useName == ''" translate="skip"></span>
        </td>
      </tr>
    </tbody>
  </table>
-  <button class="cl l" ng-click="import()"><svg class="icon"><use xlink:href="#download"></use></svg> Import</button>
-  <button class="l" style="margin-left: 2em;" ng-click="processed = false" ng-show="canEdit">Edit JSON</button>
+
+  <table class="l" style="overflow:hidden;margin: 1em 0; width: 100%;" ng-if="comparisons">
+    <thead><tr><th style="text-align:left" translate="comparison"></th><th translate="action"></th></tr></thead>
+    <tbody>
+      <tr class="cb" ng-repeat="(name, comparison) in comparisons">
+        <td><input type="text" ng-model="comparison.useName"/></td>
+        <td style="text-align:center" ng-class="{warning: hasComparison(comparison.useName) == true, disabled: comparison.useName == ''}">
+          <span ng-show="comparison.useName" translate="{{ hasComparison(comparison.useName)? 'overwrite' : 'create' }}"></span>
+          <span ng-show="comparison.useName == ''" translate="skip"></span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <button class="cl l" ng-click="import()"><svg class="icon"><use xlink:href="#download"></use></svg> {{'import' | translate}}</button>
+  <button class="l cap" style="margin-left: 2em;" ng-click="processed = false" ng-show="canEdit" translate="edit data"></button>
 </div>

-<button class="r dismiss" ng-click="dismiss()">Cancel</button>
+<button class="r dismiss cap" ng-click="dismiss()" translate="cancel"></button>
--- a/app/views/modal-link.html
+++ b/app/views/modal-link.html
@@ -1,9 +1,9 @@
-<h2>Permalink</h2>
+<h2 translate="permalink"></h2>
 <br>
-<h3>URL</h3>
+<h3 translate="URL"></h3>
 <input ng-model="url" size="40" ng-click="onTextClick($event)">
 <br><br>
-<h3>Shortened</h3>
+<h3 translate="shortened"></h3>
 <input ng-model="shortenedUrl" size="25" ng-click="onTextClick($event)">
 <br><br>
-<button class="r dismiss" ng-click="dismiss()">Close</button>
+<button class="r dismiss cap" ng-click="dismiss()" translate="close"></button>
--- a/app/views/page-comparison.html
+++ b/app/views/page-comparison.html
@@ -1,37 +1,37 @@

 <table id="comparison">
  <tr ng-show="compareMode">
-    <td class="head">Comparison</td>
+    <td class="head" translate="comparison"></td>
    <td>
-      <input ng-model="name" ng-change="nameChange()" placeholder="Enter Comparison Name"  maxlength="50" />
+      <input ng-model="name" ng-change="nameChange()" placeholder="{{'enter name' | translate}}"  maxlength="50" />
      <button ng-click="save()" ng-disabled="!name || name == 'all' || saved">
-        <svg class="icon lg "><use xlink:href="#floppy-disk"></use></svg><span class="button-lbl"> Save</span>
+        <svg class="icon lg "><use xlink:href="#floppy-disk"></use></svg><span class="button-lbl"> {{'save' | translate}}</span>
      </button>
      <button ng-click="delete()" ng-disabled="name == 'all' || !saved"><svg class="icon lg warning "><use xlink:href="#bin"></use></svg></button>
      <button ng-click="selectBuilds(true, $event)">
-        <svg class="icon lg "><use xlink:href="#rocket"></use></svg><span class="button-lbl"> Builds</span>
+    <svg class="icon lg "><use xlink:href="#rocket"></use></svg><span class="button-lbl"> {{'builds' | translate}}</span>
      </button>
      <button class="r" ng-click="permalink($event)" ng-disabled="builds.length == 0">
-        <svg class="icon lg "><use xlink:href="#link"></use></svg><span class="button-lbl"> Permalink</span>
+        <svg class="icon lg "><use xlink:href="#link"></use></svg><span class="button-lbl"> {{'permalink' | translate}}</span>
      </button>
      <button class="r" ng-click="embed($event)" ng-disabled="builds.length == 0">
-        <svg class="icon lg "><use xlink:href="#embed"></use></svg><span class="button-lbl"> Forum</span>
+        <svg class="icon lg "><use xlink:href="#embed"></use></svg><span class="button-lbl"> {{'forum' | translate}}</span>
        </button>
    </td>
  </tr>
  <tr ng-show="!compareMode">
-    <td class="head">Comparison</td>
+    <td class="head" translate="comparison"></td>
    <td>
      <h3 ng-bind="name"></h3>
-      <button class="r" ui-sref="modal.import({obj:importObj})"><svg class="icon lg "><use xlink:href="#download"></use></svg> Import Builds</button>
+      <button class="r" ui-sref="modal.import({obj:importObj})"><svg class="icon lg "><use xlink:href="#download"></use></svg> {{'import' | translate}}</button>
    </td>
  </tr>
  <tr>
-    <td class="head">Compare</td>
+    <td class="head" translate="compare"></td>
    <td>
      <ul id="facet-container" as-sortable="facetSortOpts" ng-model="facets" class="sortable" update="tblUpdate">
        <li ng-repeat="(i,f) in facets" as-sortable-item class="facet" ng-class="{active: f.active}" ng-click="toggleFacet(i)">
-          <div as-sortable-item-handle>&#x2194; <span ng-bind="f.title"></span></div>
+          <div as-sortable-item-handle>&#x2194; <span ng-bind="f.title | translate"></span></div>
        </li>
      </ul>
    </td>
@@ -43,15 +43,15 @@
 </div>

 <div ng-repeat="f in facets | filter:{active:true}" ng-if="builds.length > 0" class="chart" bar-chart facet="f" data="builds">
-  <h3 ng-click="sort(f.props[0])" >{{f.title}}</h3>
+  <h3 ng-click="sort(f.props[0])" >{{f.title | translate}}</h3>
 </div>

 <div class="modal-bg" ng-show="showBuilds" ng-click="selectBuilds(false, $event)">
  <div class="modal" ui-view="modal-content" ng-click="$event.stopPropagation()">
-    <h3>Select Builds to Compare</h3>
+    <h3 translate="PHRASE_SELECT_BUILDS"></h3>
    <div id="build-select">
      <table>
-        <thead><tr><th colspan="2">Available</th></tr></thead>
+        <thead><tr><th colspan="2" translate="available"></th></tr></thead>
        <tbody>
          <tr ng-repeat="b in unusedBuilds | orderBy:'name'" ng-click="addBuild(b.id, b.buildName)">
            <td class="tl" ng-bind="b.name"></td><td class="tl" ng-bind="b.buildName"></td>
@@ -60,7 +60,7 @@
      </table>
      <h1>⇆</h1>
      <table>
-        <thead><tr><th colspan="2">Added</th></tr></thead>
+        <thead><tr><th colspan="2" translate="added"></th></tr></thead>
        <tbody>
          <tr ng-repeat="b in builds | orderBy:'name'" ng-click="removeBuild(b.id, b.buildName)">
            <td class="tl" ng-bind="b.name"></td><td class="tl" ng-bind="b.buildName"></td>
@@ -69,6 +69,6 @@
      </table>
    </div>
    <br>
-    <button class="r dismiss" ng-click="selectBuilds(false, $event)">Done</button>
+    <button class="r dismiss cap" ng-click="selectBuilds(false, $event)" translate="done"></button>
  </div>
 </div>
--- a/app/views/page-outfit.html
+++ b/app/views/page-outfit.html
@@ -3,21 +3,27 @@
  <div id="overview">
    <h1 ng-bind="ship.name"></h1>
    <div id="build">
-      <input ng-model="buildName" ng-change="bnChange()" placeholder="Enter Build Name" maxsize="50" />
+      <input ng-model="buildName" ng-change="bnChange()" placeholder="{{'enter name' | translate}}" maxsize="50" />
      <button ng-click="saveBuild()" ng-disabled="!buildName || savedCode && code == savedCode || !canSave">
-        <svg class="icon lg "><use xlink:href="#floppy-disk"></use></svg><span class="button-lbl">Save</span>
+        <svg class="icon lg "><use xlink:href="#floppy-disk"></use></svg><span class="button-lbl" translate="save"></span>
      </button>
      <button ng-click="reloadBuild()" ng-disabled="!savedCode || code == savedCode">
-        <svg class="icon lg"><use xlink:href="#spinner11"></use></svg><span class="button-lbl">Reload</span>
+        <svg class="icon lg"><use xlink:href="#spinner11"></use></svg><span class="button-lbl" translate="reload"></span>
      </button>
      <button class="danger" ng-click="deleteBuild()" ng-disabled="!savedCode">
        <svg class="icon lg"><use xlink:href="#bin"></use></svg>
      </button>
      <button ui-sref="outfit({shipId: ship.id,code:null, bn: buildName})" ng-disabled="!code">
-        <svg class="icon lg"><use xlink:href="#switch"></use></svg><span class="button-lbl">Reset</span>
+        <svg class="icon lg"><use xlink:href="#switch"></use></svg><span class="button-lbl" translate="reset"></span>
      </button>
-      <button ng-click="stripBuild()">
-        <svg class="icon lg"><use xlink:href="#feather"></use></svg><span class="button-lbl">Low-Weight</span>
+      <button ng-click="aRatedBuild()">
+        <svg class="icon lg"><use xlink:href="#a"></use></svg><span class="button-lbl" translate="A-Rated"></span>
+      </button>
+      <button ng-click="optimizeMassBuild()">
+        <svg class="icon lg"><use xlink:href="#feather"></use></svg><span class="button-lbl" translate="optimize mass"></span>
+      </button>
+      <button ng-click="exportBuild($event)"  ng-disabled="!buildName">
+        <svg class="icon lg"><use xlink:href="#download"></use></svg><span class="button-lbl" translate="export"></span>
      </button>
    </div>
  </div>
@@ -26,160 +32,179 @@
    <table id="summaryTable">
      <thead>
        <tr class="main">
-          <th rowspan="2">Size</th>
-          <th rowspan="2">Agility</th>
-          <th rowspan="2">Speed</th>
-          <th rowspan="2">Boost</th>
-          <th rowspan="2">Armour</th>
-          <th rowspan="2">Shields</th>
-          <th colspan="2">Mass</th>
-          <th rowspan="2">Cargo</th>
-          <th rowspan="2">Fuel</th>
-          <th colspan="3">Jump Range</th>
-          <th colspan="3">Total Range</th>
+          <th rowspan="2" translate="size"></th>
+          <th rowspan="2" translate="agility"></th>
+          <th rowspan="2" ng-class="{'bg-warning-disabled': th.c.maxmass < ship.ladenMass}" translate="speed"></th>
+          <th rowspan="2" ng-class="{'bg-warning-disabled': (pd.c.enginecapacity < ship.boostEnergy || th.c.maxmass < ship.ladenMass)}" translate="boost"></th>
+          <th rowspan="2" translate="DPS"></th>
+          <th rowspan="2" translate="armour"></th>
+          <th rowspan="2" translate="shields"></th>
+          <th colspan="3" translate="mass"></th>
+          <th rowspan="2" translate="cargo"></th>
+          <th rowspan="2" translate="fuel"></th>
+          <th colspan="3" translate="jump range"></th>
+          <th colspan="3" translate="total range"></th>
+          <th rowspan="2" translate="lock factor"></th>
        </tr>
        <tr>
-          <th class="lft">Unladen</th>
-          <th>Laden</th>
-          <th class="lft">Max</th>
-          <th>Full Tank</th>
-          <th>Laden</th>
-          <th class="lft">Jumps</th>
-          <th>Unladen</th>
-          <th>Laden</th>
+          <th class="lft" translate="hull"></th>
+          <th translate="unladen"></th>
+          <th translate="laden"></th>
+          <th class="lft" translate="max"></th>
+          <th translate="full tank"></th>
+          <th translate="laden"></th>
+          <th class="lft" translate="jumps"></th>
+          <th translate="unladen"></th>
+          <th translate="laden"></th>
        </tr>
      </thead>
      <tbody>
        <tr>
-          <td ng-bind="SZ[ship.class]"></td>
+          <td class="cap" ng-bind="['','small','medium','large','capital'][ship.class] | translate"></td>
          <td>{{ship.agility}}/10</td>
-          <td>{{fRound(ship.speed)}} <u>m/s</u></td>
-          <td>{{fRound(ship.boost)}} <u>m/s</u></td>
-          <td>{{ship.armourTotal}} <span ng-if="ship.armourAdded">({{ship.armour}} + {{ship.armourAdded}})</span></td>
-          <td>{{fRound(ship.shieldStrength)}} <u>MJ</u> <span ng-if="ship.shieldMultiplier > 1 && ship.shieldStrength > 0">({{fRPct(ship.shieldMultiplier)}})</span></td>
-          <td>{{fRound(ship.unladenMass)}} <u>T</u></td>
-          <td>{{fRound(ship.ladenMass)}} <u>T</u></td>
-          <td>{{fRound(ship.cargoCapacity)}} <u>T</u></td>
-          <td>{{fRound(ship.fuelCapacity)}} <u>T</u></td>
-          <td>{{fRound(ship.unladenRange)}} <u>LY</u></td>
-          <td>{{fRound(ship.fullTankRange)}} <u>LY</u></td>
-          <td>{{fRound(ship.ladenRange)}} <u>LY</u></td>
+          <td>
+            <span ng-if="th.c.maxmass >= ship.ladenMass">{{fRound(ship.speed)}} <u translate>m/s</u></span>
+            <span class="warning" ng-if="th.c.maxmass < ship.ladenMass">0 <svg class="icon"><use xlink:href="#warning"></use></svg></span>
+            </td>
+          <td>
+            <span ng-if="pd.c.enginecapacity >= ship.boostEnergy && th.c.maxmass >= ship.ladenMass">{{fRound(ship.boost)}} <u translate>m/s</u></span>
+            <span class="warning" ng-if="pd.c.enginecapacity < ship.boostEnergy || th.c.maxmass < ship.ladenMass">0
+              <svg class="icon"><use xlink:href="#warning"></use></svg>
+            </span>
+          </td>
+          <td>{{fRound(ship.totalDps)}}</td>
+          <td>
+            {{ship.armour}}
+            <span ng-if="ship.armourAdded || ship.armourMultiplier > 1">
+            (<span ng-if="ship.armourMultiplier > 1">{{fRPct(ship.armourMultiplier)}}</span><span ng-if="ship.armourAdded && ship.armourMultiplier > 1">&nbsp;</span><span ng-if="ship.armourAdded">+ {{ship.armourAdded}}</span>)
+            </span>
+          </td>
+          <td>{{fRound(ship.shieldStrength)}} <u translate>MJ</u> <span ng-if="ship.shieldMultiplier > 1 && ship.shieldStrength > 0">({{fRPct(ship.shieldMultiplier)}})</span></td>
+          <td>{{ship.hullMass}} <u translate>T</u></td>
+          <td>{{fRound(ship.unladenMass)}} <u translate>T</u></td>
+          <td>{{fRound(ship.ladenMass)}} <u translate>T</u></td>
+          <td>{{fRound(ship.cargoCapacity)}} <u translate>T</u></td>
+          <td>{{fRound(ship.fuelCapacity)}} <u translate>T</u></td>
+          <td>{{fRound(ship.unladenRange)}} <u translate>LY</u></td>
+          <td>{{fRound(ship.fullTankRange)}} <u translate>LY</u></td>
+          <td>{{fRound(ship.ladenRange)}} <u translate>LY</u></td>
          <td>{{fRound(ship.maxJumpCount)}}</td>
-          <td>{{fRound(ship.unladenTotalRange)}} <u>LY</u></td>
-          <td>{{fRound(ship.ladenTotalRange)}} <u>LY</u></td>
+          <td>{{fRound(ship.unladenTotalRange)}} <u translate>LY</u></td>
+          <td>{{fRound(ship.ladenTotalRange)}} <u translate>LY</u></td>
+          <td ng-bind="ship.masslock"></td>
        </tr>
      </tbody>
    </table>
  </div>

  <div id="standard" class="group">
-    <h1>Standard</h1>
+    <h1 translate="standard"></h1>
    <div class="slot" ng-click="selectSlot($event, ship.bulkheads)" ng-class="{selected: selectedSlot==ship.bulkheads}">
      <div class="details">
        <div class="sz"><span>8</span></div>
-        <div class="l">Bulkheads</div>
-        <div class="r">{{ship.bulkheads.c.mass}} <u>T</u></div>
-        <div class="cl l">{{ship.bulkheads.c.name}}</div>
+        <div class="l cap" translate="bh"></div>
+        <div class="r">{{ship.bulkheads.c.mass}} <u translate>T</u></div>
+        <div class="cl l">{{ship.bulkheads.c.name | translate}}</div>
      </div>
      <div class="select" ng-if="selectedSlot==ship.bulkheads" ng-click="select('b',ship.bulkheads,$event)">
        <ul>
-          <li class="lc" ng-class="{active: ship.bulkheads.id=='0'}" cpid="0">Lightweight Alloy</li>
-          <li class="lc" ng-class="{active: ship.bulkheads.id=='1'}" cpid="1">Reinforced Alloy</li>
-          <li class="lc" ng-class="{active: ship.bulkheads.id=='2'}" cpid="2">Military Grade Composite</li>
-          <li class="lc" ng-class="{active: ship.bulkheads.id=='3'}" cpid="3">Mirrored Surface Composite</li>
-          <li class="lc" ng-class="{active: ship.bulkheads.id=='4'}" cpid="4">Reactive Surface Composite</li>
+          <li class="lc" ng-class="{active: ship.bulkheads.id=='0'}" cpid="0" translate="Lightweight Alloy"></li>
+          <li class="lc" ng-class="{active: ship.bulkheads.id=='1'}" cpid="1" translate="Reinforced Alloy"></li>
+          <li class="lc" ng-class="{active: ship.bulkheads.id=='2'}" cpid="2" translate="Military Grade Composite"></li>
+          <li class="lc" ng-class="{active: ship.bulkheads.id=='3'}" cpid="3" translate="Mirrored Surface Composite"></li>
+          <li class="lc" ng-class="{active: ship.bulkheads.id=='4'}" cpid="4" translate="Reactive Surface Composite"></li>
        </ul>
      </div>
    </div>
    <div class="slot" ng-click="selectSlot($event, pp)" ng-class="{selected: selectedSlot==pp}">
-      <div class="details">
+      <div class="details" ng-class="{warning: pp.c.pGen < ship.powerRetracted}">
        <div class="sz">{{::pp.maxClass}}</div>
-        <div class="l">{{pp.id}} Power Plant</div>
-        <div class="r">{{pp.c.mass}} <u>T</u></div>
+        <div class="l">{{pp.id}} {{'pp' | translate}}</div>
+        <div class="r">{{pp.c.mass}} <u translate>T</u></div>
        <div class="cb"></div>
-        <div class="l">Efficiency: {{pp.c.eff}}</div>
-        <div class="l">Power: {{pp.c.pGen}} <u>MW</u></div>
+        <div class="l cap">{{'efficiency' | translate}}: {{pp.c.eff}}</div>
+        <div class="l cap">{{'power' | translate}}: {{pp.c.pGen}} <u translate>MW</u></div>
      </div>
-      <div component-select class="select" s="pp" opts="availCS.common[0]" ng-if="selectedSlot==pp" ng-click="select('c',pp,$event)"></div>
+      <div component-select class="select" s="pp" warning="ppWarning" opts="availCS.common[0]" ng-if="selectedSlot==pp" ng-click="select('c',pp,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, th)" ng-class="{selected: selectedSlot==th}">
-      <div class="details">
+      <div class="details"  ng-class="{'warning': th.c.maxmass < ship.ladenMass}">
        <div class="sz">{{::th.maxClass}}</div>
-        <div class="l">{{th.id}} Thrusters</div>
-        <div class="r">{{th.c.mass}} <u>T</u></div>
+        <div class="l">{{th.id}} {{'t' | translate}}</div>
+        <div class="r">{{th.c.mass}} <u translate>T</u></div>
        <div class="cb"></div>
-        <div class="l">Optimal Mass: {{th.c.optmass}} <u>T</u></div>
-        <div class="l">Max Mass: {{th.c.maxmass}} <u>T</u></div>
+        <div class="l">{{'optimal mass' | translate}}: {{th.c.optmass}} <u translate>T</u></div>
+        <div class="l">{{'max mass' | translate}}: {{th.c.maxmass}} <u translate>T</u></div>
      </div>
-      <div component-select class="select" s="th" mass="ship.unladenMass" opts="availCS.common[1]" ng-if="selectedSlot==th" ng-click="select('c',th,$event)"></div>
+      <div component-select class="select" s="th" mass="ship.ladenMass" opts="availCS.common[1]" ng-if="selectedSlot==th" ng-click="select('c',th,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, fsd)" ng-class="{selected: selectedSlot==fsd}">
      <div class="details">
        <div class="sz">{{::fsd.maxClass}}</div>
-        <div class="l">{{fsd.id}} Frame Shift Drive</div>
-        <div class="r cr">{{fsd.c.mass}} <u>T</u></div>
+        <div class="l">{{fsd.id}} {{'fd' | translate}}</div>
+        <div class="r cr">{{fsd.c.mass}} <u translate>T</u></div>
        <div class="cb"></div>
-        <div class="l">Optimal Mass: {{fsd.c.optmass}} <u>T</u></div>
-        <div class="l">Max Fuel: {{fsd.c.maxfuel}} <u>T</u></div>
+        <div class="l cap">{{'optimal mass' | translate}}: {{fsd.c.optmass}} <u translate>T</u></div>
+        <div class="l cap">{{'max' | translate}} {{'fuel' | translate}}: {{fsd.c.maxfuel}} <u translate>T</u></div>
      </div>
      <div component-select class="select" s="fsd" opts="availCS.common[2]" ng-if="selectedSlot==fsd" ng-click="select('c',fsd,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, ls)" ng-class="{selected: selectedSlot==ls}">
      <div class="details">
        <div class="sz">{{::ls.maxClass}}</div>
-        <div class="l">{{ls.id}} Life Support</div>
-        <div class="r">{{ls.c.mass}} <u>T</u></div>
+        <div class="l">{{ls.id}} {{'ls' | translate}}</div>
+        <div class="r">{{ls.c.mass}} <u translate>T</u></div>
        <div class="cb"></div>
-        <div class="l">Time: {{fTime(ls.c.time)}}</div>
+        <div class="l cap">{{'time' | translate}}: {{fTime(ls.c.time)}}</div>
      </div>
      <div component-select class="select" s="ls" opts="availCS.common[3]" ng-if="selectedSlot==ls" ng-click="select('c',ls,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, pd)" ng-class="{selected: selectedSlot==pd}">
-      <div class="details">
+      <div class="details" ng-class="{warning: pd.c.enginecapacity < ship.boostEnergy}">
        <div class="sz">{{::pd.maxClass}}</div>
-        <div class="l">{{pd.id}} Power Distributor</div>
-        <div class="r">{{pd.c.mass}} <u>T</u></div>
+        <div class="l">{{pd.id}} {{'pd' | translate}}</div>
+        <div class="r">{{pd.c.mass}} <u translate>T</u></div>
        <div class="cb"></div>
-        <div class="l">WEP: {{pd.c.weaponcapacity}} <u>MJ</u> / {{pd.c.weaponrecharge}} <u>MW</u></div>
-        <div class="l">SYS: {{pd.c.systemcapacity}} <u>MJ</u> / {{pd.c.systemrecharge}} <u>MW</u></div>
-        <div class="l">ENG: {{pd.c.enginecapacity}} <u>MJ</u> / {{pd.c.enginerecharge}} <u>MW</u></div>
+        <div class="l">{{'WEP' | translate}}: {{pd.c.weaponcapacity}} <u translate>MJ</u> / {{pd.c.weaponrecharge}} <u translate>MW</u></div>
+        <div class="l">{{'SYS' | translate}}: {{pd.c.systemcapacity}} <u translate>MJ</u> / {{pd.c.systemrecharge}} <u translate>MW</u></div>
+        <div class="l">{{'ENG' | translate}}: {{pd.c.enginecapacity}} <u translate>MJ</u> / {{pd.c.enginerecharge}} <u translate>MW</u></div>
      </div>
-      <div component-select class="select" s="pd" opts="availCS.common[4]" ng-if="selectedSlot==pd" ng-click="select('c',pd,$event)"></div>
+      <div component-select class="select" s="pd" warning="pdWarning" opts="availCS.common[4]" ng-if="selectedSlot==pd" ng-click="select('c',pd,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, ss)" ng-class="{selected: selectedSlot==ss}">
      <div class="details">
        <div class="sz">{{::ss.maxClass}}</div>
-        <div class="l">{{ss.id}} Sensors</div>
-        <div class="r">{{ss.c.mass}} <u>T</u></div>
+        <div class="l">{{ss.id}} {{'s' | translate}}</div>
+        <div class="r">{{ss.c.mass}} <u translate>T</u></div>
        <div class="cb"></div>
-        <div class="l">Range: {{ss.c.range}} <u>km</u></div>
+        <div class="l cap">{{'range' | translate}}: {{ss.c.range}} <u translate>km</u></div>
      </div>
      <div component-select class="select" s="ss" opts="availCS.common[5]" ng-if="selectedSlot==ss" ng-click="select('c',ss,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, ft)" ng-class="{selected: selectedSlot==ft}">
      <div class="details">
        <div class="sz">{{::ft.maxClass}}</div>
-        <div class="l">{{ft.id}} Fuel Tank</div>
-        <div class="r">{{ft.c.capacity}} <u>T</u></div>
+        <div class="l">{{ft.id}} {{'ft' | translate}}</div>
+        <div class="r">{{ft.c.capacity}} <u translate>T</u></div>
      </div>
      <div component-select class="select" s="ft" opts="availCS.common[6]" ng-if="selectedSlot==ft" ng-click="select('c',ft,$event)"></div>
    </div>
  </div>

  <div id="internal" class="group">
-    <h1>Internal Compartments</h1>
+    <h1 translate="internal compartments"></h1>
    <div class="slot" ng-repeat="i in ship.internal" ng-click="selectSlot($event, i)" context-menu="select('i', i, $event, 'empty')" ng-class="{selected: selectedSlot==i}">
-      <div slot-internal class="details" slot="i" lbl="GMAP[i.c.grp]" fuel="ship.fuelCapacity"></div>
+      <div slot-internal class="details" slot="i" fuel="ship.fuelCapacity"></div>
      <div class="select" ng-if="selectedSlot==i" ng-click="select('i',i,$event)">
-        <div component-select s="i" groups="availCS.getInts(i.maxClass)"></div>
+        <div component-select s="i" groups="availCS.getInts(i.maxClass, i.eligible)"></div>
      </div>
    </div>
  </div>

  <div id="hardpoints" class="group">
-    <h1>HardPoints</h1>
+    <h1 translate="hardpoints"></h1>
    <div class="slot" ng-repeat="h in ship.hardpoints | filter:{maxClass: '!0'}" ng-click="selectSlot($event, h)"  context-menu="select('h', h, $event, 'empty')"  ng-class="{selected: selectedSlot==h}">
-      <div slot-hardpoint class="details" hp="h" size="HPC[h.maxClass]" lbl="GMAP[h.c.grp]"></div>
+      <div slot-hardpoint class="details" hp="h" size="HPC[h.maxClass]"></div>
      <div class="select" ng-class="{hardpoint: h.maxClass > 0}" ng-if="selectedSlot==h" ng-click="select('h',h,$event)">
        <div component-select s="h" groups="availCS.getHps(h.maxClass)"></div>
      </div>
@@ -187,9 +212,9 @@
  </div>

  <div id="utility" class="group">
-    <h1>Utility Mounts</h1>
+    <h1 translate="utility mounts"></h1>
    <div class="slot" ng-repeat="h in ship.hardpoints | filter:{maxClass: '0'}" ng-click="selectSlot($event, h)"  context-menu="select('h', h, $event, 'empty')"  ng-class="{selected: selectedSlot==h}">
-      <div slot-hardpoint class="details" hp="h" size="HPC[h.maxClass]" lbl="GMAP[h.c.grp]"></div>
+      <div slot-hardpoint class="details" hp="h" size="HPC[h.maxClass]"></div>
      <div class="select" ng-class="{hardpoint: h.maxClass > 0}" ng-if="selectedSlot==h" ng-click="select('h',h,$event)">
        <div component-select s="h" groups="availCS.getHps(h.maxClass)"></div>
      </div>
@@ -200,19 +225,19 @@
    <table style="width:100%">
      <thead>
        <tr class="main">
-          <th colspan="2" class="sortable le" ng-click="sortPwr(cName)">Component</th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr('type')">Type</th>
-          <th style="width:4em;" class="sortable" ng-click="sortPwr('priority')">Pri</th>
-          <th colspan="2" class="sortable" ng-click="sortPwr('c.power')">Pwr</th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusRetracted)">Ret</th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusDeployed)">Dep</th>
+          <th colspan="2" class="sortable le" ng-click="sortPwr(cName)" translate="COMPONENT"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr('type')" translate="TYPE"></th>
+          <th style="width:4em;" class="sortable" ng-click="sortPwr('priority')" translate="PRI"></th>
+          <th colspan="2" class="sortable" ng-click="sortPwr('c.power')" translate="PWR"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusRetracted)" translate="RET"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusDeployed)" translate="DEP"></th>
        </tr>
      </thead>
      <tbody>
        <tr>
-          <td ng-click="togglePwr(c)">{{pp.c.class}}{{pp.c.rating}}</td>
-          <td class="le shorten">Power Plant</td>
-          <td><u>SYS</u></td>
+          <td>{{pp.c.class}}{{pp.c.rating}}</td>
+          <td class="le shorten cap" translate="pp"></td>
+          <td><u translate="SYS"></u></td>
          <td>1</td>
          <td class="ri">{{fPwr(pp.c.pGen)}}</td>
          <td class="ri"><u>100%</u></td>
@@ -220,16 +245,16 @@
          <td></td>
        </tr>
        <tr><td style="line-height:0;" colspan="8"><hr style="margin: 0 0 3px;background: #ff8c0d;border: 0;height: 1px;" /></td></tr>
-        <tr ng-repeat="c in powerList | orderBy:pwrPredicate:pwrDesc" ng-if="c.c.power" ng-class="{disabled:!c.enabled}">
+        <tr class="highlight" ng-repeat="c in powerList | orderBy:pwrPredicate:pwrDesc" ng-if="c.c.power" ng-class="{disabled:!c.enabled}">
          <td style="width:1em;" ng-click="togglePwr(c)">{{c.c.class}}{{c.c.rating}}</td>
-          <td class="le shorten" ng-click="togglePwr(c)" ng-bind="cName(c)"></td>
-          <td ng-click="togglePwr(c)"><u  ng-bind="c.type"></u></td>
+          <td class="le shorten cap" ng-click="togglePwr(c)" ng-bind="cName(c)"></td>
+          <td ng-click="togglePwr(c)"><u ng-bind="c.type | translate"></u></td>
          <td><span ng-click="decPriority(c)" class="flip">&#9658;</span> {{c.priority + 1}} <span ng-click="incPriority(c)">&#9658;</span></td>
          <td class="ri" style="width:3.25em;">{{fPwr(c.c.power)}}</td>
          <td class="ri" style="width:3em;"><u>{{f1Pct(c.c.power/ship.powerAvailable)}}</u></td>
-          <td ng-if="!c.enabled" class="disabled" colspan="2">DISABLED</td>
-          <td ng-if="c.enabled" ng-class="STATUS_CLASS[statusRetracted(c)]">{{STATUS[statusRetracted(c)]}}</td>
-          <td ng-if="c.enabled" ng-class="STATUS_CLASS[statusDeployed(c)]">{{STATUS[statusDeployed(c)]}}</td>
+          <td ng-if="!c.enabled" class="disabled upp" colspan="2" translate="disabled"></td>
+          <td class="upp" ng-if="c.enabled" ng-class="STATUS_CLASS[statusRetracted(c)]">{{STATUS[statusRetracted(c)] | translate}}</td>
+          <td class="upp" ng-if="c.enabled" ng-class="STATUS_CLASS[statusDeployed(c)]">{{STATUS[statusDeployed(c)] | translate}}</td>
        </tr>
      </tbody>
    </table>
@@ -237,46 +262,105 @@
  </div>

  <div class="group half">
-    <table style="width:100%">
+    <table class="tabs">
      <thead>
-        <tr class="main">
-          <th colspan="2" class="sortable le" ng-click="sortCost(cName)">Component</th>
-          <th class="sortable le" ng-click="sortCost('c.cost')">Credits</th>
+        <tr>
+          <th style="width:50%" ng-class="{active: costTab == 'retrofit'}" ng-click="updateCostTab('retrofit')" translate="retrofit costs"></th>
+          <th style="width:50%" ng-class="{active: costTab == 'costs'}" ng-click="updateCostTab('costs')" translate="costs"></th>
        </tr>
      </thead>
-      <tbody>
-        <tr  ng-repeat="c in costList | orderBy:costPredicate:costDesc" ng-if="c.c.cost > 0" ng-class="{disabled:!c.incCost}">
-          <td class="toggleable" style="width:1em;"  ng-click="toggleCost(c)">{{c.c.class}}{{c.c.rating}}</td>
-          <td class="le toggleable shorten" ng-bind="cName(c)"  ng-click="toggleCost(c)"></td>
-          <td class="ri toggleable"  ng-click="toggleCost(c)">{{fCrd(discounts.current.pct * c.c.cost)}} <u>CR</u></td>
-        </tr>
-      </tbody>
    </table>
-    <table class="total">
+
+    <div ng-if="costTab == 'costs'">
+      <table style="width:100%">
+        <thead>
+          <tr class="main">
+            <th colspan="2" class="sortable le" ng-click="sortCost(cName)">
+              {{'component' | translate}}
+              <u class="optional-hide" ng-if="discounts.ship < 1">[{{'ship' | translate }} -{{fRPct(1 - discounts.ship)}}]</u>
+              <u class="optional-hide" ng-if="discounts.components < 1">[{{'components' | translate}} -{{fRPct(1 - discounts.components)}}]</u>
+            </th>
+            <th class="sortable le" ng-click="sortCost('discountedCost')" translate="credits"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr class="highlight" ng-repeat="item in costList | orderBy:costPredicate:costDesc" ng-if="item.c.cost > 0" ng-class="{disabled:!item.incCost}">
+            <td class="toggleable" style="width:1em;"  ng-click="toggleCost(item)">{{item.c.class}}{{item.c.rating}}</td>
+            <td class="le toggleable shorten cap" ng-click="toggleCost(item)">{{cName(item)}}</td>
+            <td class="ri toggleable"  ng-click="toggleCost(item)">{{fCrd(item.discountedCost)}} <u translate>CR</u></td>
+          </tr>
+        </tbody>
+      </table>
+      <table class="total">
        <tr class="ri">
-          <td class="lbl">Total</td>
-          <td>{{fCrd(ship.totalCost * discounts.current.pct)}} <u>CR</u></td>
+          <td class="lbl" translate="total"></td>
+          <td>{{fCrd(ship.totalCost)}} <u translate>CR</u></td>
        </tr>
        <tr class="ri">
-          <td class="lbl">Insurance</td>
-          <td>{{fCrd(ship.totalCost * discounts.current.pct * insurance.current.pct)}} <u>CR</u></td>
+          <td class="lbl" translate="insurance"></td>
+          <td>{{fCrd(ship.totalCost * insurance.current.pct)}} <u translate>CR</u></td>
        </tr>
-    </table>
+      </table>
+    </div>
+
+    <div ng-if="costTab == 'retrofit'">
+      <div class="scroll-x">
+        <table style="width:100%">
+          <thead>
+            <tr class="main">
+              <th colspan="2" class="sortable le" ng-click="sortRetrofit('sellName | translate')" translate="sell"></th>
+              <th colspan="2" class="sortable le" ng-click="sortRetrofit('buyName | translate')" translate="buy"></th>
+              <th class="sortable le" ng-click="sortRetrofit('netCost')">
+                {{'net cost' | translate}} <u class="optional-hide" ng-if="discounts.components < 1">-[{{fRPct(1 - discounts.components)}}]</u>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr ng-if="!retrofitList || retrofitList.length == 0">
+              <td colspan="5" style="padding: 3em 0;" translate="PHRASE_NO_RETROCH"></td>
+            </tr>
+            <tr class="highlight" ng-repeat="item in retrofitList | orderBy:retroPredicate:retroDesc">
+              <td style="width:1em;">{{item.sellClassRating}}</td>
+              <td class="le shorten cap">{{item.sellName | translate}}</td>
+              <td style="width:1em;">{{item.buyClassRating}}</td>
+              <td class="le shorten cap">{{item.buyName | translate}}</td>
+              <td class="ri" ng-class="item.netCost > 0 ? 'warning' : 'secondary-disabled'">{{ fCrd(item.netCost)}} <u translate>CR</u></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <table class="total">
+        <tr class="ri">
+          <td class="lbl" translate="cost"></td>
+          <td colspan="2" ng-class="retrofitTotal > 0 ? 'warning' : 'secondary-disabled'">{{fCrd(retrofitTotal)}} <u translate>CR</u></td>
+        </tr>
+        <tr class="ri">
+          <td class="lbl cap" translate="retrofit from"></td>
+          <td class="cen" style="border-right:none;width: 1em;"><u class="primary-disabled">&#9662;</u></td>
+          <td style="border-left:none;padding:0;">
+            <select style="width: 100%;padding: 0" ng-model="$parent.retrofitBuild" ng-change="setRetrofitBase()" ng-options="name as name for (name, build) in allBuilds[ship.id]">
+              <option value="">{{'Stock' | translate}}</option>
+            </select>
+
+          </td>
+        </tr>
+      </table>
+    </div>
  </div>

  <div class="group half">
-    <h1>Jump Range</h1>
+    <h1 translate="jump range"></h1>
    <div line-chart config="jrChart" series="jrSeries"></div>
  </div>

  <div class="group half">
-    <h1>Total Range</h1>
+    <h1 translate="total range"></h1>
    <div line-chart config="trChart" series="trSeries"></div>
  </div>

  <!-- TODO: Add back in once calcSpeed is dynamic and accurate
  <div class="group third">
-    <h1>Thruster Speed</h1>
+    <h1 translate="speed"></h1>
    <div line-chart config="speedChart" series="speedSeries"></div>
  </div>
  -->
--- a/bower.json
+++ b/bower.json
@@ -21,12 +21,13 @@
  "dependencies": {
    "d3": "~3.5.5",
    "ng-lodash": "~0.2.0",
-    "ui-router-extras": "~0.0.13",
+    "ui-router-extras": "0.0.13",
    "angular-ui-router": "^0.2.15",
    "d3-tip": "~0.6.7",
    "ng-sortable": "~1.2.1",
-    "lz-string": "~1.4.3",
-    "angular": "~1.4.0"
+    "lz-string": "~1.4.4",
+    "angular": "~1.4.0",
+    "angular-translate": "~2.7.2"
  },
  "overrides": {
    "angular": {
@@ -35,6 +36,9 @@
    "angular-ui-router": {
      "main": "release/angular-ui-router.min.js"
    },
+    "angular-translate": {
+      "main": "angular-translate.min.js"
+    },
    "d3": {
      "main": "d3.min.js"
    },
--- a/data/components/bulkheads.json
+++ b/data/components/bulkheads.json
@@ -221,6 +221,80 @@
      "mass": 60
    }
  ],
+  "imperial_eagle": [
+    {
+      "name": "Lightweight Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 0,
+      "mass": 0
+    },
+    {
+      "name": "Reinforced Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 66500,
+      "mass": 4
+    },
+    {
+      "name": "Military Grade Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 222765,
+      "mass": 8
+    },
+    {
+      "name": "Mirrored Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 346555,
+      "mass": 8
+    },
+    {
+      "name": "Reactive Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 372044,
+      "mass": 8
+    }
+  ],
+  "federal_assault_ship": [
+    {
+      "name": "Lightweight Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 0,
+      "mass": 0
+    },
+    {
+      "name": "Reinforced Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 7925682,
+      "mass": 44
+    },
+    {
+      "name": "Military Grade Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 17832784,
+      "mass": 87
+    },
+    {
+      "name": "Mirrored Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 42144814,
+      "mass": 87
+    },
+    {
+      "name": "Reactive Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 46702081,
+      "mass": 87
+    }
+  ],
  "federal_dropship": [
    {
      "name": "Lightweight Alloy",
@@ -258,6 +332,43 @@
      "mass": 87
    }
  ],
+  "federal_gunship": [
+    {
+      "name": "Lightweight Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 0,
+      "mass": 0
+    },
+    {
+      "name": "Reinforced Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 14325688,
+      "mass": 44
+    },
+    {
+      "name": "Military Grade Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 32232788,
+      "mass": 87
+    },
+    {
+      "name": "Mirrored Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost":   76176811,
+      "mass": 87
+    },
+    {
+      "name": "Reactive Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 84414088,
+      "mass": 87
+    }
+  ],
  "python": [
    {
      "name": "Lightweight Alloy",
--- a/data/components/common/frame_shift_drive.json
+++ b/data/components/common/frame_shift_drive.json
@@ -1,6 +1,6 @@
 {
  "6E": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 6,
    "rating": "E",
    "cost": 199747,
@@ -12,7 +12,7 @@
    "fuelpower": 2.6
  },
  "6D": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 6,
    "rating": "D",
    "cost": 599242,
@@ -24,7 +24,7 @@
    "fuelpower": 2.6
  },
  "6C": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 6,
    "rating": "C",
    "cost": 1797726,
@@ -36,7 +36,7 @@
    "fuelpower": 2.6
  },
  "6B": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 6,
    "rating": "B",
    "cost": 5393177,
@@ -48,7 +48,7 @@
    "fuelpower": 2.6
  },
  "6A": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 6,
    "rating": "A",
    "cost": 16179531,
@@ -60,7 +60,7 @@
    "fuelpower": 2.6
  },
  "5E": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 5,
    "rating": "E",
    "cost": 63013,
@@ -72,7 +72,7 @@
    "fuelpower": 2.45
  },
  "5D": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 5,
    "rating": "D",
    "cost": 189036,
@@ -84,7 +84,7 @@
    "fuelpower": 2.45
  },
  "5C": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 5,
    "rating": "C",
    "cost": 567106,
@@ -96,7 +96,7 @@
    "fuelpower": 2.45
  },
  "5B": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 5,
    "rating": "B",
    "cost": 1701318,
@@ -108,7 +108,7 @@
    "fuelpower": 2.45
  },
  "5A": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 5,
    "rating": "A",
    "cost": 5103953,
@@ -120,7 +120,7 @@
    "fuelpower": 2.45
  },
  "4E": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 4,
    "rating": "E",
    "cost": 19878,
@@ -132,7 +132,7 @@
    "fuelpower": 2.3
  },
  "4D": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 4,
    "rating": "D",
    "cost": 59633,
@@ -144,7 +144,7 @@
    "fuelpower": 2.3
  },
  "4C": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 4,
    "rating": "C",
    "cost": 178898,
@@ -156,7 +156,7 @@
    "fuelpower": 2.3
  },
  "4B": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 4,
    "rating": "B",
    "cost": 536693,
@@ -168,7 +168,7 @@
    "fuelpower": 2.3
  },
  "4A": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 4,
    "rating": "A",
    "cost": 1610080,
@@ -180,7 +180,7 @@
    "fuelpower": 2.3
  },
  "3E": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 3,
    "rating": "E",
    "cost": 6271,
@@ -192,7 +192,7 @@
    "fuelpower": 2.15
  },
  "3D": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 3,
    "rating": "D",
    "cost": 18812,
@@ -204,7 +204,7 @@
    "fuelpower": 2.15
  },
  "3C": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 3,
    "rating": "C",
    "cost": 56435,
@@ -216,7 +216,7 @@
    "fuelpower": 2.15
  },
  "3B": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 3,
    "rating": "B",
    "cost": 169304,
@@ -228,7 +228,7 @@
    "fuelpower": 2.15
  },
  "3A": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 3,
    "rating": "A",
    "cost": 507912,
@@ -240,7 +240,7 @@
    "fuelpower": 2.15
  },
  "2E": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 2,
    "rating": "E",
    "cost": 1978,
@@ -252,7 +252,7 @@
    "fuelpower": 2
  },
  "2D": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 2,
    "rating": "D",
    "cost": 5934,
@@ -264,7 +264,7 @@
    "fuelpower": 2
  },
  "2C": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 2,
    "rating": "C",
    "cost": 17803,
@@ -276,7 +276,7 @@
    "fuelpower": 2
  },
  "2B": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 2,
    "rating": "B",
    "cost": 53408,
@@ -288,7 +288,7 @@
    "fuelpower": 2
  },
  "2A": {
-    "grp": "fsd",
+    "grp": "fd",
    "class": 2,
    "rating": "A",
    "cost": 160224,
--- a/data/components/common/power_distributor.json
+++ b/data/components/common/power_distributor.json
@@ -1,562 +1,42 @@
 {
-  "8E": {
-    "grp": "pd",
-    "class": 8,
-    "rating": "E",
-    "cost": 697584,
-    "mass": 160,
-    "power": 0.64,
-    "weaponcapacity": 48,
-    "weaponrecharge": 4.8,
-    "enginecapacity": 32,
-    "enginerecharge": 3.2,
-    "systemcapacity": 32,
-    "systemrecharge": 3.2
-  },
-  "8D": {
-    "grp": "pd",
-    "class": 8,
-    "rating": "D",
-    "cost": 1743961,
-    "mass": 64,
-    "power": 0.72,
-    "weaponcapacity": 54,
-    "weaponrecharge": 5.4,
-    "enginecapacity": 36,
-    "enginerecharge": 3.6,
-    "systemcapacity": 36,
-    "systemrecharge": 3.6
-  },
-  "8C": {
-    "grp": "pd",
-    "class": 8,
-    "rating": "C",
-    "cost": 4359903,
-    "mass": 160,
-    "power": 0.8,
-    "weaponcapacity": 60,
-    "weaponrecharge": 6,
-    "enginecapacity": 40,
-    "enginerecharge": 4,
-    "systemcapacity": 40,
-    "systemrecharge": 4
-  },
-  "8B": {
-    "grp": "pd",
-    "class": 8,
-    "rating": "B",
-    "cost": 10899756,
-    "mass": 256,
-    "power": 0.88,
-    "weaponcapacity": 66,
-    "weaponrecharge": 6.6,
-    "enginecapacity": 44,
-    "enginerecharge": 4.4,
-    "systemcapacity": 44,
-    "systemrecharge": 4.4
-  },
-  "8A": {
-    "grp": "pd",
-    "class": 8,
-    "rating": "A",
-    "cost": 27249391,
-    "mass": 160,
-    "power": 0.96,
-    "weaponcapacity": 72,
-    "weaponrecharge": 7.2,
-    "enginecapacity": 48,
-    "enginerecharge": 4.8,
-    "systemcapacity": 48,
-    "systemrecharge": 4.8
-  },
-  "7E": {
-    "grp": "pd",
-    "class": 7,
-    "rating": "E",
-    "cost": 249137,
-    "mass": 80,
-    "power": 0.59,
-    "weaponcapacity": 41,
-    "weaponrecharge": 4.1,
-    "enginecapacity": 27,
-    "enginerecharge": 2.6,
-    "systemcapacity": 27,
-    "systemrecharge": 2.6
-  },
-  "7D": {
-    "grp": "pd",
-    "class": 7,
-    "rating": "D",
-    "cost": 622843,
-    "mass": 32,
-    "power": 0.67,
-    "weaponcapacity": 46,
-    "weaponrecharge": 4.6,
-    "enginecapacity": 31,
-    "enginerecharge": 3,
-    "systemcapacity": 31,
-    "systemrecharge": 3
-  },
-  "7C": {
-    "grp": "pd",
-    "class": 7,
-    "rating": "C",
-    "cost": 1557108,
-    "mass": 80,
-    "power": 0.74,
-    "weaponcapacity": 51,
-    "weaponrecharge": 5.1,
-    "enginecapacity": 34,
-    "enginerecharge": 3.3,
-    "systemcapacity": 34,
-    "systemrecharge": 3.3
-  },
-  "7B": {
-    "grp": "pd",
-    "class": 7,
-    "rating": "B",
-    "cost": 3892770,
-    "mass": 128,
-    "power": 0.81,
-    "weaponcapacity": 56,
-    "weaponrecharge": 5.6,
-    "enginecapacity": 37,
-    "enginerecharge": 3.6,
-    "systemcapacity": 37,
-    "systemrecharge": 3.6
-  },
-  "7A": {
-    "grp": "pd",
-    "class": 7,
-    "rating": "A",
-    "cost": 9731925,
-    "mass": 80,
-    "power": 0.89,
-    "weaponcapacity": 61,
-    "weaponrecharge": 6.1,
-    "enginecapacity": 41,
-    "enginerecharge": 4,
-    "systemcapacity": 41,
-    "systemrecharge": 4
-  },
-  "6E": {
-    "grp": "pd",
-    "class": 6,
-    "rating": "E",
-    "cost": 88978,
-    "mass": 40,
-    "power": 0.54,
-    "weaponcapacity": 34,
-    "weaponrecharge": 3.4,
-    "enginecapacity": 23,
-    "enginerecharge": 2.2,
-    "systemcapacity": 23,
-    "systemrecharge": 2.2
-  },
-  "6D": {
-    "grp": "pd",
-    "class": 6,
-    "rating": "D",
-    "cost": 222444,
-    "mass": 16,
-    "power": 0.61,
-    "weaponcapacity": 38,
-    "weaponrecharge": 3.9,
-    "enginecapacity": 26,
-    "enginerecharge": 2.4,
-    "systemcapacity": 26,
-    "systemrecharge": 2.4
-  },
-  "6C": {
-    "grp": "pd",
-    "class": 6,
-    "rating": "C",
-    "cost": 556110,
-    "mass": 40,
-    "power": 0.68,
-    "weaponcapacity": 42,
-    "weaponrecharge": 4.3,
-    "enginecapacity": 29,
-    "enginerecharge": 2.7,
-    "systemcapacity": 29,
-    "systemrecharge": 2.7
-  },
-  "6B": {
-    "grp": "pd",
-    "class": 6,
-    "rating": "B",
-    "cost": 1390275,
-    "mass": 64,
-    "power": 0.75,
-    "weaponcapacity": 46,
-    "weaponrecharge": 4.7,
-    "enginecapacity": 32,
-    "enginerecharge": 3,
-    "systemcapacity": 32,
-    "systemrecharge": 3
-  },
-  "6A": {
-    "grp": "pd",
-    "class": 6,
-    "rating": "A",
-    "cost": 3475688,
-    "mass": 40,
-    "power": 0.82,
-    "weaponcapacity": 50,
-    "weaponrecharge": 5.2,
-    "enginecapacity": 35,
-    "enginerecharge": 3.2,
-    "systemcapacity": 35,
-    "systemrecharge": 3.2
-  },
-  "5E": {
-    "grp": "pd",
-    "class": 5,
-    "rating": "E",
-    "cost": 31778,
-    "mass": 20,
-    "power": 0.5,
-    "weaponcapacity": 27,
-    "weaponrecharge": 2.9,
-    "enginecapacity": 19,
-    "enginerecharge": 1.7,
-    "systemcapacity": 19,
-    "systemrecharge": 1.7
-  },
-  "5D": {
-    "grp": "pd",
-    "class": 5,
-    "rating": "D",
-    "cost": 79444,
-    "mass": 8,
-    "power": 0.56,
-    "weaponcapacity": 31,
-    "weaponrecharge": 3.2,
-    "enginecapacity": 22,
-    "enginerecharge": 1.9,
-    "systemcapacity": 22,
-    "systemrecharge": 1.9
-  },
-  "5C": {
-    "grp": "pd",
-    "class": 5,
-    "rating": "C",
-    "cost": 198611,
-    "mass": 20,
-    "power": 0.62,
-    "weaponcapacity": 34,
-    "weaponrecharge": 3.6,
-    "enginecapacity": 24,
-    "enginerecharge": 2.1,
-    "systemcapacity": 24,
-    "systemrecharge": 2.1
-  },
-  "5B": {
-    "grp": "pd",
-    "class": 5,
-    "rating": "B",
-    "cost": 496527,
-    "mass": 32,
-    "power": 0.68,
-    "weaponcapacity": 37,
-    "weaponrecharge": 4,
-    "enginecapacity": 26,
-    "enginerecharge": 2.3,
-    "systemcapacity": 26,
-    "systemrecharge": 2.3
-  },
-  "5A": {
-    "grp": "pd",
-    "class": 5,
-    "rating": "A",
-    "cost": 1241317,
-    "mass": 20,
-    "power": 0.74,
-    "weaponcapacity": 41,
-    "weaponrecharge": 4.3,
-    "enginecapacity": 29,
-    "enginerecharge": 2.5,
-    "systemcapacity": 29,
-    "systemrecharge": 2.5
-  },
-  "4E": {
-    "grp": "pd",
-    "class": 4,
-    "rating": "E",
-    "cost": 11349,
-    "mass": 10,
-    "power": 0.45,
-    "weaponcapacity": 22,
-    "weaponrecharge": 2.3,
-    "enginecapacity": 15,
-    "enginerecharge": 1.3,
-    "systemcapacity": 15,
-    "systemrecharge": 1.3
-  },
-  "4D": {
-    "grp": "pd",
-    "class": 4,
-    "rating": "D",
-    "cost": 28373,
-    "mass": 4,
-    "power": 0.5,
-    "weaponcapacity": 24,
-    "weaponrecharge": 2.6,
-    "enginecapacity": 17,
-    "enginerecharge": 1.4,
-    "systemcapacity": 17,
-    "systemrecharge": 1.4
-  },
-  "4C": {
-    "grp": "pd",
-    "class": 4,
-    "rating": "C",
-    "cost": 70932,
-    "mass": 10,
-    "power": 0.56,
-    "weaponcapacity": 27,
-    "weaponrecharge": 2.9,
-    "enginecapacity": 19,
-    "enginerecharge": 1.6,
-    "systemcapacity": 19,
-    "systemrecharge": 1.6
-  },
-  "4B": {
-    "grp": "pd",
-    "class": 4,
-    "rating": "B",
-    "cost": 177331,
-    "mass": 16,
-    "power": 0.62,
-    "weaponcapacity": 30,
-    "weaponrecharge": 3.2,
-    "enginecapacity": 21,
-    "enginerecharge": 1.8,
-    "systemcapacity": 21,
-    "systemrecharge": 1.8
-  },
-  "4A": {
-    "grp": "pd",
-    "class": 4,
-    "rating": "A",
-    "cost": 443328,
-    "mass": 10,
-    "power": 0.67,
-    "weaponcapacity": 32,
-    "weaponrecharge": 3.5,
-    "enginecapacity": 23,
-    "enginerecharge": 1.9,
-    "systemcapacity": 23,
-    "systemrecharge": 1.9
-  },
-  "3E": {
-    "grp": "pd",
-    "class": 3,
-    "rating": "E",
-    "cost": 4053,
-    "mass": 5,
-    "power": 0.4,
-    "weaponcapacity": 16,
-    "weaponrecharge": 1.8,
-    "enginecapacity": 12,
-    "enginerecharge": 0.9,
-    "systemcapacity": 12,
-    "systemrecharge": 0.9
-  },
-  "3D": {
-    "grp": "pd",
-    "class": 3,
-    "rating": "D",
-    "cost": 10133,
-    "mass": 2,
-    "power": 0.45,
-    "weaponcapacity": 18,
-    "weaponrecharge": 2.1,
-    "enginecapacity": 14,
-    "enginerecharge": 1,
-    "systemcapacity": 14,
-    "systemrecharge": 1
-  },
-  "3C": {
-    "grp": "pd",
-    "class": 3,
-    "rating": "C",
-    "cost": 25333,
-    "mass": 5,
-    "power": 0.5,
-    "weaponcapacity": 20,
-    "weaponrecharge": 2.3,
-    "enginecapacity": 15,
-    "enginerecharge": 1.1,
-    "systemcapacity": 15,
-    "systemrecharge": 1.1
-  },
-  "3B": {
-    "grp": "pd",
-    "class": 3,
-    "rating": "B",
-    "cost": 63333,
-    "mass": 8,
-    "power": 0.55,
-    "weaponcapacity": 22,
-    "weaponrecharge": 2.5,
-    "enginecapacity": 17,
-    "enginerecharge": 1.2,
-    "systemcapacity": 17,
-    "systemrecharge": 1.2
-  },
-  "3A": {
-    "grp": "pd",
-    "class": 3,
-    "rating": "A",
-    "cost": 158331,
-    "mass": 5,
-    "power": 0.6,
-    "weaponcapacity": 24,
-    "weaponrecharge": 2.8,
-    "enginecapacity": 18,
-    "enginerecharge": 1.3,
-    "systemcapacity": 18,
-    "systemrecharge": 1.3
-  },
-  "2E": {
-    "grp": "pd",
-    "class": 2,
-    "rating": "E",
-    "cost": 1448,
-    "mass": 2.5,
-    "power": 0.36,
-    "weaponcapacity": 12,
-    "weaponrecharge": 1.4,
-    "enginecapacity": 10,
-    "enginerecharge": 0.6,
-    "systemcapacity": 10,
-    "systemrecharge": 0.6
-  },
-  "2D": {
-    "grp": "pd",
-    "class": 2,
-    "rating": "D",
-    "cost": 3619,
-    "mass": 1,
-    "power": 0.41,
-    "weaponcapacity": 14,
-    "weaponrecharge": 1.6,
-    "enginecapacity": 11,
-    "enginerecharge": 0.6,
-    "systemcapacity": 11,
-    "systemrecharge": 0.6
-  },
-  "2C": {
-    "grp": "pd",
-    "class": 2,
-    "rating": "C",
-    "cost": 9048,
-    "mass": 2.5,
-    "power": 0.45,
-    "weaponcapacity": 15,
-    "weaponrecharge": 1.8,
-    "enginecapacity": 12,
-    "enginerecharge": 0.7,
-    "systemcapacity": 12,
-    "systemrecharge": 0.7
-  },
-  "2B": {
-    "grp": "pd",
-    "class": 2,
-    "rating": "B",
-    "cost": 22619,
-    "mass": 4,
-    "power": 0.5,
-    "weaponcapacity": 17,
-    "weaponrecharge": 2,
-    "enginecapacity": 13,
-    "enginerecharge": 0.8,
-    "systemcapacity": 13,
-    "systemrecharge": 0.8
-  },
-  "2A": {
-    "grp": "pd",
-    "class": 2,
-    "rating": "A",
-    "cost": 56547,
-    "mass": 2.5,
-    "power": 0.54,
-    "weaponcapacity": 18,
-    "weaponrecharge": 2.2,
-    "enginecapacity": 14,
-    "enginerecharge": 0.8,
-    "systemcapacity": 14,
-    "systemrecharge": 0.8
-  },
-  "1E": {
-    "grp": "pd",
-    "class": 1,
-    "rating": "E",
-    "cost": 517,
-    "mass": 1.3,
-    "power": 0.32,
-    "weaponcapacity": 10,
-    "weaponrecharge": 1.2,
-    "enginecapacity": 8,
-    "enginerecharge": 0.4,
-    "systemcapacity": 8,
-    "systemrecharge": 0.4
-  },
-  "1D": {
-    "grp": "pd",
-    "class": 1,
-    "rating": "D",
-    "cost": 1293,
-    "mass": 0.5,
-    "power": 0.36,
-    "weaponcapacity": 11,
-    "weaponrecharge": 1.4,
-    "enginecapacity": 9,
-    "enginerecharge": 0.5,
-    "systemcapacity": 9,
-    "systemrecharge": 0.5
-  },
-  "1C": {
-    "grp": "pd",
-    "class": 1,
-    "rating": "C",
-    "cost": 3231,
-    "mass": 1.3,
-    "power": 0.4,
-    "weaponcapacity": 12,
-    "weaponrecharge": 1.5,
-    "enginecapacity": 10,
-    "enginerecharge": 0.5,
-    "systemcapacity": 10,
-    "systemrecharge": 0.5
-  },
-  "1B": {
-    "grp": "pd",
-    "class": 1,
-    "rating": "B",
-    "cost": 8078,
-    "mass": 2,
-    "power": 0.44,
-    "weaponcapacity": 13,
-    "weaponrecharge": 1.7,
-    "enginecapacity": 11,
-    "enginerecharge": 0.6,
-    "systemcapacity": 11,
-    "systemrecharge": 0.6
-  },
-  "1A": {
-    "grp": "pd",
-    "class": 1,
-    "rating": "A",
-    "cost": 20195,
-    "mass": 1.3,
-    "power": 0.48,
-    "weaponcapacity": 14,
-    "weaponrecharge": 1.8,
-    "enginecapacity": 12,
-    "enginerecharge": 0.6,
-    "systemcapacity": 12,
-    "systemrecharge": 0.6
-  }
+  "8E": { "grp": "pd", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 0.64, "weaponcapacity": 48, "weaponrecharge": 4.8, "enginecapacity": 32, "enginerecharge": 3.2, "systemcapacity": 32, "systemrecharge": 3.2 },
+  "8D": { "grp": "pd", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 0.72, "weaponcapacity": 54, "weaponrecharge": 5.4, "enginecapacity": 36, "enginerecharge": 3.6, "systemcapacity": 36, "systemrecharge": 3.6 },
+  "8C": { "grp": "pd", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 0.8, "weaponcapacity": 60, "weaponrecharge": 6, "enginecapacity": 40, "enginerecharge": 4, "systemcapacity": 40, "systemrecharge": 4 },
+  "8B": { "grp": "pd", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 0.88, "weaponcapacity": 66, "weaponrecharge": 6.6, "enginecapacity": 44, "enginerecharge": 4.4, "systemcapacity": 44, "systemrecharge": 4.4 },
+  "8A": { "grp": "pd", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 0.96, "weaponcapacity": 72, "weaponrecharge": 7.2, "enginecapacity": 48, "enginerecharge": 4.8, "systemcapacity": 48, "systemrecharge": 4.8 },
+  "7E": { "grp": "pd", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 0.59, "weaponcapacity": 41, "weaponrecharge": 4.1, "enginecapacity": 27, "enginerecharge": 2.6, "systemcapacity": 27, "systemrecharge": 2.6 },
+  "7D": { "grp": "pd", "class": 7, "rating": "D", "cost": 622843, "mass": 32, "power": 0.67, "weaponcapacity": 46, "weaponrecharge": 4.6, "enginecapacity": 31, "enginerecharge": 3, "systemcapacity": 31, "systemrecharge": 3 },
+  "7C": { "grp": "pd", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 0.74, "weaponcapacity": 51, "weaponrecharge": 5.1, "enginecapacity": 34, "enginerecharge": 3.3, "systemcapacity": 34, "systemrecharge": 3.3 },
+  "7B": { "grp": "pd", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 0.81, "weaponcapacity": 56, "weaponrecharge": 5.6, "enginecapacity": 37, "enginerecharge": 3.6, "systemcapacity": 37, "systemrecharge": 3.6 },
+  "7A": { "grp": "pd", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 0.89, "weaponcapacity": 61, "weaponrecharge": 6.1, "enginecapacity": 41, "enginerecharge": 4, "systemcapacity": 41, "systemrecharge": 4 },
+  "6E": { "grp": "pd", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 0.54, "weaponcapacity": 34, "weaponrecharge": 3.4, "enginecapacity": 23, "enginerecharge": 2.2, "systemcapacity": 23, "systemrecharge": 2.2 },
+  "6D": { "grp": "pd", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 0.61, "weaponcapacity": 38, "weaponrecharge": 3.9, "enginecapacity": 26, "enginerecharge": 2.4, "systemcapacity": 26, "systemrecharge": 2.4 },
+  "6C": { "grp": "pd", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.68, "weaponcapacity": 42, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.7, "systemcapacity": 29, "systemrecharge": 2.7 },
+  "6B": { "grp": "pd", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 0.75, "weaponcapacity": 46, "weaponrecharge": 4.7, "enginecapacity": 32, "enginerecharge": 3, "systemcapacity": 32, "systemrecharge": 3 },
+  "6A": { "grp": "pd", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 0.82, "weaponcapacity": 50, "weaponrecharge": 5.2, "enginecapacity": 35, "enginerecharge": 3.2, "systemcapacity": 35, "systemrecharge": 3.2 },
+  "5E": { "grp": "pd", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.5, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.7, "systemcapacity": 19, "systemrecharge": 1.7 },
+  "5D": { "grp": "pd", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 0.56, "weaponcapacity": 31, "weaponrecharge": 3.2, "enginecapacity": 22, "enginerecharge": 1.9, "systemcapacity": 22, "systemrecharge": 1.9 },
+  "5C": { "grp": "pd", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 0.62, "weaponcapacity": 34, "weaponrecharge": 3.6, "enginecapacity": 24, "enginerecharge": 2.1, "systemcapacity": 24, "systemrecharge": 2.1 },
+  "5B": { "grp": "pd", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 0.68, "weaponcapacity": 37, "weaponrecharge": 4, "enginecapacity": 26, "enginerecharge": 2.3, "systemcapacity": 26, "systemrecharge": 2.3 },
+  "5A": { "grp": "pd", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 0.74, "weaponcapacity": 41, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.5, "systemcapacity": 29, "systemrecharge": 2.5 },
+  "4E": { "grp": "pd", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.45, "weaponcapacity": 22, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.3, "systemcapacity": 15, "systemrecharge": 1.3 },
+  "4D": { "grp": "pd", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.5, "weaponcapacity": 24, "weaponrecharge": 2.6, "enginecapacity": 17, "enginerecharge": 1.4, "systemcapacity": 17, "systemrecharge": 1.4 },
+  "4C": { "grp": "pd", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 0.56, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.6, "systemcapacity": 19, "systemrecharge": 1.6 },
+  "4B": { "grp": "pd", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 0.62, "weaponcapacity": 30, "weaponrecharge": 3.2, "enginecapacity": 21, "enginerecharge": 1.8, "systemcapacity": 21, "systemrecharge": 1.8 },
+  "4A": { "grp": "pd", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 0.67, "weaponcapacity": 32, "weaponrecharge": 3.5, "enginecapacity": 23, "enginerecharge": 1.9, "systemcapacity": 23, "systemrecharge": 1.9 },
+  "3E": { "grp": "pd", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.4, "weaponcapacity": 16, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.9, "systemcapacity": 12, "systemrecharge": 0.9 },
+  "3D": { "grp": "pd", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.45, "weaponcapacity": 18, "weaponrecharge": 2.1, "enginecapacity": 14, "enginerecharge": 1, "systemcapacity": 14, "systemrecharge": 1 },
+  "3C": { "grp": "pd", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 0.5, "weaponcapacity": 20, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.1, "systemcapacity": 15, "systemrecharge": 1.1 },
+  "3B": { "grp": "pd", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 0.55, "weaponcapacity": 22, "weaponrecharge": 2.5, "enginecapacity": 17, "enginerecharge": 1.2, "systemcapacity": 17, "systemrecharge": 1.2 },
+  "3A": { "grp": "pd", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 0.6, "weaponcapacity": 24, "weaponrecharge": 2.8, "enginecapacity": 18, "enginerecharge": 1.3, "systemcapacity": 18, "systemrecharge": 1.3 },
+  "2E": { "grp": "pd", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.36, "weaponcapacity": 12, "weaponrecharge": 1.4, "enginecapacity": 10, "enginerecharge": 0.6, "systemcapacity": 10, "systemrecharge": 0.6 },
+  "2D": { "grp": "pd", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.41, "weaponcapacity": 14, "weaponrecharge": 1.6, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 },
+  "2C": { "grp": "pd", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.45, "weaponcapacity": 15, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.7, "systemcapacity": 12, "systemrecharge": 0.7 },
+  "2B": { "grp": "pd", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 0.5, "weaponcapacity": 17, "weaponrecharge": 2, "enginecapacity": 13, "enginerecharge": 0.8, "systemcapacity": 13, "systemrecharge": 0.8 },
+  "2A": { "grp": "pd", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 0.54, "weaponcapacity": 18, "weaponrecharge": 2.2, "enginecapacity": 14, "enginerecharge": 0.8, "systemcapacity": 14, "systemrecharge": 0.8 },
+  "1E": { "grp": "pd", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.32, "weaponcapacity": 10, "weaponrecharge": 1.2, "enginecapacity": 8, "enginerecharge": 0.4, "systemcapacity": 8, "systemrecharge": 0.4 },
+  "1D": { "grp": "pd", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.36, "weaponcapacity": 11, "weaponrecharge": 1.4, "enginecapacity": 9, "enginerecharge": 0.5, "systemcapacity": 9, "systemrecharge": 0.5 },
+  "1C": { "grp": "pd", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.4, "weaponcapacity": 12, "weaponrecharge": 1.5, "enginecapacity": 10, "enginerecharge": 0.5, "systemcapacity": 10, "systemrecharge": 0.5 },
+  "1B": { "grp": "pd", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.44, "weaponcapacity": 13, "weaponrecharge": 1.7, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 },
+  "1A": { "grp": "pd", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.48, "weaponcapacity": 14, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.6, "systemcapacity": 12, "systemrecharge": 0.6 }
 }
--- a/data/components/common/power_plant.json
+++ b/data/components/common/power_plant.json
@@ -1,317 +1,37 @@
 {
-  "8E": {
-    "grp": "pp",
-    "class": 8,
-    "rating": "E",
-    "cost": 2007241,
-    "mass": 160,
-    "pGen": 24,
-    "eff": "F"
-  },
-  "8D": {
-    "grp": "pp",
-    "class": 8,
-    "rating": "D",
-    "cost": 6021722,
-    "mass": 64,
-    "pGen": 27,
-    "eff": "D"
-  },
-  "8C": {
-    "grp": "pp",
-    "class": 8,
-    "rating": "C",
-    "cost": 18065165,
-    "mass": 80,
-    "pGen": 30,
-    "eff": "C"
-  },
-  "8B": {
-    "grp": "pp",
-    "class": 8,
-    "rating": "B",
-    "cost": 54195495,
-    "mass": 128,
-    "pGen": 33,
-    "eff": "C"
-  },
-  "8A": {
-    "grp": "pp",
-    "class": 8,
-    "rating": "A",
-    "cost": 162586486,
-    "mass": 80,
-    "pGen": 36,
-    "eff": "B"
-  },
-  "7E": {
-    "grp": "pp",
-    "class": 7,
-    "rating": "E",
-    "cost": 633199,
-    "mass": 80,
-    "pGen": 20,
-    "eff": "F"
-  },
-  "7D": {
-    "grp": "pp",
-    "class": 7,
-    "rating": "D",
-    "cost": 1899597,
-    "mass": 32,
-    "pGen": 22.5,
-    "eff": "D"
-  },
-  "7C": {
-    "grp": "pp",
-    "class": 7,
-    "rating": "C",
-    "cost": 5698790,
-    "mass": 40,
-    "pGen": 25,
-    "eff": "C"
-  },
-  "7B": {
-    "grp": "pp",
-    "class": 7,
-    "rating": "B",
-    "cost": 17096371,
-    "mass": 64,
-    "pGen": 27.5,
-    "eff": "C"
-  },
-  "7A": {
-    "grp": "pp",
-    "class": 7,
-    "rating": "A",
-    "cost": 51289112,
-    "mass": 40,
-    "pGen": 30,
-    "eff": "B"
-  },
-  "6E": {
-    "grp": "pp",
-    "class": 6,
-    "rating": "E",
-    "cost": 199747,
-    "mass": 40,
-    "pGen": 16.8,
-    "eff": "F"
-  },
-  "6D": {
-    "grp": "pp",
-    "class": 6,
-    "rating": "D",
-    "cost": 599242,
-    "mass": 16,
-    "pGen": 18.9,
-    "eff": "D"
-  },
-  "6C": {
-    "grp": "pp",
-    "class": 6,
-    "rating": "C",
-    "cost": 1797726,
-    "mass": 20,
-    "pGen": 21,
-    "eff": "C"
-  },
-  "6B": {
-    "grp": "pp",
-    "class": 6,
-    "rating": "B",
-    "cost": 5393177,
-    "mass": 32,
-    "pGen": 23.1,
-    "eff": "C"
-  },
-  "6A": {
-    "grp": "pp",
-    "class": 6,
-    "rating": "A",
-    "cost": 16179531,
-    "mass": 20,
-    "pGen": 25.2,
-    "eff": "B"
-  },
-  "5E": {
-    "grp": "pp",
-    "class": 5,
-    "rating": "E",
-    "cost": 63012,
-    "mass": 20,
-    "pGen": 13.6,
-    "eff": "F"
-  },
-  "5D": {
-    "grp": "pp",
-    "class": 5,
-    "rating": "D",
-    "cost": 189035,
-    "mass": 8,
-    "pGen": 15.3,
-    "eff": "D"
-  },
-  "5C": {
-    "grp": "pp",
-    "class": 5,
-    "rating": "C",
-    "cost": 567106,
-    "mass": 10,
-    "pGen": 17,
-    "eff": "C"
-  },
-  "5B": {
-    "grp": "pp",
-    "class": 5,
-    "rating": "B",
-    "cost": 1701318,
-    "mass": 16,
-    "pGen": 18.7,
-    "eff": "C"
-  },
-  "5A": {
-    "grp": "pp",
-    "class": 5,
-    "rating": "A",
-    "cost": 5103953,
-    "mass": 10,
-    "pGen": 20.4,
-    "eff": "B"
-  },
-  "4E": {
-    "grp": "pp",
-    "class": 4,
-    "rating": "E",
-    "cost": 19878,
-    "mass": 10,
-    "pGen": 10.4,
-    "eff": "F"
-  },
-  "4D": {
-    "grp": "pp",
-    "class": 4,
-    "rating": "D",
-    "cost": 59633,
-    "mass": 4,
-    "pGen": 11.7,
-    "eff": "D"
-  },
-  "4C": {
-    "grp": "pp",
-    "class": 4,
-    "rating": "C",
-    "cost": 178898,
-    "mass": 5,
-    "pGen": 13,
-    "eff": "C"
-  },
-  "4B": {
-    "grp": "pp",
-    "class": 4,
-    "rating": "B",
-    "cost": 536693,
-    "mass": 8,
-    "pGen": 14.3,
-    "eff": "C"
-  },
-  "4A": {
-    "grp": "pp",
-    "class": 4,
-    "rating": "A",
-    "cost": 1610080,
-    "mass": 5,
-    "pGen": 15.6,
-    "eff": "B"
-  },
-  "3E": {
-    "grp": "pp",
-    "class": 3,
-    "rating": "E",
-    "cost": 6271,
-    "mass": 5,
-    "pGen": 8,
-    "eff": "F"
-  },
-  "3D": {
-    "grp": "pp",
-    "class": 3,
-    "rating": "D",
-    "cost": 18812,
-    "mass": 2,
-    "pGen": 9,
-    "eff": "D"
-  },
-  "3C": {
-    "grp": "pp",
-    "class": 3,
-    "rating": "C",
-    "cost": 56435,
-    "mass": 2.5,
-    "pGen": 10,
-    "eff": "C"
-  },
-  "3B": {
-    "grp": "pp",
-    "class": 3,
-    "rating": "B",
-    "cost": 169304,
-    "mass": 4,
-    "pGen": 11,
-    "eff": "C"
-  },
-  "3A": {
-    "grp": "pp",
-    "class": 3,
-    "rating": "A",
-    "cost": 507912,
-    "mass": 2.5,
-    "pGen": 12,
-    "eff": "B"
-  },
-  "2E": {
-    "grp": "pp",
-    "class": 2,
-    "rating": "E",
-    "cost": 1978,
-    "mass": 2.5,
-    "pGen": 6.4,
-    "eff": "F"
-  },
-  "2D": {
-    "grp": "pp",
-    "class": 2,
-    "rating": "D",
-    "cost": 5934,
-    "mass": 1,
-    "pGen": 7.2,
-    "eff": "D"
-  },
-  "2C": {
-    "grp": "pp",
-    "class": 2,
-    "rating": "C",
-    "cost": 17803,
-    "mass": 1.3,
-    "pGen": 8,
-    "eff": "C"
-  },
-  "2B": {
-    "grp": "pp",
-    "class": 2,
-    "rating": "B",
-    "cost": 53408,
-    "mass": 2,
-    "pGen": 8.8,
-    "eff": "C"
-  },
-  "2A": {
-    "grp": "pp",
-    "class": 2,
-    "rating": "A",
-    "cost": 160224,
-    "mass": 1.3,
-    "pGen": 9.6,
-    "eff": "B"
-  }
+  "8E":{ "grp": "pp", "class": 8, "rating": "E", "cost": 2007241, "mass": 160, "pGen": 24, "eff": "F" },
+  "8D":{ "grp": "pp", "class": 8, "rating": "D", "cost": 6021722, "mass": 64, "pGen": 27, "eff": "D" },
+  "8C":{ "grp": "pp", "class": 8, "rating": "C", "cost": 18065165, "mass": 80, "pGen": 30, "eff": "C" },
+  "8B":{ "grp": "pp", "class": 8, "rating": "B", "cost": 54195495, "mass": 128, "pGen": 33, "eff": "C" },
+  "8A":{ "grp": "pp", "class": 8, "rating": "A", "cost": 162586486, "mass": 80, "pGen": 36, "eff": "B" },
+  "7E":{ "grp": "pp", "class": 7, "rating": "E", "cost": 633199, "mass": 80, "pGen": 20, "eff": "F" },
+  "7D":{ "grp": "pp", "class": 7, "rating": "D", "cost": 1899597, "mass": 32, "pGen": 22.5, "eff": "D" },
+  "7C":{ "grp": "pp", "class": 7, "rating": "C", "cost": 5698790, "mass": 40, "pGen": 25, "eff": "C" },
+  "7B":{ "grp": "pp", "class": 7, "rating": "B", "cost": 17096371, "mass": 64, "pGen": 27.5, "eff": "C" },
+  "7A":{ "grp": "pp", "class": 7, "rating": "A", "cost": 51289112, "mass": 40, "pGen": 30, "eff": "B" },
+  "6E":{ "grp": "pp", "class": 6, "rating": "E", "cost": 199747, "mass": 40, "pGen": 16.8, "eff": "F" },
+  "6D":{ "grp": "pp", "class": 6, "rating": "D", "cost": 599242, "mass": 16, "pGen": 18.9, "eff": "D" },
+  "6C":{ "grp": "pp", "class": 6, "rating": "C", "cost": 1797726, "mass": 20, "pGen": 21, "eff": "C" },
+  "6B":{ "grp": "pp", "class": 6, "rating": "B", "cost": 5393177, "mass": 32, "pGen": 23.1, "eff": "C" },
+  "6A":{ "grp": "pp", "class": 6, "rating": "A", "cost": 16179531, "mass": 20, "pGen": 25.2, "eff": "B" },
+  "5E":{ "grp": "pp", "class": 5, "rating": "E", "cost": 63012, "mass": 20, "pGen": 13.6, "eff": "F" },
+  "5D":{ "grp": "pp", "class": 5, "rating": "D", "cost": 189035, "mass": 8, "pGen": 15.3, "eff": "D" },
+  "5C":{ "grp": "pp", "class": 5, "rating": "C", "cost": 567106, "mass": 10, "pGen": 17, "eff": "C" },
+  "5B":{ "grp": "pp", "class": 5, "rating": "B", "cost": 1701318, "mass": 16, "pGen": 18.7, "eff": "C" },
+  "5A":{ "grp": "pp", "class": 5, "rating": "A", "cost": 5103953, "mass": 10, "pGen": 20.4, "eff": "B" },
+  "4E":{ "grp": "pp", "class": 4, "rating": "E", "cost": 19878, "mass": 10, "pGen": 10.4, "eff": "F" },
+  "4D":{ "grp": "pp", "class": 4, "rating": "D", "cost": 59633, "mass": 4, "pGen": 11.7, "eff": "D" },
+  "4C":{ "grp": "pp", "class": 4, "rating": "C", "cost": 178898, "mass": 5, "pGen": 13, "eff": "C" },
+  "4B":{ "grp": "pp", "class": 4, "rating": "B", "cost": 536693, "mass": 8, "pGen": 14.3, "eff": "C" },
+  "4A":{ "grp": "pp", "class": 4, "rating": "A", "cost": 1610080, "mass": 5, "pGen": 15.6, "eff": "B" },
+  "3E":{ "grp": "pp", "class": 3, "rating": "E", "cost": 6271, "mass": 5, "pGen": 8, "eff": "F" },
+  "3D":{ "grp": "pp", "class": 3, "rating": "D", "cost": 18812, "mass": 2, "pGen": 9, "eff": "D" },
+  "3C":{ "grp": "pp", "class": 3, "rating": "C", "cost": 56435, "mass": 2.5, "pGen": 10, "eff": "C" },
+  "3B":{ "grp": "pp", "class": 3, "rating": "B", "cost": 169304, "mass": 4, "pGen": 11, "eff": "C" },
+  "3A":{ "grp": "pp", "class": 3, "rating": "A", "cost": 507912, "mass": 2.5, "pGen": 12, "eff": "B" },
+  "2E":{ "grp": "pp", "class": 2, "rating": "E", "cost": 1978, "mass": 2.5, "pGen": 6.4, "eff": "F" },
+  "2D":{ "grp": "pp", "class": 2, "rating": "D", "cost": 5934, "mass": 1, "pGen": 7.2, "eff": "D" },
+  "2C":{ "grp": "pp", "class": 2, "rating": "C", "cost": 17803, "mass": 1.3, "pGen": 8, "eff": "C" },
+  "2B":{ "grp": "pp", "class": 2, "rating": "B", "cost": 53408, "mass": 2, "pGen": 8.8, "eff": "C" },
+  "2A":{ "grp": "pp", "class": 2, "rating": "A", "cost": 160224, "mass": 1.3, "pGen": 9.6, "eff": "B" }
 }
--- a/data/components/common/sensors.json
+++ b/data/components/common/sensors.json
@@ -1,317 +1,43 @@
 {
-  "8E": {
-    "grp": "s",
-    "class": 8,
-    "rating": "E",
-    "cost": 697584,
-    "mass": 160,
-    "power": 0.55,
-    "range": 5
-  },
-  "8D": {
-    "grp": "s",
-    "class": 8,
-    "rating": "D",
-    "cost": 1743961,
-    "mass": 64,
-    "power": 0.62,
-    "range": 6
-  },
-  "8C": {
-    "grp": "s",
-    "class": 8,
-    "rating": "C",
-    "cost": 4359903,
-    "mass": 160,
-    "power": 0.69,
-    "range": 6
-  },
-  "8B": {
-    "grp": "s",
-    "class": 8,
-    "rating": "B",
-    "cost": 10899756,
-    "mass": 256,
-    "power": 1.14,
-    "range": 7
-  },
-  "8A": {
-    "grp": "s",
-    "class": 8,
-    "rating": "A",
-    "cost": 27249391,
-    "mass": 160,
-    "power": 2.07,
-    "range": 8
-  },
-  "6E": {
-    "grp": "s",
-    "class": 6,
-    "rating": "E",
-    "cost": 88978,
-    "mass": 40,
-    "power": 0.4,
-    "range": 5
-  },
-  "6D": {
-    "grp": "s",
-    "class": 6,
-    "rating": "D",
-    "cost": 222444,
-    "mass": 16,
-    "power": 0.45,
-    "range": 5
-  },
-  "6C": {
-    "grp": "s",
-    "class": 6,
-    "rating": "C",
-    "cost": 556110,
-    "mass": 40,
-    "power": 0.5,
-    "range": 6
-  },
-  "6B": {
-    "grp": "s",
-    "class": 6,
-    "rating": "B",
-    "cost": 1390275,
-    "mass": 64,
-    "power": 0.83,
-    "range": 7
-  },
-  "6A": {
-    "grp": "s",
-    "class": 6,
-    "rating": "A",
-    "cost": 3475688,
-    "mass": 40,
-    "power": 1.5,
-    "range": 7
-  },
-  "5E": {
-    "grp": "s",
-    "class": 5,
-    "rating": "E",
-    "cost": 31778,
-    "mass": 20,
-    "power": 0.33,
-    "range": 4.5
-  },
-  "5D": {
-    "grp": "s",
-    "class": 5,
-    "rating": "D",
-    "cost": 79444,
-    "mass": 8,
-    "power": 0.37,
-    "range": 5
-  },
-  "5C": {
-    "grp": "s",
-    "class": 5,
-    "rating": "C",
-    "cost": 198611,
-    "mass": 20,
-    "power": 0.41,
-    "range": 5.5
-  },
-  "5B": {
-    "grp": "s",
-    "class": 5,
-    "rating": "B",
-    "cost": 496527,
-    "mass": 32,
-    "power": 0.68,
-    "range": 6
-  },
-  "5A": {
-    "grp": "s",
-    "class": 5,
-    "rating": "A",
-    "cost": 1241317,
-    "mass": 20,
-    "power": 1.23,
-    "range": 6.5
-  },
-  "4E": {
-    "grp": "s",
-    "class": 4,
-    "rating": "E",
-    "cost": 11349,
-    "mass": 10,
-    "power": 0.27,
-    "range": 4
-  },
-  "4D": {
-    "grp": "s",
-    "class": 4,
-    "rating": "D",
-    "cost": 28373,
-    "mass": 4,
-    "power": 0.31,
-    "range": 5
-  },
-  "4C": {
-    "grp": "s",
-    "class": 4,
-    "rating": "C",
-    "cost": 70932,
-    "mass": 10,
-    "power": 0.34,
-    "range": 6
-  },
-  "4B": {
-    "grp": "s",
-    "class": 4,
-    "rating": "B",
-    "cost": 177331,
-    "mass": 16,
-    "power": 0.56,
-    "range": 6
-  },
-  "4A": {
-    "grp": "s",
-    "class": 4,
-    "rating": "A",
-    "cost": 443328,
-    "mass": 10,
-    "power": 1.02,
-    "range": 7
-  },
-  "3E": {
-    "grp": "s",
-    "class": 3,
-    "rating": "E",
-    "cost": 4053,
-    "mass": 5,
-    "power": 0.22,
-    "range": 4
-  },
-  "3D": {
-    "grp": "s",
-    "class": 3,
-    "rating": "D",
-    "cost": 10133,
-    "mass": 2,
-    "power": 0.25,
-    "range": 4.5
-  },
-  "3C": {
-    "grp": "s",
-    "class": 3,
-    "rating": "C",
-    "cost": 25333,
-    "mass": 5,
-    "power": 0.28,
-    "range": 5
-  },
-  "3B": {
-    "grp": "s",
-    "class": 3,
-    "rating": "B",
-    "cost": 63333,
-    "mass": 8,
-    "power": 0.46,
-    "range": 5.5
-  },
-  "3A": {
-    "grp": "s",
-    "class": 3,
-    "rating": "A",
-    "cost": 158331,
-    "mass": 5,
-    "power": 0.84,
-    "range": 6
-  },
-  "2E": {
-    "grp": "s",
-    "class": 2,
-    "rating": "E",
-    "cost": 1448,
-    "mass": 2.5,
-    "power": 0.18,
-    "range": 4
-  },
-  "2D": {
-    "grp": "s",
-    "class": 2,
-    "rating": "D",
-    "cost": 3619,
-    "mass": 1,
-    "power": 0.21,
-    "range": 4.5
-  },
-  "2C": {
-    "grp": "s",
-    "class": 2,
-    "rating": "C",
-    "cost": 9048,
-    "mass": 2.5,
-    "power": 0.23,
-    "range": 5
-  },
-  "2B": {
-    "grp": "s",
-    "class": 2,
-    "rating": "B",
-    "cost": 22619,
-    "mass": 4,
-    "power": 0.38,
-    "range": 5.5
-  },
-  "2A": {
-    "grp": "s",
-    "class": 2,
-    "rating": "A",
-    "cost": 56547,
-    "mass": 2.5,
-    "power": 0.69,
-    "range": 6
-  },
-  "1E": {
-    "grp": "s",
-    "class": 1,
-    "rating": "E",
-    "cost": 517,
-    "mass": 1.3,
-    "power": 0.16,
-    "range": 4
-  },
-  "1D": {
-    "grp": "s",
-    "class": 1,
-    "rating": "D",
-    "cost": 1293,
-    "mass": 0.5,
-    "power": 0.18,
-    "range": 4.5
-  },
-  "1C": {
-    "grp": "s",
-    "class": 1,
-    "rating": "C",
-    "cost": 3231,
-    "mass": 1.3,
-    "power": 0.2,
-    "range": 5
-  },
-  "1B": {
-    "grp": "s",
-    "class": 1,
-    "rating": "B",
-    "cost": 8078,
-    "mass": 2,
-    "power": 0.33,
-    "range": 5.5
-  },
-  "1A": {
-    "grp": "s",
-    "class": 1,
-    "rating": "A",
-    "cost": 20195,
-    "mass": 1.3,
-    "power": 0.6,
-    "range": 6
-  }
+  "8E": { "grp": "s", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 0.55, "range": 5.12 },
+  "8D": { "grp": "s", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 0.62, "range": 5.76 },
+  "8C": { "grp": "s", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 0.69, "range": 6.4 },
+  "8B": { "grp": "s", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 1.14, "range": 7.04 },
+  "8A": { "grp": "s", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 2.07, "range": 7.68 },
+
+  "6E": { "grp": "s", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 0.4, "range": 4.8 },
+  "6D": { "grp": "s", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 0.45, "range": 5.4 },
+  "6C": { "grp": "s", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.5, "range": 6 },
+  "6B": { "grp": "s", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 0.83, "range": 6.6 },
+  "6A": { "grp": "s", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 1.5, "range": 7.2 },
+
+  "5E": { "grp": "s", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.33, "range": 4.64 },
+  "5D": { "grp": "s", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 0.37, "range": 5.22 },
+  "5C": { "grp": "s", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 0.41, "range": 5.8 },
+  "5B": { "grp": "s", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 0.68, "range": 6.38 },
+  "5A": { "grp": "s", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 1.23, "range": 6.96 },
+
+  "4E": { "grp": "s", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.27, "range": 4.48 },
+  "4D": { "grp": "s", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.31, "range": 5.04 },
+  "4C": { "grp": "s", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 0.34, "range": 5.6 },
+  "4B": { "grp": "s", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 0.56, "range": 6.16 },
+  "4A": { "grp": "s", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.02, "range": 6.72 },
+
+  "3E": { "grp": "s", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.22, "range": 4.32 },
+  "3D": { "grp": "s", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.25, "range": 4.86 },
+  "3C": { "grp": "s", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 0.28, "range": 5.4 },
+  "3B": { "grp": "s", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 0.46, "range": 5.94 },
+  "3A": { "grp": "s", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 0.84, "range": 6.48 },
+
+  "2E": { "grp": "s", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.18, "range": 4.16 },
+  "2D": { "grp": "s", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.21, "range": 4.68 },
+  "2C": { "grp": "s", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.23, "range": 5.2 },
+  "2B": { "grp": "s", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 0.38, "range": 5.72 },
+  "2A": { "grp": "s", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 0.69, "range": 6.24 },
+
+  "1E": { "grp": "s", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.16, "range": 4 },
+  "1D": { "grp": "s", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.18, "range": 4.5 },
+  "1C": { "grp": "s", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.2, "range": 5 },
+  "1B": { "grp": "s", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.33, "range": 5.5 },
+  "1A": { "grp": "s", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.6, "range": 6 }
 }
--- a/data/components/common/thrusters.json
+++ b/data/components/common/thrusters.json
@@ -1,302 +1,32 @@
 {
-  "7E": {
-    "grp": "t",
-    "class": 7,
-    "rating": "E",
-    "cost": 633199,
-    "mass": 80,
-    "power": 6.08,
-    "optmass": 1440,
-    "maxmass": 2160
-  },
-  "7D": {
-    "grp": "t",
-    "class": 7,
-    "rating": "D",
-    "cost": 1899597,
-    "mass": 32,
-    "power": 6.84,
-    "optmass": 1620,
-    "maxmass": 2430
-  },
-  "7C": {
-    "grp": "t",
-    "class": 7,
-    "rating": "C",
-    "cost": 5698790,
-    "mass": 80,
-    "power": 7.6,
-    "optmass": 1800,
-    "maxmass": 2700
-  },
-  "7B": {
-    "grp": "t",
-    "class": 7,
-    "rating": "B",
-    "cost": 17096371,
-    "mass": 128,
-    "power": 8.36,
-    "optmass": 1980,
-    "maxmass": 2970
-  },
-  "7A": {
-    "grp": "t",
-    "class": 7,
-    "rating": "A",
-    "cost": 51289112,
-    "mass": 80,
-    "power": 9.12,
-    "optmass": 2160,
-    "maxmass": 3240
-  },
-  "6E": {
-    "grp": "t",
-    "class": 6,
-    "rating": "E",
-    "cost": 199747,
-    "mass": 40,
-    "power": 5.04,
-    "optmass": 960,
-    "maxmass": 1440
-  },
-  "6D": {
-    "grp": "t",
-    "class": 6,
-    "rating": "D",
-    "cost": 599242,
-    "mass": 16,
-    "power": 5.67,
-    "optmass": 1080,
-    "maxmass": 1620
-  },
-  "6C": {
-    "grp": "t",
-    "class": 6,
-    "rating": "C",
-    "cost": 1797726,
-    "mass": 40,
-    "power": 6.3,
-    "optmass": 1200,
-    "maxmass": 1800
-  },
-  "6B": {
-    "grp": "t",
-    "class": 6,
-    "rating": "B",
-    "cost": 5393177,
-    "mass": 64,
-    "power": 6.93,
-    "optmass": 1320,
-    "maxmass": 1980
-  },
-  "6A": {
-    "grp": "t",
-    "class": 6,
-    "rating": "A",
-    "cost": 16179531,
-    "mass": 40,
-    "power": 7.56,
-    "optmass": 1440,
-    "maxmass": 2160
-  },
-  "5E": {
-    "grp": "t",
-    "class": 5,
-    "rating": "E",
-    "cost": 63012,
-    "mass": 20,
-    "power": 4.08,
-    "optmass": 560,
-    "maxmass": 840
-  },
-  "5D": {
-    "grp": "t",
-    "class": 5,
-    "rating": "D",
-    "cost": 189035,
-    "mass": 8,
-    "power": 4.59,
-    "optmass": 630,
-    "maxmass": 945
-  },
-  "5C": {
-    "grp": "t",
-    "class": 5,
-    "rating": "C",
-    "cost": 567106,
-    "mass": 20,
-    "power": 5.1,
-    "optmass": 700,
-    "maxmass": 1050
-  },
-  "5B": {
-    "grp": "t",
-    "class": 5,
-    "rating": "B",
-    "cost": 1701318,
-    "mass": 32,
-    "power": 5.61,
-    "optmass": 770,
-    "maxmass": 1155
-  },
-  "5A": {
-    "grp": "t",
-    "class": 5,
-    "rating": "A",
-    "cost": 5103953,
-    "mass": 20,
-    "power": 6.12,
-    "optmass": 840,
-    "maxmass": 1260
-  },
-  "4E": {
-    "grp": "t",
-    "class": 4,
-    "rating": "E",
-    "cost": 19878,
-    "mass": 10,
-    "power": 3.82,
-    "optmass": 280,
-    "maxmass": 420
-  },
-  "4D": {
-    "grp": "t",
-    "class": 4,
-    "rating": "D",
-    "cost": 59633,
-    "mass": 4,
-    "power": 3.69,
-    "optmass": 315,
-    "maxmass": 473
-  },
-  "4C": {
-    "grp": "t",
-    "class": 4,
-    "rating": "C",
-    "cost": 178898,
-    "mass": 10,
-    "power": 4.1,
-    "optmass": 350,
-    "maxmass": 525
-  },
-  "4B": {
-    "grp": "t",
-    "class": 4,
-    "rating": "B",
-    "cost": 536693,
-    "mass": 16,
-    "power": 4.51,
-    "optmass": 385,
-    "maxmass": 578
-  },
-  "4A": {
-    "grp": "t",
-    "class": 4,
-    "rating": "A",
-    "cost": 1610080,
-    "mass": 10,
-    "power": 4.92,
-    "optmass": 420,
-    "maxmass": 630
-  },
-  "3E": {
-    "grp": "t",
-    "class": 3,
-    "rating": "E",
-    "cost": 6271,
-    "mass": 5,
-    "power": 2.48,
-    "optmass": 80,
-    "maxmass": 120
-  },
-  "3D": {
-    "grp": "t",
-    "class": 3,
-    "rating": "D",
-    "cost": 18812,
-    "mass": 2,
-    "power": 2.79,
-    "optmass": 90,
-    "maxmass": 135
-  },
-  "3C": {
-    "grp": "t",
-    "class": 3,
-    "rating": "C",
-    "cost": 56435,
-    "mass": 5,
-    "power": 3.1,
-    "optmass": 100,
-    "maxmass": 150
-  },
-  "3B": {
-    "grp": "t",
-    "class": 3,
-    "rating": "B",
-    "cost": 169304,
-    "mass": 8,
-    "power": 3.41,
-    "optmass": 110,
-    "maxmass": 165
-  },
-  "3A": {
-    "grp": "t",
-    "class": 3,
-    "rating": "A",
-    "cost": 507912,
-    "mass": 5,
-    "power": 3.72,
-    "optmass": 120,
-    "maxmass": 180
-  },
-  "2E": {
-    "grp": "t",
-    "class": 2,
-    "rating": "E",
-    "cost": 1978,
-    "mass": 2.5,
-    "power": 2,
-    "optmass": 48,
-    "maxmass": 72
-  },
-  "2D": {
-    "grp": "t",
-    "class": 2,
-    "rating": "D",
-    "cost": 5934,
-    "mass": 1,
-    "power": 2.25,
-    "optmass": 54,
-    "maxmass": 81
-  },
-  "2C": {
-    "grp": "t",
-    "class": 2,
-    "rating": "C",
-    "cost": 17803,
-    "mass": 2.5,
-    "power": 2.5,
-    "optmass": 60,
-    "maxmass": 90
-  },
-  "2B": {
-    "grp": "t",
-    "class": 2,
-    "rating": "B",
-    "cost": 53408,
-    "mass": 4,
-    "power": 2.75,
-    "optmass": 66,
-    "maxmass": 99
-  },
-  "2A": {
-    "grp": "t",
-    "class": 2,
-    "rating": "A",
-    "cost": 160224,
-    "mass": 2.5,
-    "power": 3,
-    "optmass": 72,
-    "maxmass": 108
-  }
+  "7E": { "grp": "t", "class": 7, "rating": "E", "cost": 633199, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 },
+  "7D": { "grp": "t", "class": 7, "rating": "D", "cost": 1899597, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 },
+  "7C": { "grp": "t", "class": 7, "rating": "C", "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 },
+  "7B": { "grp": "t", "class": 7, "rating": "B", "cost": 17096371, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 },
+  "7A": { "grp": "t", "class": 7, "rating": "A", "cost": 51289112, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 },
+  "6E": { "grp": "t", "class": 6, "rating": "E", "cost": 199747, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 },
+  "6D": { "grp": "t", "class": 6, "rating": "D", "cost": 599242, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 },
+  "6C": { "grp": "t", "class": 6, "rating": "C", "cost": 1797726, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 },
+  "6B": { "grp": "t", "class": 6, "rating": "B", "cost": 5393177, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 },
+  "6A": { "grp": "t", "class": 6, "rating": "A", "cost": 16179531, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 },
+  "5E": { "grp": "t", "class": 5, "rating": "E", "cost": 63012, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 },
+  "5D": { "grp": "t", "class": 5, "rating": "D", "cost": 189035, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 },
+  "5C": { "grp": "t", "class": 5, "rating": "C", "cost": 567106, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 },
+  "5B": { "grp": "t", "class": 5, "rating": "B", "cost": 1701318, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 },
+  "5A": { "grp": "t", "class": 5, "rating": "A", "cost": 5103953, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 },
+  "4E": { "grp": "t", "class": 4, "rating": "E", "cost": 19878, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 },
+  "4D": { "grp": "t", "class": 4, "rating": "D", "cost": 59633, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 },
+  "4C": { "grp": "t", "class": 4, "rating": "C", "cost": 178898, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 },
+  "4B": { "grp": "t", "class": 4, "rating": "B", "cost": 536693, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 },
+  "4A": { "grp": "t", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 },
+  "3E": { "grp": "t", "class": 3, "rating": "E", "cost": 6271, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 },
+  "3D": { "grp": "t", "class": 3, "rating": "D", "cost": 18812, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 },
+  "3C": { "grp": "t", "class": 3, "rating": "C", "cost": 56435, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 },
+  "3B": { "grp": "t", "class": 3, "rating": "B", "cost": 169304, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 },
+  "3A": { "grp": "t", "class": 3, "rating": "A", "cost": 507912, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 },
+  "2E": { "grp": "t", "class": 2, "rating": "E", "cost": 1978, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 },
+  "2D": { "grp": "t", "class": 2, "rating": "D", "cost": 5934, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 },
+  "2C": { "grp": "t", "class": 2, "rating": "C", "cost": 17803, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 },
+  "2B": { "grp": "t", "class": 2, "rating": "B", "cost": 53408, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 },
+  "2A": { "grp": "t", "class": 2, "rating": "A", "cost": 160224, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 }
 }
--- a/data/components/hardpoints/beam_laser.json
+++ b/data/components/hardpoints/beam_laser.json
@@ -1,5 +1,5 @@
 {
- "Beam Lasers" : [
+  "bl": [
    {
      "id": "0u",
      "grp": "bl",
@@ -161,6 +161,23 @@
      "mjdps" : 5.49,
      "mjeps" : 1.29,
      "thermload": 2
+    },
+    {
+      "id": "b0",
+      "grp": "bl",
+      "name": "Retributor",
+      "class": 1,
+      "rating": "E",
+      "cost": 56145,
+      "mass": 2,
+      "power": 0.69,
+      "mode": "F",
+      "type": "T",
+      "damage": 0,
+      "armourpen": "A",
+      "rof": null,
+      "dps": 3,
+      "thermload": 1
    }
  ]
 }
--- a/data/components/hardpoints/burst_laser.json
+++ b/data/components/hardpoints/burst_laser.json
@@ -1,5 +1,5 @@
 {
-  "Burst Lasers": [
+  "ul": [
    {
      "id": "14",
      "grp": "ul",
@@ -161,6 +161,23 @@
      "mjeps" : 0.63,
      "ssdam" : 2.24,
      "thermload": 1
+    },
+    {
+      "id": "cy",
+      "grp": "ul",
+      "name": "Cytoscrambler",
+      "class": 1,
+      "rating": "F",
+      "cost": 8800,
+      "mass": 2,
+      "power": 0.65,
+      "mode": "F",
+      "type": "T",
+      "damage": 2,
+      "armourpen": "A",
+      "rof": 1.6,
+      "dps": 3,
+      "thermload": 1
    }
  ]
 }
--- a/data/components/hardpoints/cannon.json
+++ b/data/components/hardpoints/cannon.json
@@ -1,5 +1,5 @@
 {
-  "Cannons": [
+  "c": [
    {
      "id": "1q",
      "grp": "c",
@@ -15,7 +15,6 @@
      "rof": 0.4,
      "dps": 5,
      "thermload": 2,
-      "grp": "c",
      "clip": 5,
      "mjdps": 8.13,
      "ssdam" : 37.13,
@@ -36,7 +35,6 @@
      "rof": 0.4,
      "dps": 4,
      "thermload": 2,
-      "grp": "c",
      "clip": 5,
      "mjdps": 10.97,
      "ssdam" : 30.94,
@@ -57,7 +55,6 @@
      "rof": 0.4,
      "dps": 4,
      "thermload": 2,
-      "grp": "c",
      "clip": 5,
      "mjdps": 8.13,
      "ssdam" : 22.28,
@@ -78,7 +75,6 @@
      "rof": 0.4,
      "dps": 4,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 7.95,
      "ssdam" : 21.04,
@@ -99,7 +95,6 @@
      "rof": 0.3,
      "dps": 4,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 3.58,
      "ssdam" : 12.38,
@@ -120,7 +115,6 @@
      "rof": 0.5,
      "dps": 4,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 6.00,
      "ssdam" : 15.47,
@@ -141,7 +135,6 @@
      "rof": 0.5,
      "dps": 3,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 6.24,
      "ssdam" : 15.47,
@@ -162,7 +155,6 @@
      "rof": 0.3,
      "dps": 3,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 2.41,
      "ssdam" : 7.74,
@@ -183,7 +175,6 @@
      "rof": 0.5,
      "dps": 3,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 4.00,
      "ssdam" : 9.59,
@@ -204,7 +195,6 @@
      "rof": 0.5,
      "dps": 3,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 3.80,
      "ssdam" : 8.97,
@@ -225,7 +215,6 @@
      "rof": 0.4,
      "dps": 3,
      "thermload": 1,
-      "grp": "c",
      "clip": 5,
      "mjdps" : 1.35,
      "ssdam" : 4.13,
--- a/data/components/hardpoints/cargo_scanner.json
+++ b/data/components/hardpoints/cargo_scanner.json
@@ -1,5 +1,5 @@
 {
-  "Cargo Scanners": [
+  "cs": [
      {
      "id": "0d",
      "grp": "cs",
--- a/data/components/hardpoints/countermeasures.json
+++ b/data/components/hardpoints/countermeasures.json
@@ -1,5 +1,5 @@
 {
-  "Countermeasures": [
+  "cm": [
    {
      "id": "00",
      "grp": "cm",
--- a/data/components/hardpoints/fragment_cannon.json
+++ b/data/components/hardpoints/fragment_cannon.json
@@ -1,5 +1,5 @@
 {
-  "Fragment Cannons": [
+  "fc": [
    {
      "id": "1t",
      "grp": "fc",
@@ -15,7 +15,6 @@
      "rof": 4.5,
      "dps": 10,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps": 15.19,
      "ssdam" : 28.36,
@@ -36,7 +35,6 @@
      "rof": 4.8,
      "dps": 10,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps" : 12.77,
      "ssdam" : 23.21,
@@ -57,7 +55,6 @@
      "rof": 3.3,
      "dps": 9,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps" : 6.85,
      "ssdam" : 12.89,
@@ -78,7 +75,6 @@
      "rof": 5,
      "dps": 9,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps" : 9.50,
      "ssdam" : 18.05,
@@ -100,7 +96,6 @@
      "rof": 5.3,
      "dps": 9,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "ammo": 30
    },
@@ -119,7 +114,6 @@
      "rof": 3.7,
      "dps": 9,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "ammo": 30
    },
@@ -138,7 +132,6 @@
      "rof": 5.5,
      "dps": 8,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps" : 5.53,
      "ssdam" : 10.31,
@@ -159,7 +152,6 @@
      "rof": 5.8,
      "dps": 7,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps" : 3.58,
      "ssdam" : 6.45,
@@ -180,11 +172,29 @@
      "rof": 4,
      "dps": 6,
      "thermload": 1,
-      "grp": "fc",
      "clip": 3,
      "mjdps" : 2.11,
      "ssdam" : 3.87,
      "ammo": 30
+    },
+    {
+      "id": "pa",
+      "grp": "fc",
+      "name": "Pacifier",
+      "class": 3,
+      "rating": "C",
+      "cost": 1400832,
+      "mass": 8,
+      "power": 1.02,
+      "mode": "F",
+      "type": "K",
+      "damage": 3,
+      "armourpen": "A",
+      "rof": 4.5,
+      "dps": 9,
+      "thermload": 1,
+      "clip": 3,
+      "ammo": 30
    }
  ]
 }
--- a/data/components/hardpoints/frame_shift_wake_scanner.json
+++ b/data/components/hardpoints/frame_shift_wake_scanner.json
@@ -1,5 +1,5 @@
 {
-  "Frame Shift Wake Scanners": [
+  "ws": [
    {
      "id": "0i",
      "grp": "ws",
--- a/data/components/hardpoints/kill_warrant_scanner.json
+++ b/data/components/hardpoints/kill_warrant_scanner.json
@@ -1,5 +1,5 @@
 {
-  "Kill Warrant Scanners": [
+  "kw": [
    {
      "id": "0n",
      "grp": "kw",
--- a/data/components/hardpoints/mine_launcher.json
+++ b/data/components/hardpoints/mine_launcher.json
@@ -1,5 +1,5 @@
 {
-  "Mine Launchers": [
+  "nl": [
    {
      "id": "2j",
      "grp": "nl",
--- a/data/components/hardpoints/mining_laser.json
+++ b/data/components/hardpoints/mining_laser.json
@@ -1,5 +1,5 @@
 {
-  "Mining Lasers": [
+  "ml": [
    {
      "id": "2l",
      "grp": "ml",
@@ -10,10 +10,7 @@
      "power": 0.5,
      "mode": "F",
      "armourpen": "D",
-      "thermload": 3,
-      "grp": "ml",
-      "clip": 1,
-      "ammo": 1
+      "thermload": 3
    },
    {
      "id": "2m",
@@ -25,10 +22,23 @@
      "power": 0.75,
      "mode": "F",
      "armourpen": "D",
-      "thermload": 5,
+      "thermload": 5
+    },
+    {
+      "id": "ml",
      "grp": "ml",
-      "clip": 1,
-      "ammo": 1
+      "name": "Mining Lance",
+      "class": 1,
+      "rating": "D",
+      "cost": 13600,
+      "mass": 2,
+      "power": 0.7,
+      "mode": "F",
+      "type": "T",
+      "damage": 3,
+      "dps": 3,
+      "armourpen": "D",
+      "thermload": 3
    }
  ]
 }
--- a/data/components/hardpoints/missile_rack.json
+++ b/data/components/hardpoints/missile_rack.json
@@ -1,5 +1,5 @@
 {
-  "Missile Racks": [
+  "mr": [
    {
      "id": "2f",
      "grp": "mr",
@@ -15,7 +15,6 @@
      "rof": 2.5,
      "dps": 8,
      "thermload": 3,
-      "grp": "mr",
      "clip": 12,
      "ammo": 24,
      "mjdps": 1.72,
@@ -37,7 +36,6 @@
      "rof": 0.3,
      "dps": 3,
      "thermload": 3,
-      "grp": "mr",
      "clip": 6,
      "ammo": 18,
      "mjdps": 0.57,
@@ -59,7 +57,6 @@
      "rof": 2.5,
      "dps": 8,
      "thermload": 3,
-      "grp": "mr",
      "clip": 8,
      "ammo": 16,
      "mjdps": 1.63,
@@ -81,12 +78,32 @@
      "rof": 0.3,
      "dps": 3,
      "thermload": 3,
-      "grp": "mr",
      "clip": 6,
      "ammo": 6,
      "mjdps": 0.57,
      "ssdam" : 2.58,
      "missile": "S"
+    },
+    {
+      "id": "Ph",
+      "grp": "mr",
+      "name": "Pack-Hound",
+      "class": 2,
+      "rating": "B",
+      "cost": 1000832,
+      "mass": 4,
+      "power": 1.2,
+      "mode": "F",
+      "type": "E",
+      "damage": 3,
+      "armourpen": "F",
+      "rof": 0.5,
+      "dps": 4,
+      "thermload": 3,
+      "grp": "mr",
+      "clip": 12,
+      "ammo": 120,
+      "missile": "S"
    }
  ]
 }
--- a/data/components/hardpoints/multi_cannon.json
+++ b/data/components/hardpoints/multi_cannon.json
@@ -1,5 +1,5 @@
 {
-  "Multi-cannons": [
+  "mc": [
    {
      "id": "26",
      "grp": "mc",
@@ -15,7 +15,6 @@
      "rof": 7,
      "dps": 4,
      "thermload": 1,
-      "grp": "mc",
      "clip": 90,
      "mjdps" : 6.02,
      "ssdam" : 1.20,
@@ -36,7 +35,6 @@
      "rof": 7.5,
      "dps": 4,
      "thermload": 1,
-      "grp": "mc",
      "clip": 90,
      "mjdps" : 5.59,
      "ssdam" : 1.03,
@@ -57,7 +55,6 @@
      "rof": 5.3,
      "dps": 3,
      "thermload": 1,
-      "grp": "mc",
      "clip": 90,
      "mjdps" : 2.15,
      "ssdam" : 0.52,
@@ -78,7 +75,6 @@
      "rof": 8,
      "dps": 3,
      "thermload": 1,
-      "grp": "mc",
      "clip": 90,
      "mjdps" : 3.75,
      "ssdam" : 0.69,
@@ -99,7 +95,6 @@
      "rof": 8.5,
      "dps": 3,
      "thermload": 1,
-      "grp": "mc",
      "clip": 90,
      "mjdps" : 2.03,
      "ssdam" : 0.34,
@@ -120,11 +115,29 @@
      "rof": 6,
      "dps": 2,
      "thermload": 1,
-      "grp": "mc",
      "clip": 90,
      "mjdps" : 1.54,
      "ssdam" : 0.34,
      "ammo": 2100
+    },
+    {
+      "id": "e0",
+      "grp": "mc",
+      "name": "Enforcer",
+      "class": 1,
+      "rating": "F",
+      "cost": 13984,
+      "mass": 2,
+      "power": 0.28,
+      "mode": "F",
+      "type": "K",
+      "damage": 4,
+      "armourpen": "A",
+      "rof": 4.3,
+      "dps": 4,
+      "thermload": 1,
+      "clip": 60,
+      "ammo": 1000
    }
  ]
 }
--- a/data/components/hardpoints/plasma_accelerator.json
+++ b/data/components/hardpoints/plasma_accelerator.json
@@ -1,5 +1,5 @@
 {
-  "Plasma Accelerators": [
+  "pa": [
    {
      "id": "1g",
      "grp": "pa",
@@ -15,7 +15,6 @@
      "rof": 0.3,
      "dps": 4,
      "thermload": 10,
-      "grp": "pa",
      "clip": 5,
      "mjdps" : 6.89,
      "ssdam" : 27.85,
@@ -36,7 +35,6 @@
      "rof": 0.3,
      "dps": 4,
      "thermload": 8,
-      "grp": "pa",
      "clip": 5,
      "mjdps" : 20.98,
      "ssdam" : 92.82,
@@ -57,11 +55,29 @@
      "rof": 0.3,
      "dps": 5,
      "thermload": 10,
-      "grp": "pa",
      "clip": 5,
      "mjdps" : 25.55,
      "ssdam" : 123.76,
      "ammo": 100
+    },
+    {
+      "id": "Ap",
+      "grp": "pa",
+      "name": "Advanced",
+      "class": 3,
+      "rating": "B",
+      "cost": 4119120,
+      "mass": 8,
+      "power": 1.97,
+      "mode": "F",
+      "type": "TK",
+      "damage": 8,
+      "armourpen": "A",
+      "rof": 0.6,
+      "dps": 4,
+      "thermload": 4,
+      "clip": 20,
+      "ammo": 300
    }
  ]
 }
--- a/data/components/hardpoints/pulse_laser.json
+++ b/data/components/hardpoints/pulse_laser.json
@@ -1,5 +1,5 @@
 {
-  "Pulse Lasers": [
+  "pl": [
    {
      "id": "1d",
      "grp": "pl",
@@ -170,6 +170,23 @@
      "mjeps" : 0.51,
      "ssdam" : 1.07,
      "thermload": 1
+    },
+    {
+      "id": "PL",
+      "grp": "pl",
+      "name": "Distruptor",
+      "class": 2,
+      "rating": "E",
+      "cost": 26400,
+      "mass": 4,
+      "power": 0.7,
+      "mode": "F",
+      "type": "T",
+      "damage": 2,
+      "armourpen": "A",
+      "rof": 1.6,
+      "dps": 2,
+      "thermload": 1
    }
  ]
 }
--- a/data/components/hardpoints/rail_gun.json
+++ b/data/components/hardpoints/rail_gun.json
@@ -1,5 +1,5 @@
 {
-  "Rail Guns": [
+  "rg": [
    {
      "id": "29",
      "grp": "rg",
@@ -15,7 +15,6 @@
      "rof": 0.6,
      "dps": 4,
      "thermload": 7,
-      "grp": "rg",
      "clip": 1,
      "mjdps" : 13.75,
      "ssdam" : 24.75,
@@ -36,11 +35,29 @@
      "rof": 0.5,
      "dps": 4,
      "thermload": 10,
-      "grp": "rg",
      "clip": 1,
      "mjdps" : 21.66,
      "ssdam" : 43.32,
      "ammo": 30
+    },
+    {
+      "id": "ih",
+      "grp": "rg",
+      "name": "Imperial Hammer",
+      "class": 2,
+      "rating": "B",
+      "cost": 619200,
+      "mass": 4,
+      "power": 1.63,
+      "mode": "F",
+      "type": "TK",
+      "damage": 5,
+      "armourpen": "A",
+      "rof": 0.6,
+      "dps": 5,
+      "thermload": 3,
+      "clip": 3,
+      "ammo": 90
    }
  ]
 }
--- a/data/components/hardpoints/shield_booster.json
+++ b/data/components/hardpoints/shield_booster.json
@@ -1,5 +1,5 @@
 {
-  "Shield Boosters": [
+  "sb": [
    {
      "id": "08",
      "grp": "sb",
--- a/data/components/hardpoints/torpedo_pylon.json
+++ b/data/components/hardpoints/torpedo_pylon.json
@@ -1,5 +1,5 @@
 {
-  "Torpedo Pylons": [
+  "tp": [
    {
      "id": "2h",
      "grp": "tp",
--- a/data/components/internal/auto_field_maintenance_unit.json
+++ b/data/components/internal/auto_field_maintenance_unit.json
@@ -1,5 +1,5 @@
 {
-  "Auto Field-Maintenance Units": [
+  "am": [
    {
      "id": "1f",
      "grp": "am",
--- a/data/components/internal/cargo_rack.json
+++ b/data/components/internal/cargo_rack.json
@@ -1,76 +1,12 @@
 {
-  "Cargo Racks": [
-    {
-      "id": "07",
-      "grp": "cr",
-      "name": "Cargo Rack (256)",
-      "class": 8,
-      "rating": "E",
-      "cost": 3829866,
-      "capacity": 256
-    },
-    {
-      "id": "06",
-      "grp": "cr",
-      "name": "Cargo Rack (128)",
-      "class": 7,
-      "rating": "E",
-      "cost": 1178420,
-      "capacity": 128
-    },
-    {
-      "id": "05",
-      "grp": "cr",
-      "name": "Cargo Rack (64)",
-      "class": 6,
-      "rating": "E",
-      "cost": 362591,
-      "capacity": 64
-    },
-    {
-      "id": "04",
-      "grp": "cr",
-      "name": "Cargo Rack (32)",
-      "class": 5,
-      "rating": "E",
-      "cost": 111566,
-      "capacity": 32
-    },
-    {
-      "id": "03",
-      "grp": "cr",
-      "name": "Cargo Rack (16)",
-      "class": 4,
-      "rating": "E",
-      "cost": 34328,
-      "capacity": 16
-    },
-    {
-      "id": "02",
-      "grp": "cr",
-      "name": "Cargo Rack (8)",
-      "class": 3,
-      "rating": "E",
-      "cost": 10563,
-      "capacity": 8
-    },
-    {
-      "id": "01",
-      "grp": "cr",
-      "name": "Cargo Rack (4)",
-      "class": 2,
-      "rating": "E",
-      "cost": 3250,
-      "capacity": 4
-    },
-    {
-      "id": "00",
-      "grp": "cr",
-      "name": "Cargo Rack (2)",
-      "class": 1,
-      "rating": "E",
-      "cost": 1000,
-      "capacity": 2
-    }
+  "cr": [
+    { "id": "00", "grp": "cr", "class": 1, "rating": "E", "cost": 1000,     "capacity": 2 },
+    { "id": "01", "grp": "cr", "class": 2, "rating": "E", "cost": 3250,     "capacity": 4 },
+    { "id": "02", "grp": "cr", "class": 3, "rating": "E", "cost": 10563,    "capacity": 8 },
+    { "id": "03", "grp": "cr", "class": 4, "rating": "E", "cost": 34328,    "capacity": 16 },
+    { "id": "04", "grp": "cr", "class": 5, "rating": "E", "cost": 111566,   "capacity": 32 },
+    { "id": "05", "grp": "cr", "class": 6, "rating": "E", "cost": 362591,   "capacity": 64 },
+    { "id": "06", "grp": "cr", "class": 7, "rating": "E", "cost": 1178420,  "capacity": 128 },
+    { "id": "07", "grp": "cr", "class": 8, "rating": "E", "cost": 3829866,  "capacity": 256 }
  ]
 }
--- a/data/components/internal/collector_limpet_controllers.json
+++ b/data/components/internal/collector_limpet_controllers.json
@@ -1,5 +1,5 @@
 {
-  "Collector Limpet Ctrl": [
+  "cc": [
    { "id": "Cf", "grp":"cc", "class":7, "rating":"E", "cost": 437400, "mass": 32.0, "power":0.41, "range":1.36, "maximum": 4, "time":300 },
    { "id": "Cg", "grp":"cc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.55, "range":1.02, "maximum": 4, "time":600 },
    { "id": "Ch", "grp":"cc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range":1.70, "maximum": 4, "time":510 },
--- a/data/components/internal/docking_computer.json
+++ b/data/components/internal/docking_computer.json
@@ -1,5 +1,5 @@
 {
-  "Docking Computers": [
+  "dc": [
    {
      "id": "24",
      "grp": "dc",
--- a/data/components/internal/frame_shift_drive_interdictor.json
+++ b/data/components/internal/frame_shift_drive_interdictor.json
@@ -1,5 +1,5 @@
 {
-  "FSD Interdictors": [
+  "fi": [
    {
      "id": "6p",
      "grp": "fi",
--- a/data/components/internal/fuel_scoops.json
+++ b/data/components/internal/fuel_scoops.json
@@ -1,5 +1,5 @@
 {
-  "Fuel Scoops": [
+  "fs": [
    {
      "id": "3q",
      "grp": "fs",
--- a/data/components/internal/fuel_transfer_limpet_controllers.json
+++ b/data/components/internal/fuel_transfer_limpet_controllers.json
@@ -1,27 +1,27 @@
 {
-  "Fuel Transfer Limpet Ctrl": [
-    { "id": "Ff", "grp":"fx", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":-0.55, "range":1.02, "maximum": 8 },
-    { "id": "Fg", "grp":"fx", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":-0.41, "range":1.36, "maximum": 8 },
-    { "id": "Fh", "grp":"fx", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":-0.69, "range":1.70, "maximum": 8 },
-    { "id": "Fi", "grp":"fx", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":-0.97, "range":2.04, "maximum": 8 },
-    { "id": "Fj", "grp":"fx", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":-0.83, "range":2.38, "maximum": 8 },
+  "fx": [
+    { "id": "Ff", "grp":"fx", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":0.55, "range":1.02, "maximum": 8 },
+    { "id": "Fg", "grp":"fx", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.41, "range":1.36, "maximum": 8 },
+    { "id": "Fh", "grp":"fx", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range":1.70, "maximum": 8 },
+    { "id": "Fi", "grp":"fx", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.97, "range":2.04, "maximum": 8 },
+    { "id": "Fj", "grp":"fx", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":0.83, "range":2.38, "maximum": 8 },

-    { "id": "Fa", "grp":"fx", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":-0.40, "range":0.78, "maximum": 4 },
-    { "id": "Fb", "grp":"fx", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":-0.30, "range":1.04, "maximum": 4 },
-    { "id": "Fc", "grp":"fx", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":-0.50, "range":1.30, "maximum": 4 },
-    { "id": "Fd", "grp":"fx", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":-0.97, "range":1.56, "maximum": 4 },
-    { "id": "Fe", "grp":"fx", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":-0.60, "range":1.82, "maximum": 4 },
+    { "id": "Fa", "grp":"fx", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":0.40, "range":0.78, "maximum": 4 },
+    { "id": "Fb", "grp":"fx", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.30, "range":1.04, "maximum": 4 },
+    { "id": "Fc", "grp":"fx", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range":1.30, "maximum": 4 },
+    { "id": "Fd", "grp":"fx", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.97, "range":1.56, "maximum": 4 },
+    { "id": "Fe", "grp":"fx", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":0.60, "range":1.82, "maximum": 4 },

-    { "id": "F5", "grp":"fx", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":-0.27, "range":0.66, "maximum": 2 },
-    { "id": "F6", "grp":"fx", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":-0.20, "range":0.88, "maximum": 2 },
-    { "id": "F7", "grp":"fx", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":-0.34, "range":1.10, "maximum": 2 },
-    { "id": "F8", "grp":"fx", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":-0.48, "range":1.32, "maximum": 2 },
-    { "id": "F9", "grp":"fx", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":-0.41, "range":1.54, "maximum": 2 },
+    { "id": "F5", "grp":"fx", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":0.27, "range":0.66, "maximum": 2 },
+    { "id": "F6", "grp":"fx", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.20, "range":0.88, "maximum": 2 },
+    { "id": "F7", "grp":"fx", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range":1.10, "maximum": 2 },
+    { "id": "F8", "grp":"fx", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.48, "range":1.32, "maximum": 2 },
+    { "id": "F9", "grp":"fx", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":0.41, "range":1.54, "maximum": 2 },

-    { "id": "F0", "grp":"fx", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":-0.18, "range":0.60, "maximum": 1 },
-    { "id": "F1", "grp":"fx", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":-0.14, "range":0.80, "maximum": 1 },
-    { "id": "F2", "grp":"fx", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":-0.23, "range":1.00, "maximum": 1 },
-    { "id": "F3", "grp":"fx", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":-0.32, "range":1.20, "maximum": 1 },
-    { "id": "F4", "grp":"fx", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":-0.28, "range":1.40, "maximum": 1 }
+    { "id": "F0", "grp":"fx", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":0.18, "range":0.60, "maximum": 1 },
+    { "id": "F1", "grp":"fx", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.14, "range":0.80, "maximum": 1 },
+    { "id": "F2", "grp":"fx", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range":1.00, "maximum": 1 },
+    { "id": "F3", "grp":"fx", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.32, "range":1.20, "maximum": 1 },
+    { "id": "F4", "grp":"fx", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":0.28, "range":1.40, "maximum": 1 }
  ]
 }
--- a/data/components/internal/hatch_breaker_limpet_controller.json
+++ b/data/components/internal/hatch_breaker_limpet_controller.json
@@ -1,5 +1,5 @@
 {
-  "Hatch Breaker Limpet Ctrl": [
+  "hb": [
    {
      "id": "7d",
      "grp": "hb",
--- a/data/components/internal/hull_reinforcement_package.json
+++ b/data/components/internal/hull_reinforcement_package.json
@@ -1,5 +1,5 @@
 {
-  "Hull Reinforcement Packages": [
+  "hr": [
    {
      "id": "2e",
      "grp": "hr",
--- a/data/components/internal/internal_fuel_tank.json
+++ b/data/components/internal/internal_fuel_tank.json
@@ -1,52 +1,12 @@
 {
-  "Fuel Tank": [
-    {
-      "id": "f1",
-      "grp": "ft",
-      "class": 1,
-      "rating": "C",
-      "cost": 1000,
-      "capacity": 2
-    },
-    {
-      "id": "f2",
-      "grp": "ft",
-      "class": 2,
-      "rating": "C",
-      "cost": 3750,
-      "capacity": 4
-    },
-    {
-      "id": "f3",
-      "grp": "ft",
-      "class": 3,
-      "rating": "C",
-      "cost": 7063,
-      "capacity": 8
-    },
-    {
-      "id": "f4",
-      "grp": "ft",
-      "class": 4,
-      "rating": "C",
-      "cost": 24734,
-      "capacity": 16
-    },
-    {
-      "id": "f5",
-      "grp": "ft",
-      "class": 5,
-      "rating": "C",
-      "cost": 97754,
-      "capacity": 32
-    },
-    {
-      "id": "f6",
-      "grp": "ft",
-      "class": 6,
-      "rating": "C",
-      "cost": 341577,
-      "capacity": 64
-    }
+  "ft": [
+    { "id": "f1", "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "capacity": 2 },
+    { "id": "f2", "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "capacity": 4 },
+    { "id": "f3", "grp": "ft", "class": 3, "rating": "C", "cost": 7063, "capacity": 8 },
+    { "id": "f4", "grp": "ft", "class": 4, "rating": "C", "cost": 24734, "capacity": 16 },
+    { "id": "f5", "grp": "ft", "class": 5, "rating": "C", "cost": 97754, "capacity": 32 },
+    { "id": "f6", "grp": "ft", "class": 6, "rating": "C", "cost": 341577, "capacity": 64 },
+    { "id": "f7", "grp": "ft", "class": 7, "rating": "C", "cost": 1780900, "capacity": 128 },
+    { "id": "f8", "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "capacity": 256 }
  ]
 }
--- a/data/components/internal/pristmatic_shield_generator.json
+++ b/data/components/internal/pristmatic_shield_generator.json
@@ -0,0 +1,12 @@
+{
+  "psg": [
+    { "id": "p6", "grp": "psg", "class": 1, "rating": "A", "cost": 132195,    "mass": 2.5, "power": 2.52, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p5", "grp": "psg", "class": 2, "rating": "A", "cost": 240336,    "mass": 5,   "power": 3.15, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p4", "grp": "psg", "class": 3, "rating": "A", "cost": 761868,    "mass": 10,  "power": 3.78, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p3", "grp": "psg", "class": 4, "rating": "A", "cost": 2415120,   "mass": 20,  "power": 4.62, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p2", "grp": "psg", "class": 5, "rating": "A", "cost": 7655930,   "mass": 40,  "power": 5.46, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p1", "grp": "psg", "class": 6, "rating": "A", "cost": 24269297,  "mass": 80,  "power": 6.51, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p0", "grp": "psg", "class": 7, "rating": "A", "cost": 76933668,  "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
+    { "id": "p7", "grp": "psg", "class": 8, "rating": "A", "cost": 243879729, "mass": 320, "power": 8.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }
+  ]
+}
--- a/data/components/internal/prospector_limpet_controllers.json
+++ b/data/components/internal/prospector_limpet_controllers.json
@@ -1,27 +1,27 @@
 {
-  "Prospector Limpet Ctrl": [
-    { "id": "Pf", "grp":"pc", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":-0.55, "range": 5.10, "maximum": 8 },
-    { "id": "Pg", "grp":"pc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":-0.41, "range": 6.80, "maximum": 8 },
-    { "id": "Ph", "grp":"pc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":-0.69, "range": 8.50, "maximum": 8 },
-    { "id": "Pi", "grp":"pc", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":-0.97, "range":10.20, "maximum": 8 },
-    { "id": "Pj", "grp":"pc", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":-0.83, "range":11.90, "maximum": 8 },
+  "pc": [
+    { "id": "Pf", "grp":"pc", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":0.55, "range": 5.10, "maximum": 8 },
+    { "id": "Pg", "grp":"pc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.41, "range": 6.80, "maximum": 8 },
+    { "id": "Ph", "grp":"pc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range": 8.50, "maximum": 8 },
+    { "id": "Pi", "grp":"pc", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.97, "range":10.20, "maximum": 8 },
+    { "id": "Pj", "grp":"pc", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":0.83, "range":11.90, "maximum": 8 },

-    { "id": "Pa", "grp":"pc", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":-0.40, "range": 3.90, "maximum": 4 },
-    { "id": "Pb", "grp":"pc", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":-0.30, "range": 5.20, "maximum": 4 },
-    { "id": "Pc", "grp":"pc", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":-0.50, "range": 6.50, "maximum": 4 },
-    { "id": "Pd", "grp":"pc", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":-0.97, "range": 7.80, "maximum": 4 },
-    { "id": "Pe", "grp":"pc", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":-0.60, "range": 9.10, "maximum": 4 },
+    { "id": "Pa", "grp":"pc", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":0.40, "range": 3.90, "maximum": 4 },
+    { "id": "Pb", "grp":"pc", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.30, "range": 5.20, "maximum": 4 },
+    { "id": "Pc", "grp":"pc", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range": 6.50, "maximum": 4 },
+    { "id": "Pd", "grp":"pc", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.97, "range": 7.80, "maximum": 4 },
+    { "id": "Pe", "grp":"pc", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":0.60, "range": 9.10, "maximum": 4 },

-    { "id": "P5", "grp":"pc", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":-0.27, "range": 3.30, "maximum": 2 },
-    { "id": "P6", "grp":"pc", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":-0.20, "range": 4.40, "maximum": 2 },
-    { "id": "P7", "grp":"pc", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":-0.34, "range": 5.50, "maximum": 2 },
-    { "id": "P8", "grp":"pc", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":-0.48, "range": 6.60, "maximum": 2 },
-    { "id": "P9", "grp":"pc", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":-0.41, "range": 7.70, "maximum": 2 },
+    { "id": "P5", "grp":"pc", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":0.27, "range": 3.30, "maximum": 2 },
+    { "id": "P6", "grp":"pc", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.20, "range": 4.40, "maximum": 2 },
+    { "id": "P7", "grp":"pc", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range": 5.50, "maximum": 2 },
+    { "id": "P8", "grp":"pc", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.48, "range": 6.60, "maximum": 2 },
+    { "id": "P9", "grp":"pc", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":0.41, "range": 7.70, "maximum": 2 },

-    { "id": "P0", "grp":"pc", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":-0.18, "range": 3.00, "maximum": 1 },
-    { "id": "P1", "grp":"pc", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":-0.14, "range": 4.00, "maximum": 1 },
-    { "id": "P2", "grp":"pc", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":-0.23, "range": 5.00, "maximum": 1 },
-    { "id": "P3", "grp":"pc", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":-0.32, "range": 6.00, "maximum": 1 },
-    { "id": "P4", "grp":"pc", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":-0.28, "range": 7.00, "maximum": 1 }
+    { "id": "P0", "grp":"pc", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":0.18, "range": 3.00, "maximum": 1 },
+    { "id": "P1", "grp":"pc", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.14, "range": 4.00, "maximum": 1 },
+    { "id": "P2", "grp":"pc", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range": 5.00, "maximum": 1 },
+    { "id": "P3", "grp":"pc", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.32, "range": 6.00, "maximum": 1 },
+    { "id": "P4", "grp":"pc", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":0.28, "range": 7.00, "maximum": 1 }
  ]
 }
--- a/data/components/internal/refinery.json
+++ b/data/components/internal/refinery.json
@@ -1,5 +1,5 @@
 {
-  "Refineries": [
+  "rf": [
    {
      "id": "23",
      "grp": "rf",
--- a/data/components/internal/scanners.json
+++ b/data/components/internal/scanners.json
@@ -1,9 +1,9 @@
 {
-  "Scanners": [
+  "sc": [
    {
      "id": "2f",
      "grp": "sc",
-      "name": "Adv. Discovery Scanner",
+      "name": "Advanced Discovery Scanner",
      "class": 1,
      "rating": "C",
      "cost": 1545000,
@@ -14,7 +14,7 @@
    {
      "id": "2g",
      "grp": "sc",
-      "name": "Inter. Discovery Scanner",
+      "name": "Intermediate Discovery Scanner",
      "class": 1,
      "rating": "D",
      "cost": 505000,
--- a/data/components/internal/shield_cell_bank.json
+++ b/data/components/internal/shield_cell_bank.json
@@ -1,484 +1,44 @@
 {
-  "Shield Cell Banks": [
-    {
-      "id": "65",
-      "grp": "scb",
-      "class": 8,
-      "rating": "E",
-      "cost": 697584,
-      "mass": 160,
-      "power": 1.44,
-      "cells": 5,
-      "rechargeRating": "C",
-      "recharge": 0
-    },
-    {
-      "id": "64",
-      "grp": "scb",
-      "class": 8,
-      "rating": "D",
-      "cost": 1743961,
-      "mass": 64,
-      "power": 1.92,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 0
-    },
-    {
-      "id": "63",
-      "grp": "scb",
-      "class": 8,
-      "rating": "C",
-      "cost": 4359903,
-      "mass": 160,
-      "power": 2.4,
-      "cells": 4,
-      "rechargeRating": "B",
-      "recharge": 0
-    },
-    {
-      "id": "62",
-      "grp": "scb",
-      "class": 8,
-      "rating": "B",
-      "cost": 10899756,
-      "mass": 256,
-      "power": 2.88,
-      "cells": 5,
-      "rechargeRating": "A",
-      "recharge": 0
-    },
-    {
-      "id": "61",
-      "grp": "scb",
-      "class": 8,
-      "rating": "A",
-      "cost": 27249391,
-      "mass": 160,
-      "power": 3.36,
-      "cells": 4,
-      "rechargeRating": "A",
-      "recharge": 0
-    },
-    {
-      "id": "60",
-      "grp": "scb",
-      "class": 7,
-      "rating": "E",
-      "cost": 249137,
-      "mass": 80,
-      "power": 1.24,
-      "cells": 5,
-      "rechargeRating": "D",
-      "recharge": 97
-    },
-    {
-      "id": "5v",
-      "grp": "scb",
-      "class": 7,
-      "rating": "D",
-      "cost": 622843,
-      "mass": 32,
-      "power": 1.66,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 130
-    },
-    {
-      "id": "5u",
-      "grp": "scb",
-      "class": 7,
-      "rating": "C",
-      "cost": 1557108,
-      "mass": 80,
-      "power": 2.07,
-      "cells": 4,
-      "rechargeRating": "B",
-      "recharge": 163
-    },
-    {
-      "id": "5t",
-      "grp": "scb",
-      "class": 7,
-      "rating": "B",
-      "cost": 3892770,
-      "mass": 128,
-      "power": 2.48,
-      "cells": 5,
-      "rechargeRating": "B",
-      "recharge": 197
-    },
-    {
-      "id": "5s",
-      "grp": "scb",
-      "class": 7,
-      "rating": "A",
-      "cost": 9731925,
-      "mass": 80,
-      "power": 2.9,
-      "cells": 4,
-      "rechargeRating": "A",
-      "recharge": 230
-    },
-    {
-      "id": "5r",
-      "grp": "scb",
-      "class": 6,
-      "rating": "E",
-      "cost": 88978,
-      "mass": 40,
-      "power": 1.06,
-      "cells": 5,
-      "rechargeRating": "D",
-      "recharge": 92
-    },
-    {
-      "id": "5q",
-      "grp": "scb",
-      "class": 6,
-      "rating": "D",
-      "cost": 222444,
-      "mass": 16,
-      "power": 1.42,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 120
-    },
-    {
-      "id": "5p",
-      "grp": "scb",
-      "class": 6,
-      "rating": "C",
-      "cost": 556110,
-      "mass": 40,
-      "power": 1.77,
-      "cells": 4,
-      "rechargeRating": "C",
-      "recharge": 148
-    },
-    {
-      "id": "5o",
-      "grp": "scb",
-      "class": 6,
-      "rating": "B",
-      "cost": 1390275,
-      "mass": 64,
-      "power": 2.12,
-      "cells": 5,
-      "rechargeRating": "B",
-      "recharge": 176
-    },
-    {
-      "id": "5n",
-      "grp": "scb",
-      "class": 6,
-      "rating": "A",
-      "cost": 3475688,
-      "mass": 40,
-      "power": 2.48,
-      "cells": 4,
-      "rechargeRating": "A",
-      "recharge": 204
-    },
-    {
-      "id": "5m",
-      "grp": "scb",
-      "class": 5,
-      "rating": "E",
-      "cost": 31778,
-      "mass": 20,
-      "power": 0.9,
-      "cells": 4,
-      "rechargeRating": "D",
-      "recharge": 82
-    },
-    {
-      "id": "5l",
-      "grp": "scb",
-      "class": 5,
-      "rating": "D",
-      "cost": 79444,
-      "mass": 8,
-      "power": 1.2,
-      "cells": 2,
-      "rechargeRating": "C",
-      "recharge": 109
-    },
-    {
-      "id": "5k",
-      "grp": "scb",
-      "class": 5,
-      "rating": "C",
-      "cost": 198611,
-      "mass": 20,
-      "power": 1.5,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 135
-    },
-    {
-      "id": "5j",
-      "grp": "scb",
-      "class": 5,
-      "rating": "B",
-      "cost": 496527,
-      "mass": 32,
-      "power": 1.8,
-      "cells": 4,
-      "rechargeRating": "B",
-      "recharge": 162
-    },
-    {
-      "id": "5i",
-      "grp": "scb",
-      "class": 5,
-      "rating": "A",
-      "cost": 1241317,
-      "mass": 20,
-      "power": 2.1,
-      "cells": 3,
-      "rechargeRating": "B",
-      "recharge": 189
-    },
-    {
-      "id": "5h",
-      "grp": "scb",
-      "class": 4,
-      "rating": "E",
-      "cost": 11349,
-      "mass": 10,
-      "power": 0.74,
-      "cells": 4,
-      "rechargeRating": "D",
-      "recharge": 72
-    },
-    {
-      "id": "5g",
-      "grp": "scb",
-      "class": 4,
-      "rating": "D",
-      "cost": 28373,
-      "mass": 4,
-      "power": 0.98,
-      "cells": 2,
-      "rechargeRating": "D",
-      "recharge": 94
-    },
-    {
-      "id": "5f",
-      "grp": "scb",
-      "class": 4,
-      "rating": "C",
-      "cost": 70932,
-      "mass": 10,
-      "power": 1.23,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 117
-    },
-    {
-      "id": "5e",
-      "grp": "scb",
-      "class": 4,
-      "rating": "B",
-      "cost": 177331,
-      "mass": 16,
-      "power": 1.48,
-      "cells": 4,
-      "rechargeRating": "C",
-      "recharge": 140
-    },
-    {
-      "id": "5d",
-      "grp": "scb",
-      "class": 4,
-      "rating": "A",
-      "cost": 443328,
-      "mass": 10,
-      "power": 1.72,
-      "cells": 3,
-      "rechargeRating": "B",
-      "recharge": 163
-    },
-    {
-      "id": "5c",
-      "grp": "scb",
-      "class": 3,
-      "rating": "E",
-      "cost": 4053,
-      "mass": 5,
-      "power": 0.61,
-      "cells": 4,
-      "rechargeRating": "D",
-      "recharge": 61
-    },
-    {
-      "id": "5b",
-      "grp": "scb",
-      "class": 3,
-      "rating": "D",
-      "cost": 10133,
-      "mass": 2,
-      "power": 0.82,
-      "cells": 2,
-      "rechargeRating": "D",
-      "recharge": 80
-    },
-    {
-      "id": "5a",
-      "grp": "scb",
-      "class": 3,
-      "rating": "C",
-      "cost": 25333,
-      "mass": 5,
-      "power": 1.02,
-      "cells": 3,
-      "rechargeRating": "D",
-      "recharge": 100
-    },
-    {
-      "id": "59",
-      "grp": "scb",
-      "class": 3,
-      "rating": "B",
-      "cost": 63333,
-      "mass": 8,
-      "power": 1.22,
-      "cells": 4,
-      "rechargeRating": "C",
-      "recharge": 119
-    },
-    {
-      "id": "58",
-      "grp": "scb",
-      "class": 3,
-      "rating": "A",
-      "cost": 158331,
-      "mass": 5,
-      "power": 1.43,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 138
-    },
-    {
-      "id": "57",
-      "grp": "scb",
-      "class": 2,
-      "rating": "E",
-      "cost": 1448,
-      "mass": 2.5,
-      "power": 0.5,
-      "cells": 4,
-      "rechargeRating": "E",
-      "recharge": 46
-    },
-    {
-      "id": "56",
-      "grp": "scb",
-      "class": 2,
-      "rating": "D",
-      "cost": 3619,
-      "mass": 1,
-      "power": 0.67,
-      "cells": 2,
-      "rechargeRating": "D",
-      "recharge": 61
-    },
-    {
-      "id": "55",
-      "grp": "scb",
-      "class": 2,
-      "rating": "C",
-      "cost": 9048,
-      "mass": 2.5,
-      "power": 0.84,
-      "cells": 3,
-      "rechargeRating": "D",
-      "recharge": 77
-    },
-    {
-      "id": "54",
-      "grp": "scb",
-      "class": 2,
-      "rating": "B",
-      "cost": 22619,
-      "mass": 4,
-      "power": 1.01,
-      "cells": 4,
-      "rechargeRating": "D",
-      "recharge": 92
-    },
-    {
-      "id": "53",
-      "grp": "scb",
-      "class": 2,
-      "rating": "A",
-      "cost": 56547,
-      "mass": 2.5,
-      "power": 1.18,
-      "cells": 3,
-      "rechargeRating": "C",
-      "recharge": 107
-    },
-    {
-      "id": "52",
-      "grp": "scb",
-      "class": 1,
-      "rating": "E",
-      "cost": 517,
-      "mass": 1.3,
-      "power": 0.41,
-      "cells": 3,
-      "rechargeRating": "E",
-      "recharge": 31
-    },
-    {
-      "id": "51",
-      "grp": "scb",
-      "class": 1,
-      "rating": "D",
-      "cost": 1293,
-      "mass": 0.5,
-      "power": 0.55,
-      "cells": 1,
-      "rechargeRating": "E",
-      "recharge": 41
-    },
-    {
-      "id": "50",
-      "grp": "scb",
-      "class": 1,
-      "rating": "C",
-      "cost": 3231,
-      "mass": 1.3,
-      "power": 0.69,
-      "cells": 2,
-      "rechargeRating": "D",
-      "recharge": 51
-    },
-    {
-      "id": "4v",
-      "grp": "scb",
-      "class": 1,
-      "rating": "B",
-      "cost": 8078,
-      "mass": 2,
-      "power": 0.83,
-      "cells": 3,
-      "rechargeRating": "D",
-      "recharge": 61
-    },
-    {
-      "id": "4u",
-      "grp": "scb",
-      "class": 1,
-      "rating": "A",
-      "cost": 20195,
-      "mass": 1.3,
-      "power": 0.97,
-      "cells": 2,
-      "rechargeRating": "D",
-      "recharge": 72
-    }
+  "scb": [
+    { "id": "65", "grp": "scb", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 1.44, "cells": 6, "rechargeRating": "C", "recharge": 0 },
+    { "id": "64", "grp": "scb", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 1.92, "cells": 4, "rechargeRating": "C", "recharge": 0 },
+    { "id": "63", "grp": "scb", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 0 },
+    { "id": "62", "grp": "scb", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 0 },
+    { "id": "61", "grp": "scb", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 0 },
+    { "id": "60", "grp": "scb", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 97 },
+    { "id": "5v", "grp": "scb", "class": 7, "rating": "D", "cost": 622843, "mass": 32, "power": 1.66, "cells": 4, "rechargeRating": "C", "recharge": 130 },
+    { "id": "5u", "grp": "scb", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 163 },
+    { "id": "5t", "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 197 },
+    { "id": "5s", "grp": "scb", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 230 },
+    { "id": "5r", "grp": "scb", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 92 },
+    { "id": "5q", "grp": "scb", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 120 },
+    { "id": "5p", "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 148 },
+    { "id": "5o", "grp": "scb", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 176 },
+    { "id": "5n", "grp": "scb", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 204 },
+    { "id": "5m", "grp": "scb", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 82 },
+    { "id": "5l", "grp": "scb", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 109 },
+    { "id": "5k", "grp": "scb", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 135 },
+    { "id": "5j", "grp": "scb", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 162 },
+    { "id": "5i", "grp": "scb", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 189 },
+    { "id": "5h", "grp": "scb", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 72 },
+    { "id": "5g", "grp": "scb", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 94 },
+    { "id": "5f", "grp": "scb", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 117 },
+    { "id": "5e", "grp": "scb", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 1.48, "cells": 5, "rechargeRating": "C", "recharge": 140 },
+    { "id": "5d", "grp": "scb", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 163 },
+    { "id": "5c", "grp": "scb", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 61 },
+    { "id": "5b", "grp": "scb", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 80 },
+    { "id": "5a", "grp": "scb", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 100 },
+    { "id": "59", "grp": "scb", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 119 },
+    { "id": "58", "grp": "scb", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 138 },
+    { "id": "57", "grp": "scb", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 46 },
+    { "id": "56", "grp": "scb", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 61 },
+    { "id": "55", "grp": "scb", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 77 },
+    { "id": "54", "grp": "scb", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 92 },
+    { "id": "53", "grp": "scb", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 107 },
+    { "id": "52", "grp": "scb", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 31 },
+    { "id": "51", "grp": "scb", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 41 },
+    { "id": "50", "grp": "scb", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 51 },
+    { "id": "4v", "grp": "scb", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.83, "cells": 4, "rechargeRating": "D", "recharge": 61 },
+    { "id": "4u", "grp": "scb", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.97, "cells": 3, "rechargeRating": "D", "recharge": 72 }
  ]
-}
+}
--- a/data/components/internal/shield_generator.json
+++ b/data/components/internal/shield_generator.json
@@ -1,529 +1,39 @@
 {
-  "Shield Generators": [
-    {
-      "id": "4t",
-      "grp": "sg",
-      "class": 8,
-      "rating": "E",
-      "cost": 2007241,
-      "mass": 160,
-      "power": 2.4,
-      "minmass": 900,
-      "optmass": 1800,
-      "maxmass": 4500,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "4s",
-      "grp": "sg",
-      "class": 8,
-      "rating": "D",
-      "cost": 6021722,
-      "mass": 64,
-      "power": 3.2,
-      "minmass": 900,
-      "optmass": 1800,
-      "maxmass": 4500,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "4r",
-      "grp": "sg",
-      "class": 8,
-      "rating": "C",
-      "cost": 18065165,
-      "mass": 160,
-      "power": 4,
-      "minmass": 900,
-      "optmass": 1800,
-      "maxmass": 4500,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "4q",
-      "grp": "sg",
-      "class": 8,
-      "rating": "B",
-      "cost": 54195495,
-      "mass": 256,
-      "power": 4.8,
-      "minmass": 900,
-      "optmass": 1800,
-      "maxmass": 4500,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "4p",
-      "grp": "sg",
-      "class": 8,
-      "rating": "A",
-      "cost": 162586486,
-      "mass": 160,
-      "power": 5.6,
-      "minmass": 900,
-      "optmass": 1800,
-      "maxmass": 4500,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    },
-    {
-      "id": "4o",
-      "grp": "sg",
-      "class": 7,
-      "rating": "E",
-      "cost": 633199,
-      "mass": 80,
-      "power": 2.1,
-      "minmass": 530,
-      "optmass": 1060,
-      "maxmass": 2650,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "4n",
-      "grp": "sg",
-      "class": 7,
-      "rating": "D",
-      "cost": 1899597,
-      "mass": 32,
-      "power": 2.8,
-      "minmass": 530,
-      "optmass": 1060,
-      "maxmass": 2650,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "4m",
-      "grp": "sg",
-      "class": 7,
-      "rating": "C",
-      "cost": 5698790,
-      "mass": 80,
-      "power": 3.5,
-      "minmass": 530,
-      "optmass": 1060,
-      "maxmass": 2650,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "4l",
-      "grp": "sg",
-      "class": 7,
-      "rating": "B",
-      "cost": 17096371,
-      "mass": 128,
-      "power": 4.2,
-      "minmass": 530,
-      "optmass": 1060,
-      "maxmass": 2650,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "4k",
-      "grp": "sg",
-      "class": 7,
-      "rating": "A",
-      "cost": 51289112,
-      "mass": 80,
-      "power": 4.9,
-      "minmass": 530,
-      "optmass": 1060,
-      "maxmass": 2650,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    },
-    {
-      "id": "4j",
-      "grp": "sg",
-      "class": 6,
-      "rating": "E",
-      "cost": 199747,
-      "mass": 40,
-      "power": 1.86,
-      "minmass": 270,
-      "optmass": 540,
-      "maxmass": 1350,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "4i",
-      "grp": "sg",
-      "class": 6,
-      "rating": "D",
-      "cost": 599242,
-      "mass": 16,
-      "power": 2.48,
-      "minmass": 270,
-      "optmass": 540,
-      "maxmass": 1350,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "4h",
-      "grp": "sg",
-      "class": 6,
-      "rating": "C",
-      "cost": 1797726,
-      "mass": 40,
-      "power": 3.1,
-      "minmass": 270,
-      "optmass": 540,
-      "maxmass": 1350,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "4g",
-      "grp": "sg",
-      "class": 6,
-      "rating": "B",
-      "cost": 5393177,
-      "mass": 64,
-      "power": 3.72,
-      "minmass": 270,
-      "optmass": 540,
-      "maxmass": 1350,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "4f",
-      "grp": "sg",
-      "class": 6,
-      "rating": "A",
-      "cost": 16179531,
-      "mass": 40,
-      "power": 4.34,
-      "minmass": 270,
-      "optmass": 540,
-      "maxmass": 1350,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    },
-    {
-      "id": "4e",
-      "grp": "sg",
-      "class": 5,
-      "rating": "E",
-      "cost": 63012,
-      "mass": 20,
-      "power": 1.56,
-      "minmass": 203,
-      "optmass": 405,
-      "maxmass": 1013,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "4d",
-      "grp": "sg",
-      "class": 5,
-      "rating": "D",
-      "cost": 189035,
-      "mass": 8,
-      "power": 2.08,
-      "minmass": 203,
-      "optmass": 405,
-      "maxmass": 1013,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "4c",
-      "grp": "sg",
-      "class": 5,
-      "rating": "C",
-      "cost": 567106,
-      "mass": 20,
-      "power": 2.6,
-      "minmass": 203,
-      "optmass": 405,
-      "maxmass": 1013,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "4b",
-      "grp": "sg",
-      "class": 5,
-      "rating": "B",
-      "cost": 1701318,
-      "mass": 32,
-      "power": 3.12,
-      "minmass": 203,
-      "optmass": 405,
-      "maxmass": 1013,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "4a",
-      "grp": "sg",
-      "class": 5,
-      "rating": "A",
-      "cost": 5103953,
-      "mass": 20,
-      "power": 3.64,
-      "minmass": 203,
-      "optmass": 405,
-      "maxmass": 1013,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    },
-    {
-      "id": "49",
-      "grp": "sg",
-      "class": 4,
-      "rating": "E",
-      "cost": 19878,
-      "mass": 10,
-      "power": 1.32,
-      "minmass": 143,
-      "optmass": 285,
-      "maxmass": 713,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "48",
-      "grp": "sg",
-      "class": 4,
-      "rating": "D",
-      "cost": 59633,
-      "mass": 4,
-      "power": 1.76,
-      "minmass": 143,
-      "optmass": 285,
-      "maxmass": 713,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "47",
-      "grp": "sg",
-      "class": 4,
-      "rating": "C",
-      "cost": 178898,
-      "mass": 10,
-      "power": 2.2,
-      "minmass": 143,
-      "optmass": 285,
-      "maxmass": 713,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "46",
-      "grp": "sg",
-      "class": 4,
-      "rating": "B",
-      "cost": 536693,
-      "mass": 16,
-      "power": 2.64,
-      "minmass": 143,
-      "optmass": 285,
-      "maxmass": 713,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "45",
-      "grp": "sg",
-      "class": 4,
-      "rating": "A",
-      "cost": 1610080,
-      "mass": 10,
-      "power": 3.08,
-      "minmass": 143,
-      "optmass": 285,
-      "maxmass": 713,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    },
-    {
-      "id": "44",
-      "grp": "sg",
-      "class": 3,
-      "rating": "E",
-      "cost": 6271,
-      "mass": 5,
-      "power": 1.08,
-      "minmass": 83,
-      "optmass": 165,
-      "maxmass": 413,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "43",
-      "grp": "sg",
-      "class": 3,
-      "rating": "D",
-      "cost": 18812,
-      "mass": 2,
-      "power": 1.44,
-      "minmass": 83,
-      "optmass": 165,
-      "maxmass": 413,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "42",
-      "grp": "sg",
-      "class": 3,
-      "rating": "C",
-      "cost": 56435,
-      "mass": 5,
-      "power": 1.8,
-      "minmass": 83,
-      "optmass": 165,
-      "maxmass": 413,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "41",
-      "grp": "sg",
-      "class": 3,
-      "rating": "B",
-      "cost": 169304,
-      "mass": 8,
-      "power": 2.16,
-      "minmass": 83,
-      "optmass": 165,
-      "maxmass": 413,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "40",
-      "grp": "sg",
-      "class": 3,
-      "rating": "A",
-      "cost": 507912,
-      "mass": 5,
-      "power": 2.52,
-      "minmass": 83,
-      "optmass": 165,
-      "maxmass": 413,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    },
-    {
-      "id": "3v",
-      "grp": "sg",
-      "class": 2,
-      "rating": "E",
-      "cost": 1978,
-      "mass": 2.5,
-      "power": 0.9,
-      "minmass": 28,
-      "optmass": 55,
-      "maxmass": 138,
-      "minmul": 1.3,
-      "optmul": 0.8,
-      "maxmul": 0.3
-    },
-    {
-      "id": "3u",
-      "grp": "sg",
-      "class": 2,
-      "rating": "D",
-      "cost": 5934,
-      "mass": 1,
-      "power": 1.2,
-      "minmass": 28,
-      "optmass": 55,
-      "maxmass": 138,
-      "minmul": 1.4,
-      "optmul": 0.9,
-      "maxmul": 0.4
-    },
-    {
-      "id": "3t",
-      "grp": "sg",
-      "class": 2,
-      "rating": "C",
-      "cost": 17803,
-      "mass": 2.5,
-      "power": 1.5,
-      "minmass": 28,
-      "optmass": 55,
-      "maxmass": 138,
-      "minmul": 1.5,
-      "optmul": 1,
-      "maxmul": 0.5
-    },
-    {
-      "id": "3s",
-      "grp": "sg",
-      "class": 2,
-      "rating": "B",
-      "cost": 53408,
-      "mass": 4,
-      "power": 1.8,
-      "minmass": 28,
-      "optmass": 55,
-      "maxmass": 138,
-      "minmul": 1.6,
-      "optmul": 1.1,
-      "maxmul": 0.6
-    },
-    {
-      "id": "3r",
-      "grp": "sg",
-      "class": 2,
-      "rating": "A",
-      "cost": 160224,
-      "mass": 2.5,
-      "power": 2.1,
-      "minmass": 28,
-      "optmass": 55,
-      "maxmass": 138,
-      "minmul": 1.7,
-      "optmul": 1.2,
-      "maxmul": 0.7
-    }
+  "sg": [
+    { "id": "4t", "grp": "sg", "class": 8, "rating": "E", "cost": 2007241,   "mass": 160, "power": 2.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "4s", "grp": "sg", "class": 8, "rating": "D", "cost": 6021722,   "mass": 64,  "power": 3.2,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "4r", "grp": "sg", "class": 8, "rating": "C", "cost": 18065165,  "mass": 160, "power": 4,    "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "4q", "grp": "sg", "class": 8, "rating": "B", "cost": 54195495,  "mass": 256, "power": 4.8,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "4p", "grp": "sg", "class": 8, "rating": "A", "cost": 162586486, "mass": 160, "power": 5.6,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 },
+    { "id": "4o", "grp": "sg", "class": 7, "rating": "E", "cost": 633199,    "mass": 80,  "power": 2.1,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "4n", "grp": "sg", "class": 7, "rating": "D", "cost": 1899597,   "mass": 32,  "power": 2.8,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "4m", "grp": "sg", "class": 7, "rating": "C", "cost": 5698790,   "mass": 80,  "power": 3.5,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "4l", "grp": "sg", "class": 7, "rating": "B", "cost": 17096371,  "mass": 128, "power": 4.2,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "4k", "grp": "sg", "class": 7, "rating": "A", "cost": 51289112,  "mass": 80,  "power": 4.9,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 },
+    { "id": "4j", "grp": "sg", "class": 6, "rating": "E", "cost": 199747,    "mass": 40,  "power": 1.86, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "4i", "grp": "sg", "class": 6, "rating": "D", "cost": 599242,    "mass": 16,  "power": 2.48, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "4h", "grp": "sg", "class": 6, "rating": "C", "cost": 1797726,   "mass": 40,  "power": 3.1,  "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "4g", "grp": "sg", "class": 6, "rating": "B", "cost": 5393177,   "mass": 64,  "power": 3.72, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "4f", "grp": "sg", "class": 6, "rating": "A", "cost": 16179531,  "mass": 40,  "power": 4.34, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 },
+    { "id": "4e", "grp": "sg", "class": 5, "rating": "E", "cost": 63012,     "mass": 20,  "power": 1.56, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "4d", "grp": "sg", "class": 5, "rating": "D", "cost": 189035,    "mass": 8,   "power": 2.08, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "4c", "grp": "sg", "class": 5, "rating": "C", "cost": 567106,    "mass": 20,  "power": 2.6,  "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "4b", "grp": "sg", "class": 5, "rating": "B", "cost": 1701318,   "mass": 32,  "power": 3.12, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "4a", "grp": "sg", "class": 5, "rating": "A", "cost": 5103953,   "mass": 20,  "power": 3.64, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 },
+    { "id": "49", "grp": "sg", "class": 4, "rating": "E", "cost": 19878,     "mass": 10,  "power": 1.32, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "48", "grp": "sg", "class": 4, "rating": "D", "cost": 59633,     "mass": 4,   "power": 1.76, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "47", "grp": "sg", "class": 4, "rating": "C", "cost": 178898,    "mass": 10,  "power": 2.2,  "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "46", "grp": "sg", "class": 4, "rating": "B", "cost": 536693,    "mass": 16,  "power": 2.64, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "45", "grp": "sg", "class": 4, "rating": "A", "cost": 1610080,   "mass": 10,  "power": 3.08, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 },
+    { "id": "44", "grp": "sg", "class": 3, "rating": "E", "cost": 6271,      "mass": 5,   "power": 1.08, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "43", "grp": "sg", "class": 3, "rating": "D", "cost": 18812,     "mass": 2,   "power": 1.44, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "42", "grp": "sg", "class": 3, "rating": "C", "cost": 56435,     "mass": 5,   "power": 1.8,  "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "41", "grp": "sg", "class": 3, "rating": "B", "cost": 169304,    "mass": 8,   "power": 2.16, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "40", "grp": "sg", "class": 3, "rating": "A", "cost": 507912,    "mass": 5,   "power": 2.52, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 },
+    { "id": "3v", "grp": "sg", "class": 2, "rating": "E", "cost": 1978,      "mass": 2.5, "power": 0.9,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3 },
+    { "id": "3u", "grp": "sg", "class": 2, "rating": "D", "cost": 5934,      "mass": 1,   "power": 1.2,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4 },
+    { "id": "3t", "grp": "sg", "class": 2, "rating": "C", "cost": 17803,     "mass": 2.5, "power": 1.5,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5 },
+    { "id": "3s", "grp": "sg", "class": 2, "rating": "B", "cost": 53408,     "mass": 4,   "power": 1.8,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6 },
+    { "id": "3r", "grp": "sg", "class": 2, "rating": "A", "cost": 160224,    "mass": 2.5, "power": 2.1,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7 }
  ]
 }
--- a/data/ships/adder.json
+++ b/data/ships/adder.json
@@ -1,18 +1,18 @@
 {
  "adder": {
    "properties": {
-      "grp": "ex",
      "name": "Adder",
      "manufacturer": "Zorgon Peterson",
      "class": 1,
-      "cost": 39993,
+      "hullCost": 39993,
      "speed": 220,
      "boost": 320,
+      "boostEnergy": 9,
      "agility": 8,
-      "shields": 60,
-      "armour": 162,
-      "fuelcost": 50,
-      "mass": 35
+      "baseShieldStrength": 60,
+      "baseArmour": 162,
+      "hullMass": 35,
+      "masslock": 7
    },
    "retailCost": 87808,
    "slots": {
--- a/data/ships/anaconda.json
+++ b/data/ships/anaconda.json
@@ -1,18 +1,18 @@
 {
  "anaconda": {
    "properties": {
-      "grp": "mp",
      "name": "Anaconda",
      "manufacturer": "Faulcon DeLacy",
      "class": 3,
-      "cost": 141889932,
+      "hullCost": 141889932,
      "speed": 180,
      "boost": 240,
+      "boostEnergy": 29,
      "agility": 2,
-      "shields": 350,
-      "armour": 945,
-      "fuelcost": 50,
-      "mass": 400
+      "baseShieldStrength": 350,
+      "baseArmour": 945,
+      "hullMass": 400,
+      "masslock": 23
    },
    "retailCost": 146969451,
    "slots": {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Colin McLeod	50741657a5	Merge pull request #82 from michaelhue/beta-ships Include v1.4-beta ships	2015-09-02 16:31:23 -07:00
michaelhue	ff9a38f23f	Include v1.4-beta ships. Adds the Federal Assault Ship, Federal Gunship and Imperial Eagle to the ship selection. Note: Values for `boostEnergy` and `masslock` attributes are currently based on their parent ships. Should be updated as soon as data is available.	2015-09-02 17:48:42 +02:00
Colin McLeod	3b11b31e7c	Add all english terms due to angular translate workaround	2015-09-02 01:50:49 -07:00
Colin McLeod	44e5dfb4d4	Lint fix	2015-09-01 20:55:07 -07:00
Colin McLeod	30ea10830c	Fix to slider reset event	2015-09-01 20:47:43 -07:00
Colin McLeod	eb0f611d78	Fix slider event	2015-09-01 20:38:28 -07:00
Colin McLeod	96ef192738	Fix max fuel label	2015-09-01 20:38:13 -07:00
Colin McLeod	1970616443	Add cargo hatch priority and status to be included in detailed export	2015-09-01 18:36:57 -07:00
Colin McLeod	aac4c9a872	Fix to slider events	2015-09-01 18:05:35 -07:00
Colin McLeod	aebfb62ac4	Correct Select DOM generation	2015-09-01 18:02:17 -07:00
Colin McLeod	9748043466	Update sensors	2015-09-01 17:59:33 -07:00
Colin McLeod	b6f98e741b	UI tweak	2015-09-01 02:53:15 -07:00
Colin McLeod	b513cca4b5	Minor code clean up	2015-09-01 02:49:03 -07:00
Colin McLeod	65f53a3fa4	Fixes for language and scaling	2015-09-01 02:20:05 -07:00
Colin McLeod	bf217e7fdd	Updating DE, FR and RU	2015-08-31 17:41:45 -07:00
Colin McLeod	09e646ee95	Power warning when at 100%	2015-08-31 17:39:04 -07:00
Colin McLeod	ab18228131	Further improvement to size ratio	2015-08-31 17:39:04 -07:00
Colin McLeod	164e9f5c8a	Another improvement to font-size adjustments	2015-08-31 17:37:04 -07:00
Colin McLeod	faa8759851	More changes for font size adjustment	2015-08-31 17:35:14 -07:00
Colin McLeod	c2a84606a1	Inital commit for font size adjust slider	2015-08-31 17:34:28 -07:00
Colin McLeod	42d51b7612	Merge pull request #81 from Marginal/priorities Include module status and priority in JSON import and export.	2015-08-31 17:29:54 -07:00
Jonathan Harris	38dc4319c0	Test import/export of module state and priority.	2015-08-30 06:52:44 +01:00
Jonathan Harris	fda966be02	Pass tests.	2015-08-30 06:05:12 +01:00
Jonathan Harris	bf47a81dc1	More cosmetic issues.	2015-08-30 05:29:25 +01:00
Jonathan Harris	eef4e06f29	Fix cosmetic issues.	2015-08-30 05:26:22 +01:00
Jonathan Harris	2d2c2b75e3	Include module status and priority in JSON import and export.	2015-08-30 05:02:59 +01:00
Colin McLeod	0066e7fd40	Bumping version to 1.5.0	2015-08-23 12:40:34 -07:00
Colin McLeod	d596723b7b	Major refactor for language support, EN, DE, ES, FR, RU	2015-08-23 12:38:17 -07:00
Colin McLeod	c7269423ed	Handle select edge-case	2015-08-20 14:09:07 -07:00
Colin McLeod	ee60e4d043	Fix Diamondback Explorer MLF	2015-08-20 14:08:46 -07:00
Colin McLeod	c98a73c6a8	Bumping version to 1.4.1	2015-08-15 16:35:30 -07:00
Colin McLeod	0116523c63	Merge pull request #75 from sf302/master Additional refinement to "Optimize Mass" preset	2015-08-14 22:36:17 -07:00
Kevin Chang	c1afa7c385	Additional refinement to "Optimize Mass" preset	2015-08-14 19:16:49 -07:00
Colin McLeod	6630ff8fee	Adding another E:D import test case	2015-08-14 11:41:53 -07:00
Colin McLeod	14f303c581	Merge pull request #74 from sf302/master Adding powerplant capacity warnings	2015-08-14 00:42:50 -07:00
Colin McLeod	0728af14dd	Support import of E:D shipyard text exports	2015-08-13 23:22:13 -07:00
Colin McLeod	1edacf3eba	Corrected thurster selection and warnings	2015-08-13 23:21:40 -07:00
Colin McLeod	3d6d210563	updating linting params	2015-08-13 23:18:35 -07:00
Colin McLeod	df09da4b0a	Remove redundant statements	2015-08-13 23:14:48 -07:00
Colin McLeod	b02de43b50	Updating dependencies	2015-08-13 23:14:33 -07:00
Kevin Chang	1b3ca2f697	Fix lint error	2015-08-13 22:22:46 -07:00
Colin McLeod	886614527f	Improved low weight build logic	2015-08-10 15:12:59 -07:00
Colin McLeod	5f05bf0dc5	Lint fix	2015-08-10 15:12:18 -07:00
Colin McLeod	59710ce2cf	Adding button for class A oufit	2015-08-10 10:50:46 -07:00
Colin McLeod	b533191bc9	Adding loader for later use	2015-08-10 10:50:16 -07:00
Kevin Chang	4fa1115e8f	Extend PD Boost warning to PP Retracted power (TODO: extend to two-stage warning for DEP/RET)	2015-08-06 20:58:11 -07:00
Colin McLeod	be5a069b23	Merge pull request #71 from sf302/master Add build preset button and correct/improve SCB info	2015-07-30 20:48:17 -07:00
Kevin Chang	80da41c866	Another fix to lint errors	2015-07-30 20:18:33 -07:00
Kevin Chang	d278a7c1fd	Correcting CI errors	2015-07-30 20:14:46 -07:00
Kevin Chang	69de209aba	A-rated uses largest eligible shield slot; dirty hacks rewritten	2015-07-30 19:50:08 -07:00
Kevin Chang	15616d112f	Add per-slot total SCB capacity in MJ	2015-07-30 19:04:52 -07:00
Kevin Chang	95adca5cde	Incremented all shield cell bank counts -- "Munitions" tab shows actual cell counts	2015-07-30 18:54:57 -07:00
kchang	82c5460936	Shortcut to A-rated common components and shield generator	2015-07-28 23:21:46 -07:00
Colin McLeod	b850695715	Bumping version to 1.3.1	2015-07-26 22:42:06 -07:00
Colin McLeod	d5af972272	Add 8A pristmatic shield generator	2015-07-26 22:39:13 -07:00
Colin McLeod	8946f9b97c	Add component group filtering for Orca special case internal slots	2015-07-21 12:34:35 -07:00
Colin McLeod	348339520d	Improve comparison import validation	2015-07-21 12:34:07 -07:00
Colin McLeod	f0bdcd5557	Bumping version to 1.3.0	2015-07-20 13:42:38 -07:00
Colin McLeod	b1ee0e44f3	Linting fixes, update unit test	2015-07-20 13:42:21 -07:00
Colin McLeod	c96e6afbd7	Power Distributor required for Boost. Resolves #17	2015-07-20 13:37:03 -07:00
Colin McLeod	77334341ea	Armour value improved by bulkhead	2015-07-20 00:55:51 -07:00
Colin McLeod	5f22743778	Bumping to version 1.2.0	2015-07-19 22:30:30 -07:00
Colin McLeod	03986cb88a	Massive refactor for 3rd party import	2015-07-19 21:32:14 -07:00
Colin McLeod	c796adf40d	Add Persist.getAll for backup purposes	2015-07-18 16:50:50 -07:00
Colin McLeod	2890ff5537	Add description to export modal	2015-07-18 16:50:03 -07:00
Colin McLeod	a6ba61a2bf	Change loadout schema slightly	2015-07-18 14:46:22 -07:00
Colin McLeod	db5e080992	Change meta description	2015-07-18 14:45:36 -07:00
Colin McLeod	63d7f98e2c	Fix total jump range calculation bug	2015-07-18 14:45:08 -07:00
Colin McLeod	7997ff6ae9	Correct Beta insurance rate	2015-07-17 09:07:16 -07:00
Colin McLeod	b3126cf6b6	Renaming data test for consistency	2015-07-15 21:11:23 -07:00
Colin McLeod	ab1ea53ce3	Implement export for 3rd Party sites	2015-07-15 16:13:17 -07:00
Colin McLeod	82a87cb653	Adjust select menu size for smaller windows	2015-07-15 15:31:40 -07:00
Colin McLeod	d2fc526039	Don't cachebust JSON files..	2015-07-14 21:58:27 -07:00
Colin McLeod	88587c6487	Bumping version to 1.1.0	2015-07-14 21:48:11 -07:00
Colin McLeod	4578dbf906	Refactor many variable names, adding detailed json dump and schema	2015-07-14 21:44:12 -07:00
Colin McLeod	cd48ef6f86	Removing ship purpose	2015-07-13 12:33:40 -07:00
Colin McLeod	0f0e67ec9c	Adding mass lock factor	2015-07-13 11:08:49 -07:00
Colin McLeod	bbb2a223af	Updating price for mining lance	2015-07-13 10:58:05 -07:00
Colin McLeod	5278e52e2f	Updating price for Pack-hound	2015-07-13 10:57:52 -07:00
Colin McLeod	e6290abef7	Correcting prices	2015-07-11 00:17:21 -07:00
Colin McLeod	346fee1208	Improve readbility of power distributor and thruster data	2015-07-07 18:29:25 -07:00
Colin McLeod	1b9f5f870e	Change component select hover color	2015-07-07 18:29:07 -07:00
Colin McLeod	26b624d1dd	Use default right-click action when SHIFT key is held	2015-07-07 15:34:28 -07:00
Colin McLeod	7cbd9732b7	List Utility mounts in alphabetical order	2015-07-07 14:51:23 -07:00
Colin McLeod	44152116b4	Linting fix	2015-07-07 11:30:38 -07:00
Colin McLeod	3ad35992fc	Use full names for limpet controllers	2015-07-07 11:20:48 -07:00
Colin McLeod	e963eb24a0	Adding Imperial Hammer rail gun	2015-07-07 11:20:26 -07:00
Colin McLeod	827e2b403c	Adding Distrupoter pulse laser	2015-07-07 11:20:07 -07:00
Colin McLeod	0fd4712021	Adding Advanced Plasma Accelerator	2015-07-07 11:19:49 -07:00
Colin McLeod	ae0af05e78	Adding Enforcer Multi-cannon	2015-07-07 11:19:31 -07:00
Colin McLeod	dd00f283e6	Adding Pack-Hound missle rack	2015-07-07 11:19:12 -07:00
Colin McLeod	eddf968629	Adding Mining Lance laser	2015-07-07 11:18:50 -07:00
Colin McLeod	7fdd83ba84	Adding Pacifier frag cannon	2015-07-07 11:18:28 -07:00
Colin McLeod	1bb4f6850e	Clean up cannon data	2015-07-07 11:18:05 -07:00
Colin McLeod	f47b931380	Adding Cryptoscrambler burst laser	2015-07-07 11:17:45 -07:00
Colin McLeod	d9f686f0d6	Adding Retributor beam laser	2015-07-07 11:17:25 -07:00
Colin McLeod	73cef20073	Format for readability	2015-07-07 11:17:05 -07:00
Colin McLeod	fd68565d8e	Adding prismatic Shield Generators	2015-07-07 11:16:40 -07:00
Colin McLeod	a45d165d33	UI Tweaks	2015-07-06 15:45:56 -07:00
Colin McLeod	904f828d83	Change cargo rack order, remove long name	2015-07-06 11:20:34 -07:00
Colin McLeod	f00420c92f	UI Tweaks	2015-07-06 11:20:08 -07:00
Colin McLeod	457705014c	Bumping version to 1.0.4	2015-07-03 18:25:54 -07:00
Colin McLeod	6faf3765e0	Fix to scroll to top on iOS	2015-07-03 18:23:19 -07:00
Colin McLeod	4abdce2b70	Fix button wrapping issue on small screens	2015-07-03 15:42:08 -07:00
Colin McLeod	3b44f5fe27	Bumping version 1.0.3	2015-07-03 15:33:47 -07:00
Colin McLeod	7332dc69ed	Linting issues	2015-07-03 15:31:52 -07:00
Colin McLeod	381387c04f	UI Tweaks, persist cost tab open, revert outfitting order to original	2015-07-03 15:30:49 -07:00
Colin McLeod	e0db9fdfb0	Fix scrolling on iOS	2015-07-03 12:15:35 -07:00
Colin McLeod	a8d66b22af	Bumping version to 1.0.2	2015-07-02 20:43:13 -07:00
Colin McLeod	bdc1e622f9	UI Tweaks, scrolling fixes and improvements	2015-07-02 20:42:46 -07:00
Colin McLeod	ad8130ae9b	Add missing class 7 & 8 internal fuel tanks	2015-07-02 19:24:52 -07:00
Colin McLeod	394a3bb9f1	Revert to ui-router-extras 0.0.13 due to bug introduced in 0.0.14	2015-07-02 10:41:24 -07:00
Colin McLeod	54907b462c	Tweak select look and feel on firefox, safari	2015-07-01 23:41:32 -07:00
Colin McLeod	1350de1910	Empty retrofitting table color fix	2015-06-30 21:55:38 -07:00
Colin McLeod	89d3fd69e1	UI tweaks for mobile	2015-06-30 21:46:05 -07:00
Colin McLeod	7325081ec9	Version 1.0.0 :D	2015-06-30 21:09:19 -07:00
Colin McLeod	680872a302	Retrofitting costs added to outfit page	2015-06-30 21:06:12 -07:00
Colin McLeod	a3c65d6c69	Code comments	2015-06-30 19:25:57 -07:00
Colin McLeod	a189265326	Fix svg click bug in Chrome	2015-06-30 19:25:36 -07:00
Colin McLeod	b447e913ff	no need to abbreviate shield details	2015-06-29 16:28:41 -07:00
Colin McLeod	b5a249fb4b	Change latest version date format	2015-06-29 16:27:56 -07:00
Colin McLeod	ae081c147e	Fix negative power for limpet controllers	2015-06-29 15:42:35 -07:00
Colin McLeod	3ce0d0bdd8	Add dps to outfit page	2015-06-29 15:03:04 -07:00
Colin McLeod	a71abd9fe3	Bumping version to 0.14.1	2015-06-29 14:59:30 -07:00
Colin McLeod	f1d804e3a1	Adding total DPS to outfit page and comparisons	2015-06-29 11:57:29 -07:00
Colin McLeod	aa7479d111	Updating Federal Dropship agility	2015-06-29 10:36:49 -07:00
Colin McLeod	7c23fb3884	Bumping version to 0.14.0	2015-06-26 11:00:46 -07:00
Colin McLeod	b707015d9c	Fix power plant toggle power bug	2015-06-26 11:00:11 -07:00
Colin McLeod	10d5611dcd	Seperate discounts for ship and components, added discounts for 5,10,15,20,25 percent off	2015-06-25 20:26:22 -07:00