diff --git a/.prettierignore b/.prettierignore
index 3f7bbbd2b..10997bab0 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -13,3 +13,4 @@ markdown
 
 package.json
 package.lock.json
+tsdoc-metadata.json
diff --git a/dist/bitburner.d.ts b/dist/bitburner.d.ts
index 3fce41e28..a547348c9 100644
--- a/dist/bitburner.d.ts
+++ b/dist/bitburner.d.ts
@@ -505,10 +505,10 @@ export declare interface Bladeburner {
      * Returns the estimated number of Synthoids in the specified city,
      * or -1 if an invalid city was specified.
      *
-     * @param cityName - Name of city. Case-sensitive
+     * @param city - Name of city. Case-sensitive
      * @returns Estimated number of Synthoids in the specified city.
      */
-    getCityEstimatedPopulation(name: string): number;
+    getCityEstimatedPopulation(city: CityName | `${CityName}`): number;
 
     /**
      * Get number of communities in a city.
@@ -518,10 +518,10 @@ export declare interface Bladeburner {
      * Returns the estimated number of Synthoid communities in the specified city,
      * or -1 if an invalid city was specified.
      *
-     * @param cityName - Name of city. Case-sensitive
+     * @param city - Name of city. Case-sensitive
      * @returns Number of Synthoids communities in the specified city.
      */
-    getCityCommunities(name: string): number;
+    getCityCommunities(city: CityName | `${CityName}`): number;
 
     /**
      * Get chaos of a city.
@@ -531,10 +531,10 @@ export declare interface Bladeburner {
      * Returns the chaos in the specified city,
      * or -1 if an invalid city was specified.
      *
-     * @param cityName - Name of city. Case-sensitive
+     * @param city - Name of city. Case-sensitive
      * @returns Chaos in the specified city.
      */
-    getCityChaos(name: string): number;
+    getCityChaos(city: CityName | `${CityName}`): number;
 
     /**
      * Get current city.
@@ -545,7 +545,7 @@ export declare interface Bladeburner {
      *
      * @returns City that the player is currently in (for Bladeburner).
      */
-    getCity(): string;
+    getCity(): CityName;
 
     /**
      * Travel to another city in bladeburner.
@@ -555,10 +555,10 @@ export declare interface Bladeburner {
      *
      * Returns true if successful, and false otherwise
      *
-     * @param cityName - Name of city. Case-sensitive
+     * @param city - Name of city. Case-sensitive
      * @returns true if successful, and false otherwise
      */
-    switchCity(name: string): boolean;
+    switchCity(city: CityName | `${CityName}`): boolean;
 
     /**
      * Get bladeburner stamina.
@@ -651,6 +651,17 @@ export declare interface BladeburnerCurAction {
     name: string;
 }
 
+/** Names of all cities
+ * @public */
+export declare enum CityName {
+    Aevum = "Aevum",
+    Chongqing = "Chongqing",
+    Sector12 = "Sector-12",
+    NewTokyo = "New Tokyo",
+    Ishima = "Ishima",
+    Volhaven = "Volhaven",
+}
+
 /**
  * Coding Contract API
  * @public
@@ -768,59 +779,144 @@ export declare interface CodingContract {
  */
 export declare type CodingContractData = any;
 
-/** @public */
-export declare enum CompanyPosName {
-    sw0 = "Software Engineering Intern",
-    sw1 = "Junior Software Engineer",
-    sw2 = "Senior Software Engineer",
-    sw3 = "Lead Software Developer",
-    sw4 = "Head of Software",
-    sw5 = "Head of Engineering",
-    sw6 = "Vice President of Technology",
-    sw7 = "Chief Technology Officer",
-    IT0 = "IT Intern",
-    IT1 = "IT Analyst",
-    IT2 = "IT Manager",
-    IT3 = "Systems Administrator",
-    secEng = "Security Engineer",
-    netEng0 = "Network Engineer",
-    netEng1 = "Network Administrator",
-    bus0 = "Business Intern",
-    bus1 = "Business Analyst",
-    bus2 = "Business Manager",
-    bus3 = "Operations Manager",
-    bus4 = "Chief Financial Officer",
-    bus5 = "Chief Executive Officer",
-    sec0 = "Police Officer",
-    sec1 = "Police Chief",
-    sec2 = "Security Guard",
-    sec3 = "Security Officer",
-    sec4 = "Security Supervisor",
-    sec5 = "Head of Security",
-    agent0 = "Field Agent",
-    agent1 = "Secret Agent",
-    agent2 = "Special Operative",
-    waiter = "Waiter",
-    employee = "Employee",
-    softCons0 = "Software Consultant",
-    softCons1 = "Senior Software Consultant",
-    busCons0 = "Business Consultant",
-    busCons1 = "Senior Business Consultant",
-    waiterPT = "Part-time Waiter",
-    employeePT = "Part-time Employee",
+/**
+ * Corporation related constants
+ * @public
+ */
+export declare interface CorpConstants {
+    /** Names of all corporation game states */
+    stateNames: CorpStateName[];
+    /** Names of all industries */
+    industryNames: CorpIndustryName[];
+    /** Names of all materials */
+    materialNames: CorpMaterialName[];
+    /** Names of all one-time corporation-wide unlocks */
+    unlockNames: CorpUnlockName[];
+    /** Names of all corporation-wide upgrades */
+    upgradeNames: CorpUpgradeName[];
+    /** Names of all researches common to all industries */
+    researchNamesBase: CorpResearchName[];
+    /** Names of all researches only available to product industries */
+    researchNamesProductOnly: CorpResearchName[];
+    /** Names of all researches */
+    researchNames: CorpResearchName[];
+    initialShares: number;
+    /** When selling large number of shares, price is dynamically updated for every batch of this amount */
+    sharesPerPriceUpdate: number;
+    /** Cooldown for issue new shares cooldown in game cycles (1 game cycle = 200ms) */
+    issueNewSharesCooldown: number;
+    /** Cooldown for selling shares in game cycles (1 game cycle = 200ms) */
+    sellSharesCooldown: number;
+    coffeeCostPerEmployee: number;
+    gameCyclesPerMarketCycle: number;
+    gameCyclesPerCorpStateCycle: number;
+    secondsPerMarketCycle: number;
+    warehouseInitialCost: number;
+    warehouseInitialSize: number;
+    warehouseSizeUpgradeCostBase: number;
+    officeInitialCost: number;
+    officeInitialSize: number;
+    officeSizeUpgradeCostBase: number;
+    bribeThreshold: number;
+    bribeAmountPerReputation: number;
+    baseProductProfitMult: number;
+    dividendMaxRate: number;
+    /** Conversion factor for employee stats to initial salary */
+    employeeSalaryMultiplier: number;
+    marketCyclesPerEmployeeRaise: number;
+    employeeRaiseAmount: number;
+    /** Max products for a division without upgrades */
+    maxProductsBase: number;
 }
 
+/** @public */
+export declare type CorpEmployeePosition =
+| "Operations"
+| "Engineer"
+| "Business"
+| "Management"
+| "Research & Development"
+| "Training"
+| "Unassigned";
+
+/** Data for an individual industry
+ *  @public */
+export declare interface CorpIndustryData {
+    startingCost: number;
+    description: string;
+    product?: CorpProductData;
+    recommendStarting: boolean;
+    requiredMaterials: Partial<Record<CorpMaterialName, number>>;
+    /** Real estate factor */
+    realEstateFactor?: number;
+    /** Scientific research factor (affects quality) */
+    scienceFactor?: number;
+    /** Hardware factor */
+    hardwareFactor?: number;
+    /** Robots factor */
+    robotFactor?: number;
+    /** AI Cores factor */
+    aiCoreFactor?: number;
+    /** Advertising factor (affects sales) */
+    advertisingFactor?: number;
+    producedMaterials?: CorpMaterialName[];
+}
+
+/** @public */
+export declare type CorpIndustryName =
+| "Energy"
+| "Water Utilities"
+| "Agriculture"
+| "Fishing"
+| "Mining"
+| "Food"
+| "Tobacco"
+| "Chemical"
+| "Pharmaceutical"
+| "Computer Hardware"
+| "Robotics"
+| "Software"
+| "Healthcare"
+| "Real Estate";
+
+/**
+ * Corporation material information
+ * @public
+ */
+export declare interface CorpMaterialConstantData {
+    /** Name of the material */
+    name: string;
+    /** Size of the material */
+    size: number;
+    demandBase: number;
+    /** Min and max demand */
+    demandRange: [min: number, max: number];
+    competitionBase: number;
+    competitionRange: [min: number, max: number];
+    baseCost: number;
+    maxVolatility: number;
+    baseMarkup: number;
+}
+
+/** @public */
+export declare type CorpMaterialName =
+| "Water"
+| "Energy"
+| "Food"
+| "Plants"
+| "Metal"
+| "Hardware"
+| "Chemicals"
+| "Drugs"
+| "Robots"
+| "AI Cores"
+| "Real Estate";
+
 /**
  * Corporation API
  * @public
  */
 export declare interface Corporation extends WarehouseAPI, OfficeAPI {
-    /** Enums specific to the corporation game mechanic. */
-    enums: {
-        EmployeePositions: typeof EmployeePositions;
-        IndustryType: typeof IndustryType;
-    };
-
     /** Returns whether the player has a corporation. Does not require API access.
      * @returns whether the player has a corporation */
     hasCorporation(): boolean;
@@ -851,34 +947,19 @@ export declare interface Corporation extends WarehouseAPI, OfficeAPI {
      * @returns cost of the upgrade */
     getUpgradeLevelCost(upgradeName: string): number;
 
-    /** Gets the cost to expand into a new industry
-     * @param industryName - Name of the industry
-     * @returns cost */
-    getExpandIndustryCost(industryName: IndustryType | `${IndustryType}`): number;
-
-    /** Gets the cost to expand into a new city
-     * @returns cost */
-    getExpandCityCost(): number;
-
     /** Get an offer for investment based on you companies current valuation
      * @returns An offer of investment */
     getInvestmentOffer(): InvestmentOffer;
 
-    /** Get list of materials
-     * @returns material names */
-    getMaterialNames(): string[];
+    /** Get corporation related constants
+     * @returns corporation related constants */
+    getConstants(): CorpConstants;
 
-    /** Get list of one-time unlockable upgrades
-     * @returns unlockable upgrades names */
-    getUnlockables(): string[];
+    /** Get constant industry definition data for a specific industry */
+    getIndustryData(industryName: CorpIndustryName): CorpIndustryData;
 
-    /**  Get list of upgrade names
-     * @returns upgrade names */
-    getUpgradeNames(): string[];
-
-    /** Get list of research names
-     * @returns research names */
-    getResearchNames(): string[];
+    /** Get constant data for a specific material */
+    getMaterialData(materialName: CorpMaterialName): CorpMaterialConstantData;
 
     /** Accept investment based on you companies current valuation
      * @remarks
@@ -909,12 +990,12 @@ export declare interface Corporation extends WarehouseAPI, OfficeAPI {
     /** Expand to a new industry
      * @param industryType - Name of the industry
      * @param divisionName - Name of the division */
-    expandIndustry(industryType: IndustryType | `${IndustryType}`, divisionName: string): void;
+    expandIndustry(industryType: CorpIndustryName, divisionName: string): void;
 
     /** Expand to a new city
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city */
-    expandCity(divisionName: string, cityName: string): void;
+     * @param city - Name of the city */
+    expandCity(divisionName: string, city: CityName | `${CityName}`): void;
 
     /** Unlock an upgrade
      * @param upgradeName - Name of the upgrade */
@@ -928,6 +1009,11 @@ export declare interface Corporation extends WarehouseAPI, OfficeAPI {
      * @param rate - Fraction of profit to issue as dividends. */
     issueDividends(rate: number): void;
 
+    /** Issue new shares
+     * @param amount - Number of new shares to issue, will be rounded to nearest 10m. Defaults to max amount.
+     * @returns Amount of funds generated for the corporation. */
+    issueNewShares(amount?: number): number;
+
     /** Buyback Shares
      * @param amount - Amount of shares to buy back. */
     buyBackShares(amount: number): void;
@@ -976,10 +1062,84 @@ export declare interface CorporationInfo {
     dividendEarnings: number;
     /** State of the corporation. Possible states are START, PURCHASE, PRODUCTION, SALE, EXPORT. */
     state: string;
-    /** Array of all divisions */
-    divisions: Division[];
+    /** Array of all division names */
+    divisions: string[];
 }
 
+/** Product rating information
+ *  @public */
+export declare type CorpProductData = {
+    /** Name of the product */
+    name: string;
+    /** Verb used to describe creation of the product */
+    verb: string;
+    /** Description of product creation */
+    desc: string;
+    /** Weighting factors for product  */
+    ratingWeights: {
+        aesthetics?: number;
+        durability?: number;
+        features?: number;
+        quality?: number;
+        performance?: number;
+        reliability?: number;
+    };
+};
+
+/** @public */
+export declare type CorpResearchName =
+| "Hi-Tech R&D Laboratory"
+| "AutoBrew"
+| "AutoPartyManager"
+| "Automatic Drug Administration"
+| "Bulk Purchasing"
+| "CPH4 Injections"
+| "Drones"
+| "Drones - Assembly"
+| "Drones - Transport"
+| "Go-Juice"
+| "HRBuddy-Recruitment"
+| "HRBuddy-Training"
+| "JoyWire"
+| "Market-TA.I"
+| "Market-TA.II"
+| "Overclock"
+| "Self-Correcting Assemblers"
+| "Sti.mu"
+| "uPgrade: Capacity.I"
+| "uPgrade: Capacity.II"
+| "uPgrade: Dashboard"
+| "uPgrade: Fulcrum"
+| "sudo.Assist";
+
+/** @public */
+export declare type CorpStateName = "START" | "PURCHASE" | "PRODUCTION" | "SALE" | "EXPORT";
+
+/** @public */
+export declare type CorpUnlockName =
+| "Export"
+| "Smart Supply"
+| "Market Research - Demand"
+| "Market Data - Competition"
+| "VeChain"
+| "Shady Accounting"
+| "Government Partnership"
+| "Warehouse API"
+| "Office API";
+
+/** @public */
+export declare type CorpUpgradeName =
+| "Smart Factories"
+| "Smart Storage"
+| "DreamSense"
+| "Wilson Analytics"
+| "Nuoptimal Nootropic Injector Implants"
+| "Speech Processor Implants"
+| "Neural Accelerators"
+| "FocusWires"
+| "ABC SalesBots"
+| "Project Insight";
+
 /**
  * Data representing the internal values of a crime.
  * @public
@@ -1049,7 +1209,7 @@ export declare interface Division {
     /** Name of the division */
     name: string;
     /** Type of division, like Agriculture */
-    type: string;
+    type: CorpIndustryName;
     /** Awareness of the division */
     awareness: number;
     /** Popularity of the division */
@@ -1069,24 +1229,13 @@ export declare interface Division {
     /** All research bought */
     upgrades: number[];
     /** Cities in which this division has expanded */
-    cities: string[];
+    cities: CityName[];
     /** Products developed by this division */
     products: string[];
     /** Whether the industry this division is in is capable of making products */
     makesProducts: boolean;
 }
 
-/** @public */
-export declare enum EmployeePositions {
-    Operations = "Operations",
-    Engineer = "Engineer",
-    Business = "Business",
-    Management = "Management",
-    RandD = "Research & Development",
-    Training = "Training",
-    Unassigned = "Unassigned",
-}
-
 /**
  * Object representing data representing a gang member equipment.
  * @public
@@ -1114,7 +1263,7 @@ export declare interface Export {
     /** Division the material is being exported to */
     div: string;
     /** City the material is being exported to */
-    loc: string;
+    loc: CityName;
     /** Amount of material exported */
     amt: string;
 }
@@ -2396,26 +2545,29 @@ export declare interface HP {
 
 /** @public */
 export declare interface ILocation {
-    city: string;
-    name: string;
+    city: CityName;
+    name: LocationName;
 }
 
-/** @public */
-export declare enum IndustryType {
-    Energy = "Energy",
-    Utilities = "Water Utilities",
-    Agriculture = "Agriculture",
-    Fishing = "Fishing",
-    Mining = "Mining",
-    Food = "Food",
-    Tobacco = "Tobacco",
-    Chemical = "Chemical",
-    Pharmaceutical = "Pharmaceutical",
-    Computers = "Computer Hardware",
-    Robotics = "Robotics",
-    Software = "Software",
-    Healthcare = "Healthcare",
-    RealEstate = "RealEstate",
+/**
+ * Corporation industry information
+ * @public
+ */
+export declare interface IndustryData {
+    /** Industry type */
+    type: CorpIndustryName;
+    /** Cost to expand to the division */
+    cost: number;
+    /** Materials required for production and their amounts */
+    requiredMaterials: Record<string, number>;
+    /** Materials produced */
+    producedMaterials?: string[];
+    /** Whether the division makes materials */
+    makesMaterials: boolean;
+    /** Whether the division makes products */
+    makesProducts: boolean;
+    /** Product type */
+    productType?: string;
 }
 
 /**
@@ -2477,6 +2629,48 @@ export declare interface IStyleSettings {
     lineHeight: number;
 }
 
+/** @public */
+export declare enum JobName {
+    software0 = "Software Engineering Intern",
+    software1 = "Junior Software Engineer",
+    software2 = "Senior Software Engineer",
+    software3 = "Lead Software Developer",
+    software4 = "Head of Software",
+    software5 = "Head of Engineering",
+    software6 = "Vice President of Technology",
+    software7 = "Chief Technology Officer",
+    IT0 = "IT Intern",
+    IT1 = "IT Analyst",
+    IT2 = "IT Manager",
+    IT3 = "Systems Administrator",
+    securityEng = "Security Engineer",
+    networkEng0 = "Network Engineer",
+    networkEng1 = "Network Administrator",
+    business0 = "Business Intern",
+    business1 = "Business Analyst",
+    business2 = "Business Manager",
+    business3 = "Operations Manager",
+    business4 = "Chief Financial Officer",
+    business5 = "Chief Executive Officer",
+    security0 = "Police Officer",
+    security1 = "Police Chief",
+    security2 = "Security Guard",
+    security3 = "Security Officer",
+    security4 = "Security Supervisor",
+    security5 = "Head of Security",
+    agent0 = "Field Agent",
+    agent1 = "Secret Agent",
+    agent2 = "Special Operative",
+    waiter = "Waiter",
+    employee = "Employee",
+    softwareConsult0 = "Software Consultant",
+    softwareConsult1 = "Senior Software Consultant",
+    businessConsult0 = "Business Consultant",
+    businessConsult1 = "Senior Business Consultant",
+    waiterPT = "Part-time Waiter",
+    employeePT = "Part-time Employee",
+}
+
 /** Names of all locations
  * @public */
 export declare enum LocationName {
@@ -2551,7 +2745,7 @@ export declare enum LocationName {
  */
 export declare interface Material {
     /** Name of the material */
-    name: string;
+    name: CorpMaterialName;
     /** Amount of material  */
     qty: number;
     /** Quality of the material */
@@ -2912,6 +3106,9 @@ export declare interface NS {
      */
     readonly args: (string | number | boolean)[];
 
+    /** The current script's PID */
+    readonly pid: number;
+
     /**
      * Steal a server's money.
      * @remarks
@@ -3975,7 +4172,7 @@ export declare interface NS {
      * const files = ["hack.js","weaken.js","grow.js"];
      * ns.scp(files, server, "home");
      * ```
-     * @param files - Filename or an array of filenames of script/literature files to copy.
+     * @param files - Filename or an array of filenames of script/literature files to copy. Note that if a file is located in a subdirectory, the filename must include the leading `/`.
      * @param destination - Hostname of the destination server, which is the server to which the file will be copied.
      * @param source - Hostname of the source server, which is the server from which the file will be copied. This argument is optional and if it’s omitted the source will be the current server.
      * @returns True if the file is successfully copied over and false otherwise. If the files argument is an array then this function will return false if any of the operations failed.
@@ -4073,7 +4270,7 @@ export declare interface NS {
     /**
      * Get hacking related multipliers.
      * @remarks
-     * RAM cost: 4 GB
+     * RAM cost: 0.25 GB
      *
      * Returns an object containing the Player’s hacking related multipliers.
      * These multipliers are returned in fractional forms, not percentages
@@ -4102,7 +4299,7 @@ export declare interface NS {
     /**
      * Get hacknet related multipliers.
      * @remarks
-     * RAM cost: 4 GB
+     * RAM cost: 0.25 GB
      *
      * Returns an object containing the Player’s hacknet related multipliers.
      * These multipliers are returned in fractional forms, not percentages
@@ -5217,13 +5414,14 @@ export declare interface NS {
 
 /** @public */
 export declare type NSEnums = {
-    toast: typeof ToastVariant;
+    CityName: typeof CityName;
     CrimeType: typeof CrimeType;
     FactionWorkType: typeof FactionWorkType;
     GymType: typeof GymType;
-    UniversityClassType: typeof UniversityClassType;
-    CompanyPosName: typeof CompanyPosName;
+    JobName: typeof JobName;
     LocationName: typeof LocationName;
+    ToastVariant: typeof ToastVariant;
+    UniversityClassType: typeof UniversityClassType;
 };
 
 /**
@@ -5232,7 +5430,7 @@ export declare type NSEnums = {
  */
 export declare interface Office {
     /** City of the office */
-    loc: string;
+    loc: CityName;
     /** Maximum number of employee */
     size: number;
     /** Minimum amount of energy of the employees */
@@ -5256,9 +5454,9 @@ export declare interface Office {
     /** Average morale of the employees */
     avgMor: number;
     /** Production of the employees */
-    employeeProd: Record<`${EmployeePositions}`, number>;
+    employeeProd: Record<CorpEmployeePosition, number>;
     /** Positions of the employees */
-    employeeJobs: Record<`${EmployeePositions}`, number>;
+    employeeJobs: Record<CorpEmployeePosition, number>;
 }
 
 /**
@@ -5272,37 +5470,37 @@ export declare interface OfficeAPI {
     /**
      * Hire an employee.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param employeePosition - Position to place into. Defaults to "Unassigned".
      * @returns True if an employee was hired, false otherwise
      */
     hireEmployee(
     divisionName: string,
-    cityName: string,
-    employeePosition?: EmployeePositions | `${EmployeePositions}`,
+    city: CityName | `${CityName}`,
+    employeePosition?: CorpEmployeePosition,
     ): boolean;
     /**
      * Upgrade office size.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param size - Amount of positions to open
      */
-    upgradeOfficeSize(divisionName: string, cityName: string, size: number): void;
+    upgradeOfficeSize(divisionName: string, city: CityName | `${CityName}`, size: number): void;
     /**
      * Throw a party for your employees
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param costPerEmployee - Amount to spend per employee.
      * @returns Multiplier for happiness and morale, or zero on failure
      */
-    throwParty(divisionName: string, cityName: string, costPerEmployee: number): number;
+    throwParty(divisionName: string, city: CityName | `${CityName}`, costPerEmployee: number): number;
     /**
      * Buy coffee for your employees
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @returns true if buying coffee was successful, false otherwise
      */
-    buyCoffee(divisionName: string, cityName: string): boolean;
+    buyCoffee(divisionName: string, city: CityName | `${CityName}`): boolean;
     /**
      * Hire AdVert.
      * @param divisionName - Name of the division
@@ -5317,24 +5515,22 @@ export declare interface OfficeAPI {
     /**
      * Get data about an office
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @returns Office data
      */
-    getOffice(divisionName: string, cityName: string): Office;
+    getOffice(divisionName: string, city: CityName | `${CityName}`): Office;
     /**
-     * Get data about an employee
-     * @param divisionName - Name of the division
-     * @param cityName - Name of the city
-     * @param employeeName - Name of the employee
-     * @returns Employee data
+     * Get the cost to hire AdVert.
+     * @param divisionName - Name of the division.
+     * @returns The cost to hire AdVert.
      */
     getHireAdVertCost(divisionName: string): number;
     /**
-     * Get the number of times you have Hired AdVert
-     * @param divisionName - Name of the division
-     * @returns Number of times you have Hired AdVert
+     * Get the number of times you have hired AdVert.
+     * @param divisionName - Name of the division.
+     * @returns Number of times you have hired AdVert.
      */
-    getHireAdVertCount(adivisionName: string): number;
+    getHireAdVertCount(divisionName: string): number;
     /**
      * Get the cost to unlock research
      * @param divisionName - Name of the division
@@ -5352,20 +5548,20 @@ export declare interface OfficeAPI {
     /**
      * Set the auto job assignment for a job
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param job - Name of the job
      * @param amount - Number of employees to assign to that job
      * @returns true if the employee count reached the target amount, false if not
      */
-    setAutoJobAssignment(divisionName: string, cityName: string, job: string, amount: number): boolean;
+    setAutoJobAssignment(divisionName: string, city: CityName | `${CityName}`, job: string, amount: number): boolean;
     /**
      * Cost to Upgrade office size.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param size - Amount of positions to open
      * @returns Cost of upgrading the office
      */
-    getOfficeSizeUpgradeCost(divisionName: string, cityName: string, asize: number): number;
+    getOfficeSizeUpgradeCost(divisionName: string, city: CityName | `${CityName}`, asize: number): number;
 }
 
 /** @public */
@@ -5382,7 +5578,7 @@ export declare interface Person {
     skills: Skills;
     exp: Skills;
     mults: Multipliers;
-    city: string;
+    city: CityName;
 }
 
 /** @public */
@@ -5445,7 +5641,7 @@ export declare interface Product {
     /** Data refers to the production, sale, and quantity of the products
      * These values are specific to a city
      * For each city, the data is [qty, prod, sell] */
-    cityData: { [key: string]: number[] };
+    cityData: Record<CityName | `${CityName}`, number[]>;
     /** Creation progress - A number between 0-100 representing percentage */
     developmentProgress: number;
 }
@@ -5695,7 +5891,7 @@ export declare interface Singularity {
      * @param city - City to travel to.
      * @returns True if action is successful, false otherwise.
      */
-    travelToCity(city: string): boolean;
+    travelToCity(city: CityName | `${CityName}`): boolean;
 
     /**
      * Purchase the TOR router.
@@ -6111,7 +6307,7 @@ export declare interface Singularity {
      *
      * This function returns the number of milliseconds it takes to attempt the
      * specified crime (e.g It takes 60 seconds to attempt the ‘Rob Store’ crime,
-     * so running `commitCrime('ROBSTORE')` will return 60,000).
+     * so running `commitCrime('Rob Store')` will return 60,000).
      *
      * @param crime - Name of crime to attempt.
      * @param focus - Acquire player focus on this crime. Optional. Defaults to true.
@@ -6590,23 +6786,12 @@ export declare interface Sleeve {
      *
      * @example
      * ```ts
-     * // NS1
-     * // Assign the first 3 sleeves to commit various crimes.
-     * var crime = ["MUG", "ROBSTORE", "SHOPLIFT"];
-     * for (var i = 0; i < crime.length; i++) {
-     *     tprintf("Sleeve %d commits crime: %s", i, crime[i]);
-     *     sleeve.setToCommitCrime(i, crime[i]);
-     * }
-     * ```
-     * @example
-     * ```ts
-     * // NS2
-     * // Assign the first 3 sleeves to commit various crimes.
-     * const crime = ["MUG", "ROBSTORE", "SHOPLIFT"];
-     * for (let i = 0; i < crime.length; i++) {
-     *     ns.tprintf("Sleeve %d commits crime: %s", i, crime[i]);
-     *     ns.sleeve.setToCommitCrime(i, crime[i]);
-     * }
+     * // Assigns the first sleeve to Homicide.
+     * ns.sleeve.setToCommitCrime(0, "Homicide");
+     *
+     * // Assigns the second sleeve to Grand Theft Auto, using enum
+     * const crimes = ns.enums.CrimeType;
+     * ns.sleeve.setToCommitCrime(1, crimes.grandTheftAuto)
      * ```
      *
      * @param sleeveNumber - Index of the sleeve to start committing crime. Sleeves are numbered starting from 0.
@@ -6682,10 +6867,10 @@ export declare interface Sleeve {
      * Return a boolean indicating whether or not the sleeve reached destination.
      *
      * @param sleeveNumber - Index of the sleeve to travel.
-     * @param cityName - Name of the destination city.
+     * @param city - Name of the destination city.
      * @returns True if the sleeve reached destination, false otherwise.
      */
-    travel(sleeveNumber: number, cityName: string): boolean;
+    travel(sleeveNumber: number, city: CityName | `${CityName}`): boolean;
 
     /**
      * Get augmentations installed on a sleeve.
@@ -7012,20 +7197,8 @@ export declare interface TIX {
      * 1. TIX API Access
      *
      * @example
-     * ```ts
-     * // NS1
-     * stock.getPrice("FSIG");
-     *
-     * // Choose the first stock symbol from the array of stock symbols.  Get the price
-     * // of the corresponding stock.
-     * var sym = stock.getSymbols()[0];
-     * tprint("Stock symbol: " + sym);
-     * tprint("Stock price: " + stock.getPrice(sym));
-     * ```
-     * @example
-     * ```ts
-     * // NS2
-     * ns.stock.getPrice("FSIG");
+     * ```js
+     * const fourSigmaStockPrice = ns.stock.getPrice("FSIG");
      *
      * // Choose the first stock symbol from the array of stock symbols.  Get the price
      * // of the corresponding stock.
@@ -7578,7 +7751,7 @@ export declare interface Warehouse {
     /** Amount of size upgrade bought */
     level: number;
     /** City in which the warehouse is located */
-    loc: string;
+    loc: CityName;
     /** Total space in the warehouse */
     size: number;
     /** Used space in the warehouse */
@@ -7597,16 +7770,22 @@ export declare interface WarehouseAPI {
     /**
      * Set material sell data.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @param amt - Amount to sell, can be "MAX"
      * @param price - Price to sell, can be "MP"
      */
-    sellMaterial(divisionName: string, cityName: string, materialName: string, amt: string, price: string): void;
+    sellMaterial(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    amt: string,
+    price: string,
+    ): void;
     /**
      * Set product sell data.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param productName - Name of the product
      * @param amt - Amount to sell, can be "MAX"
      * @param price - Price to sell, can be "MP"
@@ -7614,7 +7793,7 @@ export declare interface WarehouseAPI {
      */
     sellProduct(
     divisionName: string,
-    cityName: string,
+    city: CityName | `${CityName}`,
     productName: string,
     amt: string,
     price: string,
@@ -7629,41 +7808,46 @@ export declare interface WarehouseAPI {
     /**
      * Set smart supply
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param enabled - smart supply enabled
      */
-    setSmartSupply(divisionName: string, cityName: string, enabled: boolean): void;
+    setSmartSupply(divisionName: string, city: CityName | `${CityName}`, enabled: boolean): void;
     /**
      * Set whether smart supply uses leftovers before buying
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @param enabled - smart supply use leftovers enabled
      */
-    setSmartSupplyUseLeftovers(divisionName: string, cityName: string, materialName: string, enabled: boolean): void;
+    setSmartSupplyUseLeftovers(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    enabled: boolean,
+    ): void;
     /**
      * Set material buy data
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @param amt - Amount of material to buy
      */
-    buyMaterial(divisionName: string, cityName: string, materialName: string, amt: number): void;
+    buyMaterial(divisionName: string, city: CityName | `${CityName}`, materialName: string, amt: number): void;
     /**
      * Set material to bulk buy
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @param amt - Amount of material to buy
      */
-    bulkPurchase(divisionName: string, cityName: string, materialName: string, amt: number): void;
+    bulkPurchase(divisionName: string, city: CityName | `${CityName}`, materialName: string, amt: number): void;
     /**
      * Get warehouse data
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @returns warehouse data
      */
-    getWarehouse(divisionName: string, cityName: string): Warehouse;
+    getWarehouse(divisionName: string, city: CityName | `${CityName}`): Warehouse;
     /**
      * Get product data
      * @param divisionName - Name of the division
@@ -7674,26 +7858,27 @@ export declare interface WarehouseAPI {
     /**
      * Get material data
      * @param divisionName - Name of the division
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @returns material data
      */
-    getMaterial(divisionName: string, cityName: string, materialName: string): Material;
+    getMaterial(divisionName: string, city: CityName | `${CityName}`, materialName: string): Material;
     /**
      * Set market TA 1 for a material.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @param on - market ta enabled
      */
-    setMaterialMarketTA1(divisionName: string, cityName: string, materialName: string, on: boolean): void;
+    setMaterialMarketTA1(divisionName: string, city: CityName | `${CityName}`, materialName: string, on: boolean): void;
     /**
      * Set market TA 2 for a material.
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param materialName - Name of the material
      * @param on - market ta enabled
      */
-    setMaterialMarketTA2(divisionName: string, cityName: string, materialName: string, on: boolean): void;
+    setMaterialMarketTA2(divisionName: string, city: CityName | `${CityName}`, materialName: string, on: boolean): void;
     /**
      * Set market TA 1 for a product.
      * @param divisionName - Name of the division
@@ -7719,9 +7904,9 @@ export declare interface WarehouseAPI {
      */
     exportMaterial(
     sourceDivision: string,
-    sourceCity: string,
+    sourceCity: CityName | `${CityName}`,
     targetDivision: string,
-    targetCity: string,
+    targetCity: CityName | `${CityName}`,
     materialName: string,
     amt: number,
     ): void;
@@ -7736,36 +7921,36 @@ export declare interface WarehouseAPI {
      */
     cancelExportMaterial(
     sourceDivision: string,
-    sourceCity: string,
+    sourceCity: CityName | `${CityName}`,
     targetDivision: string,
-    targetCity: string,
+    targetCity: CityName | `${CityName}`,
     materialName: string,
     amt: number,
     ): void;
     /**
      * Purchase warehouse for a new city
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      */
-    purchaseWarehouse(divisionName: string, cityName: string): void;
+    purchaseWarehouse(divisionName: string, city: CityName | `${CityName}`): void;
     /**
      * Upgrade warehouse
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param amt - amount of upgrades defaults to 1
      */
-    upgradeWarehouse(divisionName: string, cityName: string, amt?: number): void;
+    upgradeWarehouse(divisionName: string, city: CityName | `${CityName}`, amt?: number): void;
     /**
      * Create a new product
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
+     * @param city - Name of the city
      * @param productName - Name of the product
      * @param designInvest - Amount to invest for the design of the product.
      * @param marketingInvest - Amount to invest for the marketing of the product.
      */
     makeProduct(
     divisionName: string,
-    cityName: string,
+    city: CityName | `${CityName}`,
     productName: string,
     designInvest: number,
     marketingInvest: number,
@@ -7773,37 +7958,37 @@ export declare interface WarehouseAPI {
     /**
      * Limit Material Production.
      * @param divisionName - Name of the division.
-     * @param cityName - Name of the city.
+     * @param city - Name of the city.
      * @param materialName - Name of the material.
      * @param qty - Amount to limit to. Pass a negative value to remove the limit instead.
      */
-    limitMaterialProduction(divisionName: string, cityName: string, materialName: string, qty: number): void;
+    limitMaterialProduction(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    qty: number,
+    ): void;
     /**
      * Limit Product Production.
      * @param divisionName - Name of the division.
-     * @param cityName - Name of the city.
+     * @param city - Name of the city.
      * @param productName - Name of the product.
      * @param qty - Amount to limit to. Pass a negative value to remove the limit instead.
      */
-    limitProductProduction(divisionName: string, cityName: string, productName: string, qty: number): void;
-    /**
-     * Gets the cost to purchase a warehouse
-     * @returns cost
-     */
-    getPurchaseWarehouseCost(): number;
+    limitProductProduction(divisionName: string, city: CityName | `${CityName}`, productName: string, qty: number): void;
     /**
      * Gets the cost to upgrade a warehouse to the next level
      * @param divisionName - Name of the division
-     * @param cityName - Name of the city
-     * @param amt - amount of upgrades defaults to 1
+     * @param city - Name of the city
+     * @param amt - amount of upgrades. Optional, defaults to 1
      * @returns cost to upgrade
      */
-    getUpgradeWarehouseCost(adivisionName: string, acityName: string, amt?: number): number;
+    getUpgradeWarehouseCost(divisionName: string, city: CityName | `${CityName}`, amt?: number): number;
     /**
      * Check if you have a warehouse in city
      * @returns true if warehouse is present, false if not
      */
-    hasWarehouse(adivisionName: string, acityName: string): boolean;
+    hasWarehouse(divisionName: string, city: CityName | `${CityName}`): boolean;
 }
 
 /**
@@ -7825,12 +8010,7 @@ export declare interface WorkFormulas {
     /** @returns The WorkStats applied every game cycle (200ms) by performing the specified faction work. */
     factionGains(person: Person, workType: FactionWorkType | `${FactionWorkType}`, favor: number): WorkStats;
     /** @returns The WorkStats applied every game cycle (200ms) by performing the specified company work. */
-    companyGains(
-    person: Person,
-    companyName: string,
-    workType: CompanyPosName | `${CompanyPosName}`,
-    favor: number,
-    ): WorkStats;
+    companyGains(person: Person, companyName: string, workType: JobName | `${JobName}`, favor: number): WorkStats;
 }
 
 /** @public */
diff --git a/jest.config.js b/jest.config.js
index 8f75f0c29..f2a33a3d3 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -11,5 +11,6 @@ module.exports = {
     "\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js",
     "\\!!raw-loader!.*$": "<rootDir>/test/__mocks__/rawLoader.js",
     "@player": "<rootDir>/src/Player",
+    "@nsdefs": "<rootDir>/src/ScriptEditor/NetscriptDefinitions",
   },
 };
diff --git a/markdown/bitburner.bladeburner.getcity.md b/markdown/bitburner.bladeburner.getcity.md
index a97627638..0bb805701 100644
--- a/markdown/bitburner.bladeburner.getcity.md
+++ b/markdown/bitburner.bladeburner.getcity.md
@@ -9,11 +9,11 @@ Get current city.
 <b>Signature:</b>
 
 ```typescript
-getCity(): string;
+getCity(): CityName;
 ```
 <b>Returns:</b>
 
-string
+[CityName](./bitburner.cityname.md)
 
 City that the player is currently in (for Bladeburner).
 
diff --git a/markdown/bitburner.bladeburner.getcitychaos.md b/markdown/bitburner.bladeburner.getcitychaos.md
index 20b997e38..e45cadb12 100644
--- a/markdown/bitburner.bladeburner.getcitychaos.md
+++ b/markdown/bitburner.bladeburner.getcitychaos.md
@@ -9,14 +9,14 @@ Get chaos of a city.
 <b>Signature:</b>
 
 ```typescript
-getCityChaos(name: string): number;
+getCityChaos(city: CityName | `${CityName}`): number;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | string |  |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of city. Case-sensitive |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.bladeburner.getcitycommunities.md b/markdown/bitburner.bladeburner.getcitycommunities.md
index 3d9057fb2..c01f3779f 100644
--- a/markdown/bitburner.bladeburner.getcitycommunities.md
+++ b/markdown/bitburner.bladeburner.getcitycommunities.md
@@ -9,14 +9,14 @@ Get number of communities in a city.
 <b>Signature:</b>
 
 ```typescript
-getCityCommunities(name: string): number;
+getCityCommunities(city: CityName | `${CityName}`): number;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | string |  |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of city. Case-sensitive |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.bladeburner.getcityestimatedpopulation.md b/markdown/bitburner.bladeburner.getcityestimatedpopulation.md
index 7e9c07e68..9b54667c9 100644
--- a/markdown/bitburner.bladeburner.getcityestimatedpopulation.md
+++ b/markdown/bitburner.bladeburner.getcityestimatedpopulation.md
@@ -9,14 +9,14 @@ Get estimated population in city.
 <b>Signature:</b>
 
 ```typescript
-getCityEstimatedPopulation(name: string): number;
+getCityEstimatedPopulation(city: CityName | `${CityName}`): number;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | string |  |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of city. Case-sensitive |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.bladeburner.md b/markdown/bitburner.bladeburner.md
index c4a8173d7..0ea3ddb30 100644
--- a/markdown/bitburner.bladeburner.md
+++ b/markdown/bitburner.bladeburner.md
@@ -32,9 +32,9 @@ You have to be employed in the Bladeburner division and be in BitNode-7 or have
 |  [getBlackOpRank(name)](./bitburner.bladeburner.getblackoprank.md) | Get black op required rank. |
 |  [getBonusTime()](./bitburner.bladeburner.getbonustime.md) | Get bladeburner bonus time. |
 |  [getCity()](./bitburner.bladeburner.getcity.md) | Get current city. |
-|  [getCityChaos(name)](./bitburner.bladeburner.getcitychaos.md) | Get chaos of a city. |
-|  [getCityCommunities(name)](./bitburner.bladeburner.getcitycommunities.md) | Get number of communities in a city. |
-|  [getCityEstimatedPopulation(name)](./bitburner.bladeburner.getcityestimatedpopulation.md) | Get estimated population in city. |
+|  [getCityChaos(city)](./bitburner.bladeburner.getcitychaos.md) | Get chaos of a city. |
+|  [getCityCommunities(city)](./bitburner.bladeburner.getcitycommunities.md) | Get number of communities in a city. |
+|  [getCityEstimatedPopulation(city)](./bitburner.bladeburner.getcityestimatedpopulation.md) | Get estimated population in city. |
 |  [getContractNames()](./bitburner.bladeburner.getcontractnames.md) | List all contracts. |
 |  [getCurrentAction()](./bitburner.bladeburner.getcurrentaction.md) | Get current action. |
 |  [getGeneralActionNames()](./bitburner.bladeburner.getgeneralactionnames.md) | List all general actions. |
@@ -54,6 +54,6 @@ You have to be employed in the Bladeburner division and be in BitNode-7 or have
 |  [setTeamSize(type, name, size)](./bitburner.bladeburner.setteamsize.md) | Set team size. |
 |  [startAction(type, name)](./bitburner.bladeburner.startaction.md) | Start an action. |
 |  [stopBladeburnerAction()](./bitburner.bladeburner.stopbladeburneraction.md) | Stop current action. |
-|  [switchCity(name)](./bitburner.bladeburner.switchcity.md) | Travel to another city in bladeburner. |
+|  [switchCity(city)](./bitburner.bladeburner.switchcity.md) | Travel to another city in bladeburner. |
 |  [upgradeSkill(name, count)](./bitburner.bladeburner.upgradeskill.md) | Upgrade skill. |
 
diff --git a/markdown/bitburner.bladeburner.switchcity.md b/markdown/bitburner.bladeburner.switchcity.md
index 77e414a9a..99962b1b3 100644
--- a/markdown/bitburner.bladeburner.switchcity.md
+++ b/markdown/bitburner.bladeburner.switchcity.md
@@ -9,14 +9,14 @@ Travel to another city in bladeburner.
 <b>Signature:</b>
 
 ```typescript
-switchCity(name: string): boolean;
+switchCity(city: CityName | `${CityName}`): boolean;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | string |  |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of city. Case-sensitive |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.cityname.md b/markdown/bitburner.cityname.md
new file mode 100644
index 000000000..2ee019716
--- /dev/null
+++ b/markdown/bitburner.cityname.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CityName](./bitburner.cityname.md)
+
+## CityName enum
+
+Names of all cities
+
+<b>Signature:</b>
+
+```typescript
+declare enum CityName 
+```
+
+## Enumeration Members
+
+|  Member | Value | Description |
+|  --- | --- | --- |
+|  Aevum | <code>&quot;Aevum&quot;</code> |  |
+|  Chongqing | <code>&quot;Chongqing&quot;</code> |  |
+|  Ishima | <code>&quot;Ishima&quot;</code> |  |
+|  NewTokyo | <code>&quot;New Tokyo&quot;</code> |  |
+|  Sector12 | <code>&quot;Sector-12&quot;</code> |  |
+|  Volhaven | <code>&quot;Volhaven&quot;</code> |  |
+
diff --git a/markdown/bitburner.companyposname.md b/markdown/bitburner.companyposname.md
deleted file mode 100644
index deb2ac365..000000000
--- a/markdown/bitburner.companyposname.md
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CompanyPosName](./bitburner.companyposname.md)
-
-## CompanyPosName enum
-
-
-<b>Signature:</b>
-
-```typescript
-declare enum CompanyPosName 
-```
-
-## Enumeration Members
-
-|  Member | Value | Description |
-|  --- | --- | --- |
-|  agent0 | <code>&quot;Field Agent&quot;</code> |  |
-|  agent1 | <code>&quot;Secret Agent&quot;</code> |  |
-|  agent2 | <code>&quot;Special Operative&quot;</code> |  |
-|  bus0 | <code>&quot;Business Intern&quot;</code> |  |
-|  bus1 | <code>&quot;Business Analyst&quot;</code> |  |
-|  bus2 | <code>&quot;Business Manager&quot;</code> |  |
-|  bus3 | <code>&quot;Operations Manager&quot;</code> |  |
-|  bus4 | <code>&quot;Chief Financial Officer&quot;</code> |  |
-|  bus5 | <code>&quot;Chief Executive Officer&quot;</code> |  |
-|  busCons0 | <code>&quot;Business Consultant&quot;</code> |  |
-|  busCons1 | <code>&quot;Senior Business Consultant&quot;</code> |  |
-|  employee | <code>&quot;Employee&quot;</code> |  |
-|  employeePT | <code>&quot;Part-time Employee&quot;</code> |  |
-|  IT0 | <code>&quot;IT Intern&quot;</code> |  |
-|  IT1 | <code>&quot;IT Analyst&quot;</code> |  |
-|  IT2 | <code>&quot;IT Manager&quot;</code> |  |
-|  IT3 | <code>&quot;Systems Administrator&quot;</code> |  |
-|  netEng0 | <code>&quot;Network Engineer&quot;</code> |  |
-|  netEng1 | <code>&quot;Network Administrator&quot;</code> |  |
-|  sec0 | <code>&quot;Police Officer&quot;</code> |  |
-|  sec1 | <code>&quot;Police Chief&quot;</code> |  |
-|  sec2 | <code>&quot;Security Guard&quot;</code> |  |
-|  sec3 | <code>&quot;Security Officer&quot;</code> |  |
-|  sec4 | <code>&quot;Security Supervisor&quot;</code> |  |
-|  sec5 | <code>&quot;Head of Security&quot;</code> |  |
-|  secEng | <code>&quot;Security Engineer&quot;</code> |  |
-|  softCons0 | <code>&quot;Software Consultant&quot;</code> |  |
-|  softCons1 | <code>&quot;Senior Software Consultant&quot;</code> |  |
-|  sw0 | <code>&quot;Software Engineering Intern&quot;</code> |  |
-|  sw1 | <code>&quot;Junior Software Engineer&quot;</code> |  |
-|  sw2 | <code>&quot;Senior Software Engineer&quot;</code> |  |
-|  sw3 | <code>&quot;Lead Software Developer&quot;</code> |  |
-|  sw4 | <code>&quot;Head of Software&quot;</code> |  |
-|  sw5 | <code>&quot;Head of Engineering&quot;</code> |  |
-|  sw6 | <code>&quot;Vice President of Technology&quot;</code> |  |
-|  sw7 | <code>&quot;Chief Technology Officer&quot;</code> |  |
-|  waiter | <code>&quot;Waiter&quot;</code> |  |
-|  waiterPT | <code>&quot;Part-time Waiter&quot;</code> |  |
-
diff --git a/markdown/bitburner.corpconstants.baseproductprofitmult.md b/markdown/bitburner.corpconstants.baseproductprofitmult.md
new file mode 100644
index 000000000..9c45026ac
--- /dev/null
+++ b/markdown/bitburner.corpconstants.baseproductprofitmult.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [baseProductProfitMult](./bitburner.corpconstants.baseproductprofitmult.md)
+
+## CorpConstants.baseProductProfitMult property
+
+<b>Signature:</b>
+
+```typescript
+baseProductProfitMult: number;
+```
diff --git a/markdown/bitburner.corpconstants.bribeamountperreputation.md b/markdown/bitburner.corpconstants.bribeamountperreputation.md
new file mode 100644
index 000000000..ac9f5a57f
--- /dev/null
+++ b/markdown/bitburner.corpconstants.bribeamountperreputation.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [bribeAmountPerReputation](./bitburner.corpconstants.bribeamountperreputation.md)
+
+## CorpConstants.bribeAmountPerReputation property
+
+<b>Signature:</b>
+
+```typescript
+bribeAmountPerReputation: number;
+```
diff --git a/markdown/bitburner.corpconstants.bribethreshold.md b/markdown/bitburner.corpconstants.bribethreshold.md
new file mode 100644
index 000000000..501ea2e61
--- /dev/null
+++ b/markdown/bitburner.corpconstants.bribethreshold.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [bribeThreshold](./bitburner.corpconstants.bribethreshold.md)
+
+## CorpConstants.bribeThreshold property
+
+<b>Signature:</b>
+
+```typescript
+bribeThreshold: number;
+```
diff --git a/markdown/bitburner.corpconstants.coffeecostperemployee.md b/markdown/bitburner.corpconstants.coffeecostperemployee.md
new file mode 100644
index 000000000..827e55be0
--- /dev/null
+++ b/markdown/bitburner.corpconstants.coffeecostperemployee.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [coffeeCostPerEmployee](./bitburner.corpconstants.coffeecostperemployee.md)
+
+## CorpConstants.coffeeCostPerEmployee property
+
+<b>Signature:</b>
+
+```typescript
+coffeeCostPerEmployee: number;
+```
diff --git a/markdown/bitburner.corpconstants.dividendmaxrate.md b/markdown/bitburner.corpconstants.dividendmaxrate.md
new file mode 100644
index 000000000..56b36b831
--- /dev/null
+++ b/markdown/bitburner.corpconstants.dividendmaxrate.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [dividendMaxRate](./bitburner.corpconstants.dividendmaxrate.md)
+
+## CorpConstants.dividendMaxRate property
+
+<b>Signature:</b>
+
+```typescript
+dividendMaxRate: number;
+```
diff --git a/markdown/bitburner.corpconstants.employeeraiseamount.md b/markdown/bitburner.corpconstants.employeeraiseamount.md
new file mode 100644
index 000000000..5f616749c
--- /dev/null
+++ b/markdown/bitburner.corpconstants.employeeraiseamount.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [employeeRaiseAmount](./bitburner.corpconstants.employeeraiseamount.md)
+
+## CorpConstants.employeeRaiseAmount property
+
+<b>Signature:</b>
+
+```typescript
+employeeRaiseAmount: number;
+```
diff --git a/markdown/bitburner.corpconstants.employeesalarymultiplier.md b/markdown/bitburner.corpconstants.employeesalarymultiplier.md
new file mode 100644
index 000000000..b5fee3fb3
--- /dev/null
+++ b/markdown/bitburner.corpconstants.employeesalarymultiplier.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [employeeSalaryMultiplier](./bitburner.corpconstants.employeesalarymultiplier.md)
+
+## CorpConstants.employeeSalaryMultiplier property
+
+Conversion factor for employee stats to initial salary
+
+<b>Signature:</b>
+
+```typescript
+employeeSalaryMultiplier: number;
+```
diff --git a/markdown/bitburner.corpconstants.gamecyclespercorpstatecycle.md b/markdown/bitburner.corpconstants.gamecyclespercorpstatecycle.md
new file mode 100644
index 000000000..3087ba944
--- /dev/null
+++ b/markdown/bitburner.corpconstants.gamecyclespercorpstatecycle.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [gameCyclesPerCorpStateCycle](./bitburner.corpconstants.gamecyclespercorpstatecycle.md)
+
+## CorpConstants.gameCyclesPerCorpStateCycle property
+
+<b>Signature:</b>
+
+```typescript
+gameCyclesPerCorpStateCycle: number;
+```
diff --git a/markdown/bitburner.corpconstants.gamecyclespermarketcycle.md b/markdown/bitburner.corpconstants.gamecyclespermarketcycle.md
new file mode 100644
index 000000000..b4c0861c7
--- /dev/null
+++ b/markdown/bitburner.corpconstants.gamecyclespermarketcycle.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [gameCyclesPerMarketCycle](./bitburner.corpconstants.gamecyclespermarketcycle.md)
+
+## CorpConstants.gameCyclesPerMarketCycle property
+
+<b>Signature:</b>
+
+```typescript
+gameCyclesPerMarketCycle: number;
+```
diff --git a/markdown/bitburner.corpconstants.industrynames.md b/markdown/bitburner.corpconstants.industrynames.md
new file mode 100644
index 000000000..22056a0b5
--- /dev/null
+++ b/markdown/bitburner.corpconstants.industrynames.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [industryNames](./bitburner.corpconstants.industrynames.md)
+
+## CorpConstants.industryNames property
+
+Names of all industries
+
+<b>Signature:</b>
+
+```typescript
+industryNames: CorpIndustryName[];
+```
diff --git a/markdown/bitburner.corpconstants.initialshares.md b/markdown/bitburner.corpconstants.initialshares.md
new file mode 100644
index 000000000..3b3d9cc60
--- /dev/null
+++ b/markdown/bitburner.corpconstants.initialshares.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [initialShares](./bitburner.corpconstants.initialshares.md)
+
+## CorpConstants.initialShares property
+
+<b>Signature:</b>
+
+```typescript
+initialShares: number;
+```
diff --git a/markdown/bitburner.corpconstants.issuenewsharescooldown.md b/markdown/bitburner.corpconstants.issuenewsharescooldown.md
new file mode 100644
index 000000000..317d399db
--- /dev/null
+++ b/markdown/bitburner.corpconstants.issuenewsharescooldown.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [issueNewSharesCooldown](./bitburner.corpconstants.issuenewsharescooldown.md)
+
+## CorpConstants.issueNewSharesCooldown property
+
+Cooldown for issue new shares cooldown in game cycles (1 game cycle = 200ms)
+
+<b>Signature:</b>
+
+```typescript
+issueNewSharesCooldown: number;
+```
diff --git a/markdown/bitburner.corpconstants.marketcyclesperemployeeraise.md b/markdown/bitburner.corpconstants.marketcyclesperemployeeraise.md
new file mode 100644
index 000000000..eff6cd23d
--- /dev/null
+++ b/markdown/bitburner.corpconstants.marketcyclesperemployeeraise.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [marketCyclesPerEmployeeRaise](./bitburner.corpconstants.marketcyclesperemployeeraise.md)
+
+## CorpConstants.marketCyclesPerEmployeeRaise property
+
+<b>Signature:</b>
+
+```typescript
+marketCyclesPerEmployeeRaise: number;
+```
diff --git a/markdown/bitburner.corpconstants.materialnames.md b/markdown/bitburner.corpconstants.materialnames.md
new file mode 100644
index 000000000..97cd629ac
--- /dev/null
+++ b/markdown/bitburner.corpconstants.materialnames.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [materialNames](./bitburner.corpconstants.materialnames.md)
+
+## CorpConstants.materialNames property
+
+Names of all materials
+
+<b>Signature:</b>
+
+```typescript
+materialNames: CorpMaterialName[];
+```
diff --git a/markdown/bitburner.corpconstants.maxproductsbase.md b/markdown/bitburner.corpconstants.maxproductsbase.md
new file mode 100644
index 000000000..c2ac45f6e
--- /dev/null
+++ b/markdown/bitburner.corpconstants.maxproductsbase.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [maxProductsBase](./bitburner.corpconstants.maxproductsbase.md)
+
+## CorpConstants.maxProductsBase property
+
+Max products for a division without upgrades
+
+<b>Signature:</b>
+
+```typescript
+maxProductsBase: number;
+```
diff --git a/markdown/bitburner.corpconstants.md b/markdown/bitburner.corpconstants.md
new file mode 100644
index 000000000..de05af502
--- /dev/null
+++ b/markdown/bitburner.corpconstants.md
@@ -0,0 +1,49 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md)
+
+## CorpConstants interface
+
+Corporation related constants
+
+<b>Signature:</b>
+
+```typescript
+interface CorpConstants 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [baseProductProfitMult](./bitburner.corpconstants.baseproductprofitmult.md) | number |  |
+|  [bribeAmountPerReputation](./bitburner.corpconstants.bribeamountperreputation.md) | number |  |
+|  [bribeThreshold](./bitburner.corpconstants.bribethreshold.md) | number |  |
+|  [coffeeCostPerEmployee](./bitburner.corpconstants.coffeecostperemployee.md) | number |  |
+|  [dividendMaxRate](./bitburner.corpconstants.dividendmaxrate.md) | number |  |
+|  [employeeRaiseAmount](./bitburner.corpconstants.employeeraiseamount.md) | number |  |
+|  [employeeSalaryMultiplier](./bitburner.corpconstants.employeesalarymultiplier.md) | number | Conversion factor for employee stats to initial salary |
+|  [gameCyclesPerCorpStateCycle](./bitburner.corpconstants.gamecyclespercorpstatecycle.md) | number |  |
+|  [gameCyclesPerMarketCycle](./bitburner.corpconstants.gamecyclespermarketcycle.md) | number |  |
+|  [industryNames](./bitburner.corpconstants.industrynames.md) | [CorpIndustryName](./bitburner.corpindustryname.md)<!-- -->\[\] | Names of all industries |
+|  [initialShares](./bitburner.corpconstants.initialshares.md) | number |  |
+|  [issueNewSharesCooldown](./bitburner.corpconstants.issuenewsharescooldown.md) | number | Cooldown for issue new shares cooldown in game cycles (1 game cycle = 200ms) |
+|  [marketCyclesPerEmployeeRaise](./bitburner.corpconstants.marketcyclesperemployeeraise.md) | number |  |
+|  [materialNames](./bitburner.corpconstants.materialnames.md) | [CorpMaterialName](./bitburner.corpmaterialname.md)<!-- -->\[\] | Names of all materials |
+|  [maxProductsBase](./bitburner.corpconstants.maxproductsbase.md) | number | Max products for a division without upgrades |
+|  [officeInitialCost](./bitburner.corpconstants.officeinitialcost.md) | number |  |
+|  [officeInitialSize](./bitburner.corpconstants.officeinitialsize.md) | number |  |
+|  [officeSizeUpgradeCostBase](./bitburner.corpconstants.officesizeupgradecostbase.md) | number |  |
+|  [researchNames](./bitburner.corpconstants.researchnames.md) | [CorpResearchName](./bitburner.corpresearchname.md)<!-- -->\[\] | Names of all researches |
+|  [researchNamesBase](./bitburner.corpconstants.researchnamesbase.md) | [CorpResearchName](./bitburner.corpresearchname.md)<!-- -->\[\] | Names of all researches common to all industries |
+|  [researchNamesProductOnly](./bitburner.corpconstants.researchnamesproductonly.md) | [CorpResearchName](./bitburner.corpresearchname.md)<!-- -->\[\] | Names of all researches only available to product industries |
+|  [secondsPerMarketCycle](./bitburner.corpconstants.secondspermarketcycle.md) | number |  |
+|  [sellSharesCooldown](./bitburner.corpconstants.sellsharescooldown.md) | number | Cooldown for selling shares in game cycles (1 game cycle = 200ms) |
+|  [sharesPerPriceUpdate](./bitburner.corpconstants.sharesperpriceupdate.md) | number | When selling large number of shares, price is dynamically updated for every batch of this amount |
+|  [stateNames](./bitburner.corpconstants.statenames.md) | [CorpStateName](./bitburner.corpstatename.md)<!-- -->\[\] | Names of all corporation game states |
+|  [unlockNames](./bitburner.corpconstants.unlocknames.md) | [CorpUnlockName](./bitburner.corpunlockname.md)<!-- -->\[\] | Names of all one-time corporation-wide unlocks |
+|  [upgradeNames](./bitburner.corpconstants.upgradenames.md) | [CorpUpgradeName](./bitburner.corpupgradename.md)<!-- -->\[\] | Names of all corporation-wide upgrades |
+|  [warehouseInitialCost](./bitburner.corpconstants.warehouseinitialcost.md) | number |  |
+|  [warehouseInitialSize](./bitburner.corpconstants.warehouseinitialsize.md) | number |  |
+|  [warehouseSizeUpgradeCostBase](./bitburner.corpconstants.warehousesizeupgradecostbase.md) | number |  |
+
diff --git a/markdown/bitburner.corpconstants.officeinitialcost.md b/markdown/bitburner.corpconstants.officeinitialcost.md
new file mode 100644
index 000000000..b4a79f434
--- /dev/null
+++ b/markdown/bitburner.corpconstants.officeinitialcost.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [officeInitialCost](./bitburner.corpconstants.officeinitialcost.md)
+
+## CorpConstants.officeInitialCost property
+
+<b>Signature:</b>
+
+```typescript
+officeInitialCost: number;
+```
diff --git a/markdown/bitburner.corpconstants.officeinitialsize.md b/markdown/bitburner.corpconstants.officeinitialsize.md
new file mode 100644
index 000000000..38b7e35c3
--- /dev/null
+++ b/markdown/bitburner.corpconstants.officeinitialsize.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [officeInitialSize](./bitburner.corpconstants.officeinitialsize.md)
+
+## CorpConstants.officeInitialSize property
+
+<b>Signature:</b>
+
+```typescript
+officeInitialSize: number;
+```
diff --git a/markdown/bitburner.corpconstants.officesizeupgradecostbase.md b/markdown/bitburner.corpconstants.officesizeupgradecostbase.md
new file mode 100644
index 000000000..06e16f74f
--- /dev/null
+++ b/markdown/bitburner.corpconstants.officesizeupgradecostbase.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [officeSizeUpgradeCostBase](./bitburner.corpconstants.officesizeupgradecostbase.md)
+
+## CorpConstants.officeSizeUpgradeCostBase property
+
+<b>Signature:</b>
+
+```typescript
+officeSizeUpgradeCostBase: number;
+```
diff --git a/markdown/bitburner.corpconstants.researchnames.md b/markdown/bitburner.corpconstants.researchnames.md
new file mode 100644
index 000000000..f53bf0bbd
--- /dev/null
+++ b/markdown/bitburner.corpconstants.researchnames.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [researchNames](./bitburner.corpconstants.researchnames.md)
+
+## CorpConstants.researchNames property
+
+Names of all researches
+
+<b>Signature:</b>
+
+```typescript
+researchNames: CorpResearchName[];
+```
diff --git a/markdown/bitburner.corpconstants.researchnamesbase.md b/markdown/bitburner.corpconstants.researchnamesbase.md
new file mode 100644
index 000000000..63cff1190
--- /dev/null
+++ b/markdown/bitburner.corpconstants.researchnamesbase.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [researchNamesBase](./bitburner.corpconstants.researchnamesbase.md)
+
+## CorpConstants.researchNamesBase property
+
+Names of all researches common to all industries
+
+<b>Signature:</b>
+
+```typescript
+researchNamesBase: CorpResearchName[];
+```
diff --git a/markdown/bitburner.corpconstants.researchnamesproductonly.md b/markdown/bitburner.corpconstants.researchnamesproductonly.md
new file mode 100644
index 000000000..735dd7a53
--- /dev/null
+++ b/markdown/bitburner.corpconstants.researchnamesproductonly.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [researchNamesProductOnly](./bitburner.corpconstants.researchnamesproductonly.md)
+
+## CorpConstants.researchNamesProductOnly property
+
+Names of all researches only available to product industries
+
+<b>Signature:</b>
+
+```typescript
+researchNamesProductOnly: CorpResearchName[];
+```
diff --git a/markdown/bitburner.corpconstants.secondspermarketcycle.md b/markdown/bitburner.corpconstants.secondspermarketcycle.md
new file mode 100644
index 000000000..5723094c1
--- /dev/null
+++ b/markdown/bitburner.corpconstants.secondspermarketcycle.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [secondsPerMarketCycle](./bitburner.corpconstants.secondspermarketcycle.md)
+
+## CorpConstants.secondsPerMarketCycle property
+
+<b>Signature:</b>
+
+```typescript
+secondsPerMarketCycle: number;
+```
diff --git a/markdown/bitburner.corpconstants.sellsharescooldown.md b/markdown/bitburner.corpconstants.sellsharescooldown.md
new file mode 100644
index 000000000..89f78b2e9
--- /dev/null
+++ b/markdown/bitburner.corpconstants.sellsharescooldown.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [sellSharesCooldown](./bitburner.corpconstants.sellsharescooldown.md)
+
+## CorpConstants.sellSharesCooldown property
+
+Cooldown for selling shares in game cycles (1 game cycle = 200ms)
+
+<b>Signature:</b>
+
+```typescript
+sellSharesCooldown: number;
+```
diff --git a/markdown/bitburner.corpconstants.sharesperpriceupdate.md b/markdown/bitburner.corpconstants.sharesperpriceupdate.md
new file mode 100644
index 000000000..5244c1673
--- /dev/null
+++ b/markdown/bitburner.corpconstants.sharesperpriceupdate.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [sharesPerPriceUpdate](./bitburner.corpconstants.sharesperpriceupdate.md)
+
+## CorpConstants.sharesPerPriceUpdate property
+
+When selling large number of shares, price is dynamically updated for every batch of this amount
+
+<b>Signature:</b>
+
+```typescript
+sharesPerPriceUpdate: number;
+```
diff --git a/markdown/bitburner.corpconstants.statenames.md b/markdown/bitburner.corpconstants.statenames.md
new file mode 100644
index 000000000..cd03a41e5
--- /dev/null
+++ b/markdown/bitburner.corpconstants.statenames.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [stateNames](./bitburner.corpconstants.statenames.md)
+
+## CorpConstants.stateNames property
+
+Names of all corporation game states
+
+<b>Signature:</b>
+
+```typescript
+stateNames: CorpStateName[];
+```
diff --git a/markdown/bitburner.corpconstants.unlocknames.md b/markdown/bitburner.corpconstants.unlocknames.md
new file mode 100644
index 000000000..69524785d
--- /dev/null
+++ b/markdown/bitburner.corpconstants.unlocknames.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [unlockNames](./bitburner.corpconstants.unlocknames.md)
+
+## CorpConstants.unlockNames property
+
+Names of all one-time corporation-wide unlocks
+
+<b>Signature:</b>
+
+```typescript
+unlockNames: CorpUnlockName[];
+```
diff --git a/markdown/bitburner.corpconstants.upgradenames.md b/markdown/bitburner.corpconstants.upgradenames.md
new file mode 100644
index 000000000..66e64b615
--- /dev/null
+++ b/markdown/bitburner.corpconstants.upgradenames.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [upgradeNames](./bitburner.corpconstants.upgradenames.md)
+
+## CorpConstants.upgradeNames property
+
+Names of all corporation-wide upgrades
+
+<b>Signature:</b>
+
+```typescript
+upgradeNames: CorpUpgradeName[];
+```
diff --git a/markdown/bitburner.corpconstants.warehouseinitialcost.md b/markdown/bitburner.corpconstants.warehouseinitialcost.md
new file mode 100644
index 000000000..52affbee6
--- /dev/null
+++ b/markdown/bitburner.corpconstants.warehouseinitialcost.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [warehouseInitialCost](./bitburner.corpconstants.warehouseinitialcost.md)
+
+## CorpConstants.warehouseInitialCost property
+
+<b>Signature:</b>
+
+```typescript
+warehouseInitialCost: number;
+```
diff --git a/markdown/bitburner.corpconstants.warehouseinitialsize.md b/markdown/bitburner.corpconstants.warehouseinitialsize.md
new file mode 100644
index 000000000..6fddcae5c
--- /dev/null
+++ b/markdown/bitburner.corpconstants.warehouseinitialsize.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [warehouseInitialSize](./bitburner.corpconstants.warehouseinitialsize.md)
+
+## CorpConstants.warehouseInitialSize property
+
+<b>Signature:</b>
+
+```typescript
+warehouseInitialSize: number;
+```
diff --git a/markdown/bitburner.corpconstants.warehousesizeupgradecostbase.md b/markdown/bitburner.corpconstants.warehousesizeupgradecostbase.md
new file mode 100644
index 000000000..a5a7ae8a4
--- /dev/null
+++ b/markdown/bitburner.corpconstants.warehousesizeupgradecostbase.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpConstants](./bitburner.corpconstants.md) &gt; [warehouseSizeUpgradeCostBase](./bitburner.corpconstants.warehousesizeupgradecostbase.md)
+
+## CorpConstants.warehouseSizeUpgradeCostBase property
+
+<b>Signature:</b>
+
+```typescript
+warehouseSizeUpgradeCostBase: number;
+```
diff --git a/markdown/bitburner.corpemployeeposition.md b/markdown/bitburner.corpemployeeposition.md
new file mode 100644
index 000000000..5d3cf1484
--- /dev/null
+++ b/markdown/bitburner.corpemployeeposition.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpEmployeePosition](./bitburner.corpemployeeposition.md)
+
+## CorpEmployeePosition type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpEmployeePosition =
+  | "Operations"
+  | "Engineer"
+  | "Business"
+  | "Management"
+  | "Research & Development"
+  | "Training"
+  | "Unassigned";
+```
diff --git a/markdown/bitburner.corpindustrydata.advertisingfactor.md b/markdown/bitburner.corpindustrydata.advertisingfactor.md
new file mode 100644
index 000000000..0a6ee2731
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.advertisingfactor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [advertisingFactor](./bitburner.corpindustrydata.advertisingfactor.md)
+
+## CorpIndustryData.advertisingFactor property
+
+Advertising factor (affects sales)
+
+<b>Signature:</b>
+
+```typescript
+advertisingFactor?: number;
+```
diff --git a/markdown/bitburner.corpindustrydata.aicorefactor.md b/markdown/bitburner.corpindustrydata.aicorefactor.md
new file mode 100644
index 000000000..f2b597c3e
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.aicorefactor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [aiCoreFactor](./bitburner.corpindustrydata.aicorefactor.md)
+
+## CorpIndustryData.aiCoreFactor property
+
+AI Cores factor
+
+<b>Signature:</b>
+
+```typescript
+aiCoreFactor?: number;
+```
diff --git a/markdown/bitburner.corpindustrydata.description.md b/markdown/bitburner.corpindustrydata.description.md
new file mode 100644
index 000000000..9e95550c7
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.description.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [description](./bitburner.corpindustrydata.description.md)
+
+## CorpIndustryData.description property
+
+<b>Signature:</b>
+
+```typescript
+description: string;
+```
diff --git a/markdown/bitburner.corpindustrydata.hardwarefactor.md b/markdown/bitburner.corpindustrydata.hardwarefactor.md
new file mode 100644
index 000000000..3024f2640
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.hardwarefactor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [hardwareFactor](./bitburner.corpindustrydata.hardwarefactor.md)
+
+## CorpIndustryData.hardwareFactor property
+
+Hardware factor
+
+<b>Signature:</b>
+
+```typescript
+hardwareFactor?: number;
+```
diff --git a/markdown/bitburner.corpindustrydata.md b/markdown/bitburner.corpindustrydata.md
new file mode 100644
index 000000000..829f9a717
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.md
@@ -0,0 +1,31 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md)
+
+## CorpIndustryData interface
+
+Data for an individual industry
+
+<b>Signature:</b>
+
+```typescript
+interface CorpIndustryData 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [advertisingFactor?](./bitburner.corpindustrydata.advertisingfactor.md) | number | <i>(Optional)</i> Advertising factor (affects sales) |
+|  [aiCoreFactor?](./bitburner.corpindustrydata.aicorefactor.md) | number | <i>(Optional)</i> AI Cores factor |
+|  [description](./bitburner.corpindustrydata.description.md) | string |  |
+|  [hardwareFactor?](./bitburner.corpindustrydata.hardwarefactor.md) | number | <i>(Optional)</i> Hardware factor |
+|  [producedMaterials?](./bitburner.corpindustrydata.producedmaterials.md) | [CorpMaterialName](./bitburner.corpmaterialname.md)<!-- -->\[\] | <i>(Optional)</i> |
+|  [product?](./bitburner.corpindustrydata.product.md) | [CorpProductData](./bitburner.corpproductdata.md) | <i>(Optional)</i> |
+|  [realEstateFactor?](./bitburner.corpindustrydata.realestatefactor.md) | number | <i>(Optional)</i> Real estate factor |
+|  [recommendStarting](./bitburner.corpindustrydata.recommendstarting.md) | boolean |  |
+|  [requiredMaterials](./bitburner.corpindustrydata.requiredmaterials.md) | Partial&lt;Record&lt;[CorpMaterialName](./bitburner.corpmaterialname.md)<!-- -->, number&gt;&gt; |  |
+|  [robotFactor?](./bitburner.corpindustrydata.robotfactor.md) | number | <i>(Optional)</i> Robots factor |
+|  [scienceFactor?](./bitburner.corpindustrydata.sciencefactor.md) | number | <i>(Optional)</i> Scientific research factor (affects quality) |
+|  [startingCost](./bitburner.corpindustrydata.startingcost.md) | number |  |
+
diff --git a/markdown/bitburner.corpindustrydata.producedmaterials.md b/markdown/bitburner.corpindustrydata.producedmaterials.md
new file mode 100644
index 000000000..5ba737018
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.producedmaterials.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [producedMaterials](./bitburner.corpindustrydata.producedmaterials.md)
+
+## CorpIndustryData.producedMaterials property
+
+<b>Signature:</b>
+
+```typescript
+producedMaterials?: CorpMaterialName[];
+```
diff --git a/markdown/bitburner.corpindustrydata.product.md b/markdown/bitburner.corpindustrydata.product.md
new file mode 100644
index 000000000..b9c9e5d33
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.product.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [product](./bitburner.corpindustrydata.product.md)
+
+## CorpIndustryData.product property
+
+<b>Signature:</b>
+
+```typescript
+product?: CorpProductData;
+```
diff --git a/markdown/bitburner.corpindustrydata.realestatefactor.md b/markdown/bitburner.corpindustrydata.realestatefactor.md
new file mode 100644
index 000000000..0df329432
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.realestatefactor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [realEstateFactor](./bitburner.corpindustrydata.realestatefactor.md)
+
+## CorpIndustryData.realEstateFactor property
+
+Real estate factor
+
+<b>Signature:</b>
+
+```typescript
+realEstateFactor?: number;
+```
diff --git a/markdown/bitburner.corpindustrydata.recommendstarting.md b/markdown/bitburner.corpindustrydata.recommendstarting.md
new file mode 100644
index 000000000..22f28b3ab
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.recommendstarting.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [recommendStarting](./bitburner.corpindustrydata.recommendstarting.md)
+
+## CorpIndustryData.recommendStarting property
+
+<b>Signature:</b>
+
+```typescript
+recommendStarting: boolean;
+```
diff --git a/markdown/bitburner.corpindustrydata.requiredmaterials.md b/markdown/bitburner.corpindustrydata.requiredmaterials.md
new file mode 100644
index 000000000..41bdbe37d
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.requiredmaterials.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [requiredMaterials](./bitburner.corpindustrydata.requiredmaterials.md)
+
+## CorpIndustryData.requiredMaterials property
+
+<b>Signature:</b>
+
+```typescript
+requiredMaterials: Partial<Record<CorpMaterialName, number>>;
+```
diff --git a/markdown/bitburner.corpindustrydata.robotfactor.md b/markdown/bitburner.corpindustrydata.robotfactor.md
new file mode 100644
index 000000000..7a9e56f4b
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.robotfactor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [robotFactor](./bitburner.corpindustrydata.robotfactor.md)
+
+## CorpIndustryData.robotFactor property
+
+Robots factor
+
+<b>Signature:</b>
+
+```typescript
+robotFactor?: number;
+```
diff --git a/markdown/bitburner.corpindustrydata.sciencefactor.md b/markdown/bitburner.corpindustrydata.sciencefactor.md
new file mode 100644
index 000000000..7dd044532
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.sciencefactor.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [scienceFactor](./bitburner.corpindustrydata.sciencefactor.md)
+
+## CorpIndustryData.scienceFactor property
+
+Scientific research factor (affects quality)
+
+<b>Signature:</b>
+
+```typescript
+scienceFactor?: number;
+```
diff --git a/markdown/bitburner.corpindustrydata.startingcost.md b/markdown/bitburner.corpindustrydata.startingcost.md
new file mode 100644
index 000000000..fe5564c38
--- /dev/null
+++ b/markdown/bitburner.corpindustrydata.startingcost.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryData](./bitburner.corpindustrydata.md) &gt; [startingCost](./bitburner.corpindustrydata.startingcost.md)
+
+## CorpIndustryData.startingCost property
+
+<b>Signature:</b>
+
+```typescript
+startingCost: number;
+```
diff --git a/markdown/bitburner.corpindustryname.md b/markdown/bitburner.corpindustryname.md
new file mode 100644
index 000000000..b86895628
--- /dev/null
+++ b/markdown/bitburner.corpindustryname.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpIndustryName](./bitburner.corpindustryname.md)
+
+## CorpIndustryName type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpIndustryName =
+  | "Energy"
+  | "Water Utilities"
+  | "Agriculture"
+  | "Fishing"
+  | "Mining"
+  | "Food"
+  | "Tobacco"
+  | "Chemical"
+  | "Pharmaceutical"
+  | "Computer Hardware"
+  | "Robotics"
+  | "Software"
+  | "Healthcare"
+  | "Real Estate";
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.basecost.md b/markdown/bitburner.corpmaterialconstantdata.basecost.md
new file mode 100644
index 000000000..62d74fd6b
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.basecost.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [baseCost](./bitburner.corpmaterialconstantdata.basecost.md)
+
+## CorpMaterialConstantData.baseCost property
+
+<b>Signature:</b>
+
+```typescript
+baseCost: number;
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.basemarkup.md b/markdown/bitburner.corpmaterialconstantdata.basemarkup.md
new file mode 100644
index 000000000..0a85352e1
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.basemarkup.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [baseMarkup](./bitburner.corpmaterialconstantdata.basemarkup.md)
+
+## CorpMaterialConstantData.baseMarkup property
+
+<b>Signature:</b>
+
+```typescript
+baseMarkup: number;
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.competitionbase.md b/markdown/bitburner.corpmaterialconstantdata.competitionbase.md
new file mode 100644
index 000000000..d86d4b036
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.competitionbase.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [competitionBase](./bitburner.corpmaterialconstantdata.competitionbase.md)
+
+## CorpMaterialConstantData.competitionBase property
+
+<b>Signature:</b>
+
+```typescript
+competitionBase: number;
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.competitionrange.md b/markdown/bitburner.corpmaterialconstantdata.competitionrange.md
new file mode 100644
index 000000000..f687d19d1
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.competitionrange.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [competitionRange](./bitburner.corpmaterialconstantdata.competitionrange.md)
+
+## CorpMaterialConstantData.competitionRange property
+
+<b>Signature:</b>
+
+```typescript
+competitionRange: [min: number, max: number];
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.demandbase.md b/markdown/bitburner.corpmaterialconstantdata.demandbase.md
new file mode 100644
index 000000000..16fc5a6b6
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.demandbase.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [demandBase](./bitburner.corpmaterialconstantdata.demandbase.md)
+
+## CorpMaterialConstantData.demandBase property
+
+<b>Signature:</b>
+
+```typescript
+demandBase: number;
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.demandrange.md b/markdown/bitburner.corpmaterialconstantdata.demandrange.md
new file mode 100644
index 000000000..69fac8cd2
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.demandrange.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [demandRange](./bitburner.corpmaterialconstantdata.demandrange.md)
+
+## CorpMaterialConstantData.demandRange property
+
+Min and max demand
+
+<b>Signature:</b>
+
+```typescript
+demandRange: [min: number, max: number];
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.maxvolatility.md b/markdown/bitburner.corpmaterialconstantdata.maxvolatility.md
new file mode 100644
index 000000000..fb8d15cba
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.maxvolatility.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [maxVolatility](./bitburner.corpmaterialconstantdata.maxvolatility.md)
+
+## CorpMaterialConstantData.maxVolatility property
+
+<b>Signature:</b>
+
+```typescript
+maxVolatility: number;
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.md b/markdown/bitburner.corpmaterialconstantdata.md
new file mode 100644
index 000000000..c92b95d89
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md)
+
+## CorpMaterialConstantData interface
+
+Corporation material information
+
+<b>Signature:</b>
+
+```typescript
+interface CorpMaterialConstantData 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [baseCost](./bitburner.corpmaterialconstantdata.basecost.md) | number |  |
+|  [baseMarkup](./bitburner.corpmaterialconstantdata.basemarkup.md) | number |  |
+|  [competitionBase](./bitburner.corpmaterialconstantdata.competitionbase.md) | number |  |
+|  [competitionRange](./bitburner.corpmaterialconstantdata.competitionrange.md) | \[min: number, max: number\] |  |
+|  [demandBase](./bitburner.corpmaterialconstantdata.demandbase.md) | number |  |
+|  [demandRange](./bitburner.corpmaterialconstantdata.demandrange.md) | \[min: number, max: number\] | Min and max demand |
+|  [maxVolatility](./bitburner.corpmaterialconstantdata.maxvolatility.md) | number |  |
+|  [name](./bitburner.corpmaterialconstantdata.name.md) | string | Name of the material |
+|  [size](./bitburner.corpmaterialconstantdata.size.md) | number | Size of the material |
+
diff --git a/markdown/bitburner.corpmaterialconstantdata.name.md b/markdown/bitburner.corpmaterialconstantdata.name.md
new file mode 100644
index 000000000..b3305b957
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.name.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [name](./bitburner.corpmaterialconstantdata.name.md)
+
+## CorpMaterialConstantData.name property
+
+Name of the material
+
+<b>Signature:</b>
+
+```typescript
+name: string;
+```
diff --git a/markdown/bitburner.corpmaterialconstantdata.size.md b/markdown/bitburner.corpmaterialconstantdata.size.md
new file mode 100644
index 000000000..a3a1190e6
--- /dev/null
+++ b/markdown/bitburner.corpmaterialconstantdata.size.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) &gt; [size](./bitburner.corpmaterialconstantdata.size.md)
+
+## CorpMaterialConstantData.size property
+
+Size of the material
+
+<b>Signature:</b>
+
+```typescript
+size: number;
+```
diff --git a/markdown/bitburner.corpmaterialname.md b/markdown/bitburner.corpmaterialname.md
new file mode 100644
index 000000000..ba5f19ebd
--- /dev/null
+++ b/markdown/bitburner.corpmaterialname.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpMaterialName](./bitburner.corpmaterialname.md)
+
+## CorpMaterialName type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpMaterialName =
+  | "Water"
+  | "Energy"
+  | "Food"
+  | "Plants"
+  | "Metal"
+  | "Hardware"
+  | "Chemicals"
+  | "Drugs"
+  | "Robots"
+  | "AI Cores"
+  | "Real Estate";
+```
diff --git a/markdown/bitburner.corporation.enums.md b/markdown/bitburner.corporation.enums.md
deleted file mode 100644
index 1700462e2..000000000
--- a/markdown/bitburner.corporation.enums.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [enums](./bitburner.corporation.enums.md)
-
-## Corporation.enums property
-
-Enums specific to the corporation game mechanic.
-
-<b>Signature:</b>
-
-```typescript
-enums: {
-    EmployeePositions: typeof EmployeePositions;
-    IndustryType: typeof IndustryType;
-  };
-```
diff --git a/markdown/bitburner.corporation.expandcity.md b/markdown/bitburner.corporation.expandcity.md
index d8b23cac4..8fb8271a9 100644
--- a/markdown/bitburner.corporation.expandcity.md
+++ b/markdown/bitburner.corporation.expandcity.md
@@ -9,7 +9,7 @@ Expand to a new city
 <b>Signature:</b>
 
 ```typescript
-expandCity(divisionName: string, cityName: string): void;
+expandCity(divisionName: string, city: CityName | `${CityName}`): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ expandCity(divisionName: string, cityName: string): void;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.corporation.expandindustry.md b/markdown/bitburner.corporation.expandindustry.md
index bc9f8f7cf..1ea9b6d01 100644
--- a/markdown/bitburner.corporation.expandindustry.md
+++ b/markdown/bitburner.corporation.expandindustry.md
@@ -9,14 +9,14 @@ Expand to a new industry
 <b>Signature:</b>
 
 ```typescript
-expandIndustry(industryType: IndustryType | `${IndustryType}`, divisionName: string): void;
+expandIndustry(industryType: CorpIndustryName, divisionName: string): void;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  industryType | [IndustryType](./bitburner.industrytype.md) \| \`${[IndustryType](./bitburner.industrytype.md)<!-- -->}\` | Name of the industry |
+|  industryType | [CorpIndustryName](./bitburner.corpindustryname.md) | Name of the industry |
 |  divisionName | string | Name of the division |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.corporation.getconstants.md b/markdown/bitburner.corporation.getconstants.md
new file mode 100644
index 000000000..80f1116fc
--- /dev/null
+++ b/markdown/bitburner.corporation.getconstants.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getConstants](./bitburner.corporation.getconstants.md)
+
+## Corporation.getConstants() method
+
+Get corporation related constants
+
+<b>Signature:</b>
+
+```typescript
+getConstants(): CorpConstants;
+```
+<b>Returns:</b>
+
+[CorpConstants](./bitburner.corpconstants.md)
+
+corporation related constants
+
diff --git a/markdown/bitburner.corporation.getexpandcitycost.md b/markdown/bitburner.corporation.getexpandcitycost.md
deleted file mode 100644
index 99726fc89..000000000
--- a/markdown/bitburner.corporation.getexpandcitycost.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getExpandCityCost](./bitburner.corporation.getexpandcitycost.md)
-
-## Corporation.getExpandCityCost() method
-
-Gets the cost to expand into a new city
-
-<b>Signature:</b>
-
-```typescript
-getExpandCityCost(): number;
-```
-<b>Returns:</b>
-
-number
-
-cost
-
diff --git a/markdown/bitburner.corporation.getexpandindustrycost.md b/markdown/bitburner.corporation.getexpandindustrycost.md
deleted file mode 100644
index ab6bcd583..000000000
--- a/markdown/bitburner.corporation.getexpandindustrycost.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getExpandIndustryCost](./bitburner.corporation.getexpandindustrycost.md)
-
-## Corporation.getExpandIndustryCost() method
-
-Gets the cost to expand into a new industry
-
-<b>Signature:</b>
-
-```typescript
-getExpandIndustryCost(industryName: IndustryType | `${IndustryType}`): number;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  industryName | [IndustryType](./bitburner.industrytype.md) \| \`${[IndustryType](./bitburner.industrytype.md)<!-- -->}\` | Name of the industry |
-
-<b>Returns:</b>
-
-number
-
-cost
-
diff --git a/markdown/bitburner.corporation.getindustrydata.md b/markdown/bitburner.corporation.getindustrydata.md
new file mode 100644
index 000000000..9bb137935
--- /dev/null
+++ b/markdown/bitburner.corporation.getindustrydata.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getIndustryData](./bitburner.corporation.getindustrydata.md)
+
+## Corporation.getIndustryData() method
+
+Get constant industry definition data for a specific industry
+
+<b>Signature:</b>
+
+```typescript
+getIndustryData(industryName: CorpIndustryName): CorpIndustryData;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  industryName | [CorpIndustryName](./bitburner.corpindustryname.md) |  |
+
+<b>Returns:</b>
+
+[CorpIndustryData](./bitburner.corpindustrydata.md)
+
diff --git a/markdown/bitburner.corporation.getmaterialdata.md b/markdown/bitburner.corporation.getmaterialdata.md
new file mode 100644
index 000000000..48ed6b5c9
--- /dev/null
+++ b/markdown/bitburner.corporation.getmaterialdata.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getMaterialData](./bitburner.corporation.getmaterialdata.md)
+
+## Corporation.getMaterialData() method
+
+Get constant data for a specific material
+
+<b>Signature:</b>
+
+```typescript
+getMaterialData(materialName: CorpMaterialName): CorpMaterialConstantData;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  materialName | [CorpMaterialName](./bitburner.corpmaterialname.md) |  |
+
+<b>Returns:</b>
+
+[CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md)
+
diff --git a/markdown/bitburner.corporation.getmaterialnames.md b/markdown/bitburner.corporation.getmaterialnames.md
deleted file mode 100644
index 65339c74b..000000000
--- a/markdown/bitburner.corporation.getmaterialnames.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getMaterialNames](./bitburner.corporation.getmaterialnames.md)
-
-## Corporation.getMaterialNames() method
-
-Get list of materials
-
-<b>Signature:</b>
-
-```typescript
-getMaterialNames(): string[];
-```
-<b>Returns:</b>
-
-string\[\]
-
-material names
-
diff --git a/markdown/bitburner.corporation.getresearchnames.md b/markdown/bitburner.corporation.getresearchnames.md
deleted file mode 100644
index 55f0a1107..000000000
--- a/markdown/bitburner.corporation.getresearchnames.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getResearchNames](./bitburner.corporation.getresearchnames.md)
-
-## Corporation.getResearchNames() method
-
-Get list of research names
-
-<b>Signature:</b>
-
-```typescript
-getResearchNames(): string[];
-```
-<b>Returns:</b>
-
-string\[\]
-
-research names
-
diff --git a/markdown/bitburner.corporation.getunlockables.md b/markdown/bitburner.corporation.getunlockables.md
deleted file mode 100644
index 36f422178..000000000
--- a/markdown/bitburner.corporation.getunlockables.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getUnlockables](./bitburner.corporation.getunlockables.md)
-
-## Corporation.getUnlockables() method
-
-Get list of one-time unlockable upgrades
-
-<b>Signature:</b>
-
-```typescript
-getUnlockables(): string[];
-```
-<b>Returns:</b>
-
-string\[\]
-
-unlockable upgrades names
-
diff --git a/markdown/bitburner.corporation.getupgradenames.md b/markdown/bitburner.corporation.getupgradenames.md
deleted file mode 100644
index 936891689..000000000
--- a/markdown/bitburner.corporation.getupgradenames.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [getUpgradeNames](./bitburner.corporation.getupgradenames.md)
-
-## Corporation.getUpgradeNames() method
-
-Get list of upgrade names
-
-<b>Signature:</b>
-
-```typescript
-getUpgradeNames(): string[];
-```
-<b>Returns:</b>
-
-string\[\]
-
-upgrade names
-
diff --git a/markdown/bitburner.corporation.issuenewshares.md b/markdown/bitburner.corporation.issuenewshares.md
new file mode 100644
index 000000000..8ea8a102f
--- /dev/null
+++ b/markdown/bitburner.corporation.issuenewshares.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Corporation](./bitburner.corporation.md) &gt; [issueNewShares](./bitburner.corporation.issuenewshares.md)
+
+## Corporation.issueNewShares() method
+
+Issue new shares
+
+<b>Signature:</b>
+
+```typescript
+issueNewShares(amount?: number): number;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  amount | number | Number of new shares to issue, will be rounded to nearest 10m. Defaults to max amount. |
+
+<b>Returns:</b>
+
+number
+
+Amount of funds generated for the corporation.
+
diff --git a/markdown/bitburner.corporation.md b/markdown/bitburner.corporation.md
index 8139ad688..c99284271 100644
--- a/markdown/bitburner.corporation.md
+++ b/markdown/bitburner.corporation.md
@@ -13,12 +13,6 @@ export interface Corporation extends WarehouseAPI, OfficeAPI
 ```
 <b>Extends:</b> [WarehouseAPI](./bitburner.warehouseapi.md)<!-- -->, [OfficeAPI](./bitburner.officeapi.md)
 
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [enums](./bitburner.corporation.enums.md) | { EmployeePositions: typeof [EmployeePositions](./bitburner.employeepositions.md)<!-- -->; IndustryType: typeof [IndustryType](./bitburner.industrytype.md)<!-- -->; } | Enums specific to the corporation game mechanic. |
-
 ## Methods
 
 |  Method | Description |
@@ -27,25 +21,23 @@ export interface Corporation extends WarehouseAPI, OfficeAPI
 |  [bribe(factionName, amountCash)](./bitburner.corporation.bribe.md) | Bribe a faction |
 |  [buyBackShares(amount)](./bitburner.corporation.buybackshares.md) | Buyback Shares |
 |  [createCorporation(corporationName, selfFund)](./bitburner.corporation.createcorporation.md) | Create a Corporation |
-|  [expandCity(divisionName, cityName)](./bitburner.corporation.expandcity.md) | Expand to a new city |
+|  [expandCity(divisionName, city)](./bitburner.corporation.expandcity.md) | Expand to a new city |
 |  [expandIndustry(industryType, divisionName)](./bitburner.corporation.expandindustry.md) | Expand to a new industry |
 |  [getBonusTime()](./bitburner.corporation.getbonustime.md) | Get bonus time. “Bonus time” is accumulated when the game is offline or if the game is inactive in the browser. “Bonus time” makes the game progress faster. |
+|  [getConstants()](./bitburner.corporation.getconstants.md) | Get corporation related constants |
 |  [getCorporation()](./bitburner.corporation.getcorporation.md) | Get corporation data |
 |  [getDivision(divisionName)](./bitburner.corporation.getdivision.md) | Get division data |
-|  [getExpandCityCost()](./bitburner.corporation.getexpandcitycost.md) | Gets the cost to expand into a new city |
-|  [getExpandIndustryCost(industryName)](./bitburner.corporation.getexpandindustrycost.md) | Gets the cost to expand into a new industry |
+|  [getIndustryData(industryName)](./bitburner.corporation.getindustrydata.md) | Get constant industry definition data for a specific industry |
 |  [getInvestmentOffer()](./bitburner.corporation.getinvestmentoffer.md) | Get an offer for investment based on you companies current valuation |
-|  [getMaterialNames()](./bitburner.corporation.getmaterialnames.md) | Get list of materials |
-|  [getResearchNames()](./bitburner.corporation.getresearchnames.md) | Get list of research names |
-|  [getUnlockables()](./bitburner.corporation.getunlockables.md) | Get list of one-time unlockable upgrades |
+|  [getMaterialData(materialName)](./bitburner.corporation.getmaterialdata.md) | Get constant data for a specific material |
 |  [getUnlockUpgradeCost(upgradeName)](./bitburner.corporation.getunlockupgradecost.md) | Gets the cost to unlock a one time unlockable upgrade |
 |  [getUpgradeLevel(upgradeName)](./bitburner.corporation.getupgradelevel.md) | Get the level of a levelable upgrade |
 |  [getUpgradeLevelCost(upgradeName)](./bitburner.corporation.getupgradelevelcost.md) | Gets the cost to unlock the next level of a levelable upgrade |
-|  [getUpgradeNames()](./bitburner.corporation.getupgradenames.md) | Get list of upgrade names |
 |  [goPublic(numShares)](./bitburner.corporation.gopublic.md) | Go public |
 |  [hasCorporation()](./bitburner.corporation.hascorporation.md) | Returns whether the player has a corporation. Does not require API access. |
 |  [hasUnlockUpgrade(upgradeName)](./bitburner.corporation.hasunlockupgrade.md) | Check if you have a one time unlockable upgrade |
 |  [issueDividends(rate)](./bitburner.corporation.issuedividends.md) | Issue dividends |
+|  [issueNewShares(amount)](./bitburner.corporation.issuenewshares.md) | Issue new shares |
 |  [levelUpgrade(upgradeName)](./bitburner.corporation.levelupgrade.md) | Level an upgrade. |
 |  [sellShares(amount)](./bitburner.corporation.sellshares.md) | Sell Shares |
 |  [unlockUpgrade(upgradeName)](./bitburner.corporation.unlockupgrade.md) | Unlock an upgrade |
diff --git a/markdown/bitburner.corporationinfo.divisions.md b/markdown/bitburner.corporationinfo.divisions.md
index eb58a0f87..2b72b8685 100644
--- a/markdown/bitburner.corporationinfo.divisions.md
+++ b/markdown/bitburner.corporationinfo.divisions.md
@@ -4,10 +4,10 @@
 
 ## CorporationInfo.divisions property
 
-Array of all divisions
+Array of all division names
 
 <b>Signature:</b>
 
 ```typescript
-divisions: Division[];
+divisions: string[];
 ```
diff --git a/markdown/bitburner.corporationinfo.md b/markdown/bitburner.corporationinfo.md
index 5f61a9567..5921d4032 100644
--- a/markdown/bitburner.corporationinfo.md
+++ b/markdown/bitburner.corporationinfo.md
@@ -19,7 +19,7 @@ interface CorporationInfo
 |  [dividendEarnings](./bitburner.corporationinfo.dividendearnings.md) | number | Your earnings as a shareholder per second this cycle |
 |  [dividendRate](./bitburner.corporationinfo.dividendrate.md) | number | Fraction of profits issued as dividends |
 |  [dividendTax](./bitburner.corporationinfo.dividendtax.md) | number | Tax applied on your earnings as a shareholder |
-|  [divisions](./bitburner.corporationinfo.divisions.md) | [Division](./bitburner.division.md)<!-- -->\[\] | Array of all divisions |
+|  [divisions](./bitburner.corporationinfo.divisions.md) | string\[\] | Array of all division names |
 |  [expenses](./bitburner.corporationinfo.expenses.md) | number | Expenses per second this cycle |
 |  [funds](./bitburner.corporationinfo.funds.md) | number | Funds available |
 |  [issuedShares](./bitburner.corporationinfo.issuedshares.md) | number | Amount of acquirable shares. |
diff --git a/markdown/bitburner.corpproductdata.md b/markdown/bitburner.corpproductdata.md
new file mode 100644
index 000000000..63dd1f473
--- /dev/null
+++ b/markdown/bitburner.corpproductdata.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpProductData](./bitburner.corpproductdata.md)
+
+## CorpProductData type
+
+Product rating information
+
+<b>Signature:</b>
+
+```typescript
+type CorpProductData = {
+  name: string;
+  verb: string;
+  desc: string;
+  ratingWeights: {
+    aesthetics?: number;
+    durability?: number;
+    features?: number;
+    quality?: number;
+    performance?: number;
+    reliability?: number;
+  };
+};
+```
diff --git a/markdown/bitburner.corpresearchname.md b/markdown/bitburner.corpresearchname.md
new file mode 100644
index 000000000..c506a8d1c
--- /dev/null
+++ b/markdown/bitburner.corpresearchname.md
@@ -0,0 +1,35 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpResearchName](./bitburner.corpresearchname.md)
+
+## CorpResearchName type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpResearchName =
+  | "Hi-Tech R&D Laboratory"
+  | "AutoBrew"
+  | "AutoPartyManager"
+  | "Automatic Drug Administration"
+  | "Bulk Purchasing"
+  | "CPH4 Injections"
+  | "Drones"
+  | "Drones - Assembly"
+  | "Drones - Transport"
+  | "Go-Juice"
+  | "HRBuddy-Recruitment"
+  | "HRBuddy-Training"
+  | "JoyWire"
+  | "Market-TA.I"
+  | "Market-TA.II"
+  | "Overclock"
+  | "Self-Correcting Assemblers"
+  | "Sti.mu"
+  | "uPgrade: Capacity.I"
+  | "uPgrade: Capacity.II"
+  | "uPgrade: Dashboard"
+  | "uPgrade: Fulcrum"
+  | "sudo.Assist";
+```
diff --git a/markdown/bitburner.corpstatename.md b/markdown/bitburner.corpstatename.md
new file mode 100644
index 000000000..a9aa15716
--- /dev/null
+++ b/markdown/bitburner.corpstatename.md
@@ -0,0 +1,12 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpStateName](./bitburner.corpstatename.md)
+
+## CorpStateName type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpStateName = "START" | "PURCHASE" | "PRODUCTION" | "SALE" | "EXPORT";
+```
diff --git a/markdown/bitburner.corpunlockname.md b/markdown/bitburner.corpunlockname.md
new file mode 100644
index 000000000..0749cec81
--- /dev/null
+++ b/markdown/bitburner.corpunlockname.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpUnlockName](./bitburner.corpunlockname.md)
+
+## CorpUnlockName type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpUnlockName =
+  | "Export"
+  | "Smart Supply"
+  | "Market Research - Demand"
+  | "Market Data - Competition"
+  | "VeChain"
+  | "Shady Accounting"
+  | "Government Partnership"
+  | "Warehouse API"
+  | "Office API";
+```
diff --git a/markdown/bitburner.corpupgradename.md b/markdown/bitburner.corpupgradename.md
new file mode 100644
index 000000000..7a3f6b96f
--- /dev/null
+++ b/markdown/bitburner.corpupgradename.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [CorpUpgradeName](./bitburner.corpupgradename.md)
+
+## CorpUpgradeName type
+
+
+<b>Signature:</b>
+
+```typescript
+type CorpUpgradeName =
+  | "Smart Factories"
+  | "Smart Storage"
+  | "DreamSense"
+  | "Wilson Analytics"
+  | "Nuoptimal Nootropic Injector Implants"
+  | "Speech Processor Implants"
+  | "Neural Accelerators"
+  | "FocusWires"
+  | "ABC SalesBots"
+  | "Project Insight";
+```
diff --git a/markdown/bitburner.division.cities.md b/markdown/bitburner.division.cities.md
index 0f24b160c..921014f19 100644
--- a/markdown/bitburner.division.cities.md
+++ b/markdown/bitburner.division.cities.md
@@ -9,5 +9,5 @@ Cities in which this division has expanded
 <b>Signature:</b>
 
 ```typescript
-cities: string[];
+cities: CityName[];
 ```
diff --git a/markdown/bitburner.division.md b/markdown/bitburner.division.md
index 48d3e2de4..64a0b4de3 100644
--- a/markdown/bitburner.division.md
+++ b/markdown/bitburner.division.md
@@ -17,7 +17,7 @@ interface Division
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [awareness](./bitburner.division.awareness.md) | number | Awareness of the division |
-|  [cities](./bitburner.division.cities.md) | string\[\] | Cities in which this division has expanded |
+|  [cities](./bitburner.division.cities.md) | [CityName](./bitburner.cityname.md)<!-- -->\[\] | Cities in which this division has expanded |
 |  [lastCycleExpenses](./bitburner.division.lastcycleexpenses.md) | number | Expenses last cycle |
 |  [lastCycleRevenue](./bitburner.division.lastcyclerevenue.md) | number | Revenue last cycle |
 |  [makesProducts](./bitburner.division.makesproducts.md) | boolean | Whether the industry this division is in is capable of making products |
@@ -28,6 +28,6 @@ interface Division
 |  [research](./bitburner.division.research.md) | number | Amount of research in that division |
 |  [thisCycleExpenses](./bitburner.division.thiscycleexpenses.md) | number | Expenses this cycle |
 |  [thisCycleRevenue](./bitburner.division.thiscyclerevenue.md) | number | Revenue this cycle |
-|  [type](./bitburner.division.type.md) | string | Type of division, like Agriculture |
+|  [type](./bitburner.division.type.md) | [CorpIndustryName](./bitburner.corpindustryname.md) | Type of division, like Agriculture |
 |  [upgrades](./bitburner.division.upgrades.md) | number\[\] | All research bought |
 
diff --git a/markdown/bitburner.division.type.md b/markdown/bitburner.division.type.md
index 30b7a7c79..525d553b3 100644
--- a/markdown/bitburner.division.type.md
+++ b/markdown/bitburner.division.type.md
@@ -9,5 +9,5 @@ Type of division, like Agriculture
 <b>Signature:</b>
 
 ```typescript
-type: string;
+type: CorpIndustryName;
 ```
diff --git a/markdown/bitburner.employeepositions.md b/markdown/bitburner.employeepositions.md
deleted file mode 100644
index 49a1d9fed..000000000
--- a/markdown/bitburner.employeepositions.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [EmployeePositions](./bitburner.employeepositions.md)
-
-## EmployeePositions enum
-
-
-<b>Signature:</b>
-
-```typescript
-declare enum EmployeePositions 
-```
-
-## Enumeration Members
-
-|  Member | Value | Description |
-|  --- | --- | --- |
-|  Business | <code>&quot;Business&quot;</code> |  |
-|  Engineer | <code>&quot;Engineer&quot;</code> |  |
-|  Management | <code>&quot;Management&quot;</code> |  |
-|  Operations | <code>&quot;Operations&quot;</code> |  |
-|  RandD | <code>&quot;Research &amp; Development&quot;</code> |  |
-|  Training | <code>&quot;Training&quot;</code> |  |
-|  Unassigned | <code>&quot;Unassigned&quot;</code> |  |
-
diff --git a/markdown/bitburner.export.loc.md b/markdown/bitburner.export.loc.md
index dc969ffc9..1c7f10616 100644
--- a/markdown/bitburner.export.loc.md
+++ b/markdown/bitburner.export.loc.md
@@ -9,5 +9,5 @@ City the material is being exported to
 <b>Signature:</b>
 
 ```typescript
-loc: string;
+loc: CityName;
 ```
diff --git a/markdown/bitburner.export.md b/markdown/bitburner.export.md
index 60d5300c0..c0b20466a 100644
--- a/markdown/bitburner.export.md
+++ b/markdown/bitburner.export.md
@@ -18,5 +18,5 @@ interface Export
 |  --- | --- | --- |
 |  [amt](./bitburner.export.amt.md) | string | Amount of material exported |
 |  [div](./bitburner.export.div.md) | string | Division the material is being exported to |
-|  [loc](./bitburner.export.loc.md) | string | City the material is being exported to |
+|  [loc](./bitburner.export.loc.md) | [CityName](./bitburner.cityname.md) | City the material is being exported to |
 
diff --git a/markdown/bitburner.ilocation.city.md b/markdown/bitburner.ilocation.city.md
index 5ff25d8df..dfe1d9be2 100644
--- a/markdown/bitburner.ilocation.city.md
+++ b/markdown/bitburner.ilocation.city.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-city: string;
+city: CityName;
 ```
diff --git a/markdown/bitburner.ilocation.md b/markdown/bitburner.ilocation.md
index b448410e3..e47b75a61 100644
--- a/markdown/bitburner.ilocation.md
+++ b/markdown/bitburner.ilocation.md
@@ -15,6 +15,6 @@ interface ILocation
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [city](./bitburner.ilocation.city.md) | string |  |
-|  [name](./bitburner.ilocation.name.md) | string |  |
+|  [city](./bitburner.ilocation.city.md) | [CityName](./bitburner.cityname.md) |  |
+|  [name](./bitburner.ilocation.name.md) | [LocationName](./bitburner.locationname.md) |  |
 
diff --git a/markdown/bitburner.ilocation.name.md b/markdown/bitburner.ilocation.name.md
index d91bf6201..9a7f08feb 100644
--- a/markdown/bitburner.ilocation.name.md
+++ b/markdown/bitburner.ilocation.name.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-name: string;
+name: LocationName;
 ```
diff --git a/markdown/bitburner.industrydata.cost.md b/markdown/bitburner.industrydata.cost.md
new file mode 100644
index 000000000..b41589a35
--- /dev/null
+++ b/markdown/bitburner.industrydata.cost.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [cost](./bitburner.industrydata.cost.md)
+
+## IndustryData.cost property
+
+Cost to expand to the division
+
+<b>Signature:</b>
+
+```typescript
+cost: number;
+```
diff --git a/markdown/bitburner.industrydata.makesmaterials.md b/markdown/bitburner.industrydata.makesmaterials.md
new file mode 100644
index 000000000..db197a528
--- /dev/null
+++ b/markdown/bitburner.industrydata.makesmaterials.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [makesMaterials](./bitburner.industrydata.makesmaterials.md)
+
+## IndustryData.makesMaterials property
+
+Whether the division makes materials
+
+<b>Signature:</b>
+
+```typescript
+makesMaterials: boolean;
+```
diff --git a/markdown/bitburner.industrydata.makesproducts.md b/markdown/bitburner.industrydata.makesproducts.md
new file mode 100644
index 000000000..274118953
--- /dev/null
+++ b/markdown/bitburner.industrydata.makesproducts.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [makesProducts](./bitburner.industrydata.makesproducts.md)
+
+## IndustryData.makesProducts property
+
+Whether the division makes products
+
+<b>Signature:</b>
+
+```typescript
+makesProducts: boolean;
+```
diff --git a/markdown/bitburner.industrydata.md b/markdown/bitburner.industrydata.md
new file mode 100644
index 000000000..877ae4b24
--- /dev/null
+++ b/markdown/bitburner.industrydata.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md)
+
+## IndustryData interface
+
+Corporation industry information
+
+<b>Signature:</b>
+
+```typescript
+interface IndustryData 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [cost](./bitburner.industrydata.cost.md) | number | Cost to expand to the division |
+|  [makesMaterials](./bitburner.industrydata.makesmaterials.md) | boolean | Whether the division makes materials |
+|  [makesProducts](./bitburner.industrydata.makesproducts.md) | boolean | Whether the division makes products |
+|  [producedMaterials?](./bitburner.industrydata.producedmaterials.md) | string\[\] | <i>(Optional)</i> Materials produced |
+|  [productType?](./bitburner.industrydata.producttype.md) | string | <i>(Optional)</i> Product type |
+|  [requiredMaterials](./bitburner.industrydata.requiredmaterials.md) | Record&lt;string, number&gt; | Materials required for production and their amounts |
+|  [type](./bitburner.industrydata.type.md) | [CorpIndustryName](./bitburner.corpindustryname.md) | Industry type |
+
diff --git a/markdown/bitburner.industrydata.producedmaterials.md b/markdown/bitburner.industrydata.producedmaterials.md
new file mode 100644
index 000000000..80feafb86
--- /dev/null
+++ b/markdown/bitburner.industrydata.producedmaterials.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [producedMaterials](./bitburner.industrydata.producedmaterials.md)
+
+## IndustryData.producedMaterials property
+
+Materials produced
+
+<b>Signature:</b>
+
+```typescript
+producedMaterials?: string[];
+```
diff --git a/markdown/bitburner.industrydata.producttype.md b/markdown/bitburner.industrydata.producttype.md
new file mode 100644
index 000000000..369fe80e1
--- /dev/null
+++ b/markdown/bitburner.industrydata.producttype.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [productType](./bitburner.industrydata.producttype.md)
+
+## IndustryData.productType property
+
+Product type
+
+<b>Signature:</b>
+
+```typescript
+productType?: string;
+```
diff --git a/markdown/bitburner.industrydata.requiredmaterials.md b/markdown/bitburner.industrydata.requiredmaterials.md
new file mode 100644
index 000000000..6839e49d7
--- /dev/null
+++ b/markdown/bitburner.industrydata.requiredmaterials.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [requiredMaterials](./bitburner.industrydata.requiredmaterials.md)
+
+## IndustryData.requiredMaterials property
+
+Materials required for production and their amounts
+
+<b>Signature:</b>
+
+```typescript
+requiredMaterials: Record<string, number>;
+```
diff --git a/markdown/bitburner.industrydata.type.md b/markdown/bitburner.industrydata.type.md
new file mode 100644
index 000000000..0c4ff151d
--- /dev/null
+++ b/markdown/bitburner.industrydata.type.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryData](./bitburner.industrydata.md) &gt; [type](./bitburner.industrydata.type.md)
+
+## IndustryData.type property
+
+Industry type
+
+<b>Signature:</b>
+
+```typescript
+type: CorpIndustryName;
+```
diff --git a/markdown/bitburner.industrytype.md b/markdown/bitburner.industrytype.md
deleted file mode 100644
index e58b7ace7..000000000
--- a/markdown/bitburner.industrytype.md
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [IndustryType](./bitburner.industrytype.md)
-
-## IndustryType enum
-
-
-<b>Signature:</b>
-
-```typescript
-declare enum IndustryType 
-```
-
-## Enumeration Members
-
-|  Member | Value | Description |
-|  --- | --- | --- |
-|  Agriculture | <code>&quot;Agriculture&quot;</code> |  |
-|  Chemical | <code>&quot;Chemical&quot;</code> |  |
-|  Computers | <code>&quot;Computer Hardware&quot;</code> |  |
-|  Energy | <code>&quot;Energy&quot;</code> |  |
-|  Fishing | <code>&quot;Fishing&quot;</code> |  |
-|  Food | <code>&quot;Food&quot;</code> |  |
-|  Healthcare | <code>&quot;Healthcare&quot;</code> |  |
-|  Mining | <code>&quot;Mining&quot;</code> |  |
-|  Pharmaceutical | <code>&quot;Pharmaceutical&quot;</code> |  |
-|  RealEstate | <code>&quot;RealEstate&quot;</code> |  |
-|  Robotics | <code>&quot;Robotics&quot;</code> |  |
-|  Software | <code>&quot;Software&quot;</code> |  |
-|  Tobacco | <code>&quot;Tobacco&quot;</code> |  |
-|  Utilities | <code>&quot;Water Utilities&quot;</code> |  |
-
diff --git a/markdown/bitburner.jobname.md b/markdown/bitburner.jobname.md
new file mode 100644
index 000000000..e39fc611a
--- /dev/null
+++ b/markdown/bitburner.jobname.md
@@ -0,0 +1,56 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [JobName](./bitburner.jobname.md)
+
+## JobName enum
+
+
+<b>Signature:</b>
+
+```typescript
+declare enum JobName 
+```
+
+## Enumeration Members
+
+|  Member | Value | Description |
+|  --- | --- | --- |
+|  agent0 | <code>&quot;Field Agent&quot;</code> |  |
+|  agent1 | <code>&quot;Secret Agent&quot;</code> |  |
+|  agent2 | <code>&quot;Special Operative&quot;</code> |  |
+|  business0 | <code>&quot;Business Intern&quot;</code> |  |
+|  business1 | <code>&quot;Business Analyst&quot;</code> |  |
+|  business2 | <code>&quot;Business Manager&quot;</code> |  |
+|  business3 | <code>&quot;Operations Manager&quot;</code> |  |
+|  business4 | <code>&quot;Chief Financial Officer&quot;</code> |  |
+|  business5 | <code>&quot;Chief Executive Officer&quot;</code> |  |
+|  businessConsult0 | <code>&quot;Business Consultant&quot;</code> |  |
+|  businessConsult1 | <code>&quot;Senior Business Consultant&quot;</code> |  |
+|  employee | <code>&quot;Employee&quot;</code> |  |
+|  employeePT | <code>&quot;Part-time Employee&quot;</code> |  |
+|  IT0 | <code>&quot;IT Intern&quot;</code> |  |
+|  IT1 | <code>&quot;IT Analyst&quot;</code> |  |
+|  IT2 | <code>&quot;IT Manager&quot;</code> |  |
+|  IT3 | <code>&quot;Systems Administrator&quot;</code> |  |
+|  networkEng0 | <code>&quot;Network Engineer&quot;</code> |  |
+|  networkEng1 | <code>&quot;Network Administrator&quot;</code> |  |
+|  security0 | <code>&quot;Police Officer&quot;</code> |  |
+|  security1 | <code>&quot;Police Chief&quot;</code> |  |
+|  security2 | <code>&quot;Security Guard&quot;</code> |  |
+|  security3 | <code>&quot;Security Officer&quot;</code> |  |
+|  security4 | <code>&quot;Security Supervisor&quot;</code> |  |
+|  security5 | <code>&quot;Head of Security&quot;</code> |  |
+|  securityEng | <code>&quot;Security Engineer&quot;</code> |  |
+|  software0 | <code>&quot;Software Engineering Intern&quot;</code> |  |
+|  software1 | <code>&quot;Junior Software Engineer&quot;</code> |  |
+|  software2 | <code>&quot;Senior Software Engineer&quot;</code> |  |
+|  software3 | <code>&quot;Lead Software Developer&quot;</code> |  |
+|  software4 | <code>&quot;Head of Software&quot;</code> |  |
+|  software5 | <code>&quot;Head of Engineering&quot;</code> |  |
+|  software6 | <code>&quot;Vice President of Technology&quot;</code> |  |
+|  software7 | <code>&quot;Chief Technology Officer&quot;</code> |  |
+|  softwareConsult0 | <code>&quot;Software Consultant&quot;</code> |  |
+|  softwareConsult1 | <code>&quot;Senior Software Consultant&quot;</code> |  |
+|  waiter | <code>&quot;Waiter&quot;</code> |  |
+|  waiterPT | <code>&quot;Part-time Waiter&quot;</code> |  |
+
diff --git a/markdown/bitburner.material.md b/markdown/bitburner.material.md
index 29836ebee..537bdc6d9 100644
--- a/markdown/bitburner.material.md
+++ b/markdown/bitburner.material.md
@@ -20,7 +20,7 @@ interface Material
 |  [cost](./bitburner.material.cost.md) | number | Cost to buy material |
 |  [dmd](./bitburner.material.dmd.md) | number \| undefined | Demand for the material, only present if "Market Research - Demand" unlocked |
 |  [exp](./bitburner.material.exp.md) | [Export](./bitburner.export.md)<!-- -->\[\] | Export orders |
-|  [name](./bitburner.material.name.md) | string | Name of the material |
+|  [name](./bitburner.material.name.md) | [CorpMaterialName](./bitburner.corpmaterialname.md) | Name of the material |
 |  [prod](./bitburner.material.prod.md) | number | Amount of material produced |
 |  [qlt](./bitburner.material.qlt.md) | number | Quality of the material |
 |  [qty](./bitburner.material.qty.md) | number | Amount of material |
diff --git a/markdown/bitburner.material.name.md b/markdown/bitburner.material.name.md
index 04f62762f..a0780e632 100644
--- a/markdown/bitburner.material.name.md
+++ b/markdown/bitburner.material.name.md
@@ -9,5 +9,5 @@ Name of the material
 <b>Signature:</b>
 
 ```typescript
-name: string;
+name: CorpMaterialName;
 ```
diff --git a/markdown/bitburner.md b/markdown/bitburner.md
index 6f3c0c0e3..605cb9c48 100644
--- a/markdown/bitburner.md
+++ b/markdown/bitburner.md
@@ -8,12 +8,11 @@
 
 |  Enumeration | Description |
 |  --- | --- |
-|  [CompanyPosName](./bitburner.companyposname.md) |  |
+|  [CityName](./bitburner.cityname.md) | Names of all cities |
 |  [CrimeType](./bitburner.crimetype.md) |  |
-|  [EmployeePositions](./bitburner.employeepositions.md) |  |
 |  [FactionWorkType](./bitburner.factionworktype.md) |  |
 |  [GymType](./bitburner.gymtype.md) |  |
-|  [IndustryType](./bitburner.industrytype.md) |  |
+|  [JobName](./bitburner.jobname.md) |  |
 |  [LocationName](./bitburner.locationname.md) | Names of all locations |
 |  [OrderTypes](./bitburner.ordertypes.md) |  |
 |  [PositionTypes](./bitburner.positiontypes.md) |  |
@@ -32,6 +31,9 @@
 |  [Bladeburner](./bitburner.bladeburner.md) | Bladeburner API |
 |  [BladeburnerCurAction](./bitburner.bladeburnercuraction.md) | Bladeburner current action. |
 |  [CodingContract](./bitburner.codingcontract.md) | Coding Contract API |
+|  [CorpConstants](./bitburner.corpconstants.md) | Corporation related constants |
+|  [CorpIndustryData](./bitburner.corpindustrydata.md) | Data for an individual industry |
+|  [CorpMaterialConstantData](./bitburner.corpmaterialconstantdata.md) | Corporation material information |
 |  [Corporation](./bitburner.corporation.md) | Corporation API |
 |  [CorporationInfo](./bitburner.corporationinfo.md) | General info about a corporation |
 |  [CrimeStats](./bitburner.crimestats.md) | Data representing the internal values of a crime. |
@@ -61,6 +63,7 @@
 |  [HacknetServersFormulas](./bitburner.hacknetserversformulas.md) | Hacknet Server formulas |
 |  [HP](./bitburner.hp.md) |  |
 |  [ILocation](./bitburner.ilocation.md) |  |
+|  [IndustryData](./bitburner.industrydata.md) | Corporation industry information |
 |  [Infiltration](./bitburner.infiltration.md) | Infiltration API. |
 |  [InfiltrationLocation](./bitburner.infiltrationlocation.md) |  |
 |  [InfiltrationReward](./bitburner.infiltrationreward.md) |  |
@@ -105,6 +108,14 @@
 |  Type Alias | Description |
 |  --- | --- |
 |  [CodingContractData](./bitburner.codingcontractdata.md) | Coding contract data will differ depending on coding contract. |
+|  [CorpEmployeePosition](./bitburner.corpemployeeposition.md) |  |
+|  [CorpIndustryName](./bitburner.corpindustryname.md) |  |
+|  [CorpMaterialName](./bitburner.corpmaterialname.md) |  |
+|  [CorpProductData](./bitburner.corpproductdata.md) | Product rating information |
+|  [CorpResearchName](./bitburner.corpresearchname.md) |  |
+|  [CorpStateName](./bitburner.corpstatename.md) |  |
+|  [CorpUnlockName](./bitburner.corpunlockname.md) |  |
+|  [CorpUpgradeName](./bitburner.corpupgradename.md) |  |
 |  [FilenameOrPID](./bitburner.filenameorpid.md) |  |
 |  [NSEnums](./bitburner.nsenums.md) |  |
 |  [PortData](./bitburner.portdata.md) |  |
diff --git a/markdown/bitburner.ns.gethackingmultipliers.md b/markdown/bitburner.ns.gethackingmultipliers.md
index f44258729..9a8be05f2 100644
--- a/markdown/bitburner.ns.gethackingmultipliers.md
+++ b/markdown/bitburner.ns.gethackingmultipliers.md
@@ -19,7 +19,7 @@ Object containing the Player’s hacking related multipliers.
 
 ## Remarks
 
-RAM cost: 4 GB
+RAM cost: 0.25 GB
 
 Returns an object containing the Player’s hacking related multipliers. These multipliers are returned in fractional forms, not percentages (e.g. 1.5 instead of 150%).
 
diff --git a/markdown/bitburner.ns.gethacknetmultipliers.md b/markdown/bitburner.ns.gethacknetmultipliers.md
index c720f04a4..8deeba51f 100644
--- a/markdown/bitburner.ns.gethacknetmultipliers.md
+++ b/markdown/bitburner.ns.gethacknetmultipliers.md
@@ -19,7 +19,7 @@ Object containing the Player’s hacknet related multipliers.
 
 ## Remarks
 
-RAM cost: 4 GB
+RAM cost: 0.25 GB
 
 Returns an object containing the Player’s hacknet related multipliers. These multipliers are returned in fractional forms, not percentages (e.g. 1.5 instead of 150%).
 
diff --git a/markdown/bitburner.ns.md b/markdown/bitburner.ns.md
index c15c5e693..ef6918fba 100644
--- a/markdown/bitburner.ns.md
+++ b/markdown/bitburner.ns.md
@@ -50,6 +50,7 @@ export async function main(ns) {
 |  [grafting](./bitburner.ns.grafting.md) | [Grafting](./bitburner.grafting.md) | Namespace for grafting functions. |
 |  [hacknet](./bitburner.ns.hacknet.md) | [Hacknet](./bitburner.hacknet.md) | Namespace for hacknet functions. |
 |  [infiltration](./bitburner.ns.infiltration.md) | [Infiltration](./bitburner.infiltration.md) | Namespace for infiltration functions. RAM cost: 0 GB |
+|  [pid](./bitburner.ns.pid.md) | number | The current script's PID |
 |  [singularity](./bitburner.ns.singularity.md) | [Singularity](./bitburner.singularity.md) | Namespace for singularity functions. RAM cost: 0 GB |
 |  [sleeve](./bitburner.ns.sleeve.md) | [Sleeve](./bitburner.sleeve.md) | Namespace for sleeve functions. |
 |  [stanek](./bitburner.ns.stanek.md) | [Stanek](./bitburner.stanek.md) | Namespace for stanek functions. RAM cost: 0 GB |
diff --git a/markdown/bitburner.ns.pid.md b/markdown/bitburner.ns.pid.md
new file mode 100644
index 000000000..d2f666a2e
--- /dev/null
+++ b/markdown/bitburner.ns.pid.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [NS](./bitburner.ns.md) &gt; [pid](./bitburner.ns.pid.md)
+
+## NS.pid property
+
+The current script's PID
+
+<b>Signature:</b>
+
+```typescript
+readonly pid: number;
+```
diff --git a/markdown/bitburner.ns.scp.md b/markdown/bitburner.ns.scp.md
index e20aaee69..8bd95155e 100644
--- a/markdown/bitburner.ns.scp.md
+++ b/markdown/bitburner.ns.scp.md
@@ -16,7 +16,7 @@ scp(files: string | string[], destination: string, source?: string): boolean;
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  files | string \| string\[\] | Filename or an array of filenames of script/literature files to copy. |
+|  files | string \| string\[\] | Filename or an array of filenames of script/literature files to copy. Note that if a file is located in a subdirectory, the filename must include the leading <code>/</code>. |
 |  destination | string | Hostname of the destination server, which is the server to which the file will be copied. |
 |  source | string | Hostname of the source server, which is the server from which the file will be copied. This argument is optional and if it’s omitted the source will be the current server. |
 
diff --git a/markdown/bitburner.nsenums.md b/markdown/bitburner.nsenums.md
index 85364c3e0..3324c47f6 100644
--- a/markdown/bitburner.nsenums.md
+++ b/markdown/bitburner.nsenums.md
@@ -9,14 +9,15 @@
 
 ```typescript
 export type NSEnums = {
-  toast: typeof ToastVariant;
+  CityName: typeof CityName;
   CrimeType: typeof CrimeType;
   FactionWorkType: typeof FactionWorkType;
   GymType: typeof GymType;
-  UniversityClassType: typeof UniversityClassType;
-  CompanyPosName: typeof CompanyPosName;
+  JobName: typeof JobName;
   LocationName: typeof LocationName;
+  ToastVariant: typeof ToastVariant;
+  UniversityClassType: typeof UniversityClassType;
 };
 ```
-<b>References:</b> [ToastVariant](./bitburner.toastvariant.md)<!-- -->, [CrimeType](./bitburner.crimetype.md)<!-- -->, [FactionWorkType](./bitburner.factionworktype.md)<!-- -->, [GymType](./bitburner.gymtype.md)<!-- -->, [UniversityClassType](./bitburner.universityclasstype.md)<!-- -->, [CompanyPosName](./bitburner.companyposname.md)<!-- -->, [LocationName](./bitburner.locationname.md)
+<b>References:</b> [CityName](./bitburner.cityname.md)<!-- -->, [CrimeType](./bitburner.crimetype.md)<!-- -->, [FactionWorkType](./bitburner.factionworktype.md)<!-- -->, [GymType](./bitburner.gymtype.md)<!-- -->, [JobName](./bitburner.jobname.md)<!-- -->, [LocationName](./bitburner.locationname.md)<!-- -->, [ToastVariant](./bitburner.toastvariant.md)<!-- -->, [UniversityClassType](./bitburner.universityclasstype.md)
 
diff --git a/markdown/bitburner.office.employeejobs.md b/markdown/bitburner.office.employeejobs.md
index 05d2b2603..debdb5eff 100644
--- a/markdown/bitburner.office.employeejobs.md
+++ b/markdown/bitburner.office.employeejobs.md
@@ -9,5 +9,5 @@ Positions of the employees
 <b>Signature:</b>
 
 ```typescript
-employeeJobs: Record<`${EmployeePositions}`, number>;
+employeeJobs: Record<CorpEmployeePosition, number>;
 ```
diff --git a/markdown/bitburner.office.employeeprod.md b/markdown/bitburner.office.employeeprod.md
index 7190b0939..9efcdbe6e 100644
--- a/markdown/bitburner.office.employeeprod.md
+++ b/markdown/bitburner.office.employeeprod.md
@@ -9,5 +9,5 @@ Production of the employees
 <b>Signature:</b>
 
 ```typescript
-employeeProd: Record<`${EmployeePositions}`, number>;
+employeeProd: Record<CorpEmployeePosition, number>;
 ```
diff --git a/markdown/bitburner.office.loc.md b/markdown/bitburner.office.loc.md
index 7944150f1..4e544bd6d 100644
--- a/markdown/bitburner.office.loc.md
+++ b/markdown/bitburner.office.loc.md
@@ -9,5 +9,5 @@ City of the office
 <b>Signature:</b>
 
 ```typescript
-loc: string;
+loc: CityName;
 ```
diff --git a/markdown/bitburner.office.md b/markdown/bitburner.office.md
index ee1cc7956..aaefadbc8 100644
--- a/markdown/bitburner.office.md
+++ b/markdown/bitburner.office.md
@@ -19,10 +19,10 @@ export interface Office
 |  [avgEne](./bitburner.office.avgene.md) | number | Average energy of the employees |
 |  [avgHap](./bitburner.office.avghap.md) | number | Average happiness of the employees |
 |  [avgMor](./bitburner.office.avgmor.md) | number | Average morale of the employees |
-|  [employeeJobs](./bitburner.office.employeejobs.md) | Record&lt;\`${[EmployeePositions](./bitburner.employeepositions.md)<!-- -->}\`, number&gt; | Positions of the employees |
-|  [employeeProd](./bitburner.office.employeeprod.md) | Record&lt;\`${[EmployeePositions](./bitburner.employeepositions.md)<!-- -->}\`, number&gt; | Production of the employees |
+|  [employeeJobs](./bitburner.office.employeejobs.md) | Record&lt;[CorpEmployeePosition](./bitburner.corpemployeeposition.md)<!-- -->, number&gt; | Positions of the employees |
+|  [employeeProd](./bitburner.office.employeeprod.md) | Record&lt;[CorpEmployeePosition](./bitburner.corpemployeeposition.md)<!-- -->, number&gt; | Production of the employees |
 |  [employees](./bitburner.office.employees.md) | number | Amount of employees |
-|  [loc](./bitburner.office.loc.md) | string | City of the office |
+|  [loc](./bitburner.office.loc.md) | [CityName](./bitburner.cityname.md) | City of the office |
 |  [maxEne](./bitburner.office.maxene.md) | number | Maximum amount of energy of the employees |
 |  [maxHap](./bitburner.office.maxhap.md) | number | Maximum happiness of the employees |
 |  [maxMor](./bitburner.office.maxmor.md) | number | Maximum morale of the employees |
diff --git a/markdown/bitburner.officeapi.buycoffee.md b/markdown/bitburner.officeapi.buycoffee.md
index 75558d76f..337e89594 100644
--- a/markdown/bitburner.officeapi.buycoffee.md
+++ b/markdown/bitburner.officeapi.buycoffee.md
@@ -9,7 +9,7 @@ Buy coffee for your employees
 <b>Signature:</b>
 
 ```typescript
-buyCoffee(divisionName: string, cityName: string): boolean;
+buyCoffee(divisionName: string, city: CityName | `${CityName}`): boolean;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ buyCoffee(divisionName: string, cityName: string): boolean;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.officeapi.gethireadvertcost.md b/markdown/bitburner.officeapi.gethireadvertcost.md
index 8a5140778..9b4a4b565 100644
--- a/markdown/bitburner.officeapi.gethireadvertcost.md
+++ b/markdown/bitburner.officeapi.gethireadvertcost.md
@@ -4,7 +4,7 @@
 
 ## OfficeAPI.getHireAdVertCost() method
 
-Get data about an employee
+Get the cost to hire AdVert.
 
 <b>Signature:</b>
 
@@ -16,11 +16,11 @@ getHireAdVertCost(divisionName: string): number;
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  divisionName | string | Name of the division |
+|  divisionName | string | Name of the division. |
 
 <b>Returns:</b>
 
 number
 
-Employee data
+The cost to hire AdVert.
 
diff --git a/markdown/bitburner.officeapi.gethireadvertcount.md b/markdown/bitburner.officeapi.gethireadvertcount.md
index 6fade9cf7..9ba4e048d 100644
--- a/markdown/bitburner.officeapi.gethireadvertcount.md
+++ b/markdown/bitburner.officeapi.gethireadvertcount.md
@@ -4,23 +4,23 @@
 
 ## OfficeAPI.getHireAdVertCount() method
 
-Get the number of times you have Hired AdVert
+Get the number of times you have hired AdVert.
 
 <b>Signature:</b>
 
 ```typescript
-getHireAdVertCount(adivisionName: string): number;
+getHireAdVertCount(divisionName: string): number;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  adivisionName | string |  |
+|  divisionName | string | Name of the division. |
 
 <b>Returns:</b>
 
 number
 
-Number of times you have Hired AdVert
+Number of times you have hired AdVert.
 
diff --git a/markdown/bitburner.officeapi.getoffice.md b/markdown/bitburner.officeapi.getoffice.md
index a1f78ff56..fc2f18b67 100644
--- a/markdown/bitburner.officeapi.getoffice.md
+++ b/markdown/bitburner.officeapi.getoffice.md
@@ -9,7 +9,7 @@ Get data about an office
 <b>Signature:</b>
 
 ```typescript
-getOffice(divisionName: string, cityName: string): Office;
+getOffice(divisionName: string, city: CityName | `${CityName}`): Office;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ getOffice(divisionName: string, cityName: string): Office;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.officeapi.getofficesizeupgradecost.md b/markdown/bitburner.officeapi.getofficesizeupgradecost.md
index 1488a0d85..0defaf090 100644
--- a/markdown/bitburner.officeapi.getofficesizeupgradecost.md
+++ b/markdown/bitburner.officeapi.getofficesizeupgradecost.md
@@ -9,7 +9,7 @@ Cost to Upgrade office size.
 <b>Signature:</b>
 
 ```typescript
-getOfficeSizeUpgradeCost(divisionName: string, cityName: string, asize: number): number;
+getOfficeSizeUpgradeCost(divisionName: string, city: CityName | `${CityName}`, asize: number): number;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ getOfficeSizeUpgradeCost(divisionName: string, cityName: string, asize: number):
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  asize | number |  |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.officeapi.hireemployee.md b/markdown/bitburner.officeapi.hireemployee.md
index 5874c9e0c..47325a6aa 100644
--- a/markdown/bitburner.officeapi.hireemployee.md
+++ b/markdown/bitburner.officeapi.hireemployee.md
@@ -11,8 +11,8 @@ Hire an employee.
 ```typescript
 hireEmployee(
     divisionName: string,
-    cityName: string,
-    employeePosition?: EmployeePositions | `${EmployeePositions}`,
+    city: CityName | `${CityName}`,
+    employeePosition?: CorpEmployeePosition,
   ): boolean;
 ```
 
@@ -21,8 +21,8 @@ hireEmployee(
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
-|  employeePosition | [EmployeePositions](./bitburner.employeepositions.md) \| \`${[EmployeePositions](./bitburner.employeepositions.md)<!-- -->}\` | Position to place into. Defaults to "Unassigned". |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
+|  employeePosition | [CorpEmployeePosition](./bitburner.corpemployeeposition.md) | Position to place into. Defaults to "Unassigned". |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.officeapi.md b/markdown/bitburner.officeapi.md
index 60db20d04..a08b02ab4 100644
--- a/markdown/bitburner.officeapi.md
+++ b/markdown/bitburner.officeapi.md
@@ -20,17 +20,17 @@ requires the Office API upgrade from your corporation.
 
 |  Method | Description |
 |  --- | --- |
-|  [buyCoffee(divisionName, cityName)](./bitburner.officeapi.buycoffee.md) | Buy coffee for your employees |
-|  [getHireAdVertCost(divisionName)](./bitburner.officeapi.gethireadvertcost.md) | Get data about an employee |
-|  [getHireAdVertCount(adivisionName)](./bitburner.officeapi.gethireadvertcount.md) | Get the number of times you have Hired AdVert |
-|  [getOffice(divisionName, cityName)](./bitburner.officeapi.getoffice.md) | Get data about an office |
-|  [getOfficeSizeUpgradeCost(divisionName, cityName, asize)](./bitburner.officeapi.getofficesizeupgradecost.md) | Cost to Upgrade office size. |
+|  [buyCoffee(divisionName, city)](./bitburner.officeapi.buycoffee.md) | Buy coffee for your employees |
+|  [getHireAdVertCost(divisionName)](./bitburner.officeapi.gethireadvertcost.md) | Get the cost to hire AdVert. |
+|  [getHireAdVertCount(divisionName)](./bitburner.officeapi.gethireadvertcount.md) | Get the number of times you have hired AdVert. |
+|  [getOffice(divisionName, city)](./bitburner.officeapi.getoffice.md) | Get data about an office |
+|  [getOfficeSizeUpgradeCost(divisionName, city, asize)](./bitburner.officeapi.getofficesizeupgradecost.md) | Cost to Upgrade office size. |
 |  [getResearchCost(divisionName, researchName)](./bitburner.officeapi.getresearchcost.md) | Get the cost to unlock research |
 |  [hasResearched(divisionName, researchName)](./bitburner.officeapi.hasresearched.md) | Gets if you have unlocked a research |
 |  [hireAdVert(divisionName)](./bitburner.officeapi.hireadvert.md) | Hire AdVert. |
-|  [hireEmployee(divisionName, cityName, employeePosition)](./bitburner.officeapi.hireemployee.md) | Hire an employee. |
+|  [hireEmployee(divisionName, city, employeePosition)](./bitburner.officeapi.hireemployee.md) | Hire an employee. |
 |  [research(divisionName, researchName)](./bitburner.officeapi.research.md) | Purchase a research |
-|  [setAutoJobAssignment(divisionName, cityName, job, amount)](./bitburner.officeapi.setautojobassignment.md) | Set the auto job assignment for a job |
-|  [throwParty(divisionName, cityName, costPerEmployee)](./bitburner.officeapi.throwparty.md) | Throw a party for your employees |
-|  [upgradeOfficeSize(divisionName, cityName, size)](./bitburner.officeapi.upgradeofficesize.md) | Upgrade office size. |
+|  [setAutoJobAssignment(divisionName, city, job, amount)](./bitburner.officeapi.setautojobassignment.md) | Set the auto job assignment for a job |
+|  [throwParty(divisionName, city, costPerEmployee)](./bitburner.officeapi.throwparty.md) | Throw a party for your employees |
+|  [upgradeOfficeSize(divisionName, city, size)](./bitburner.officeapi.upgradeofficesize.md) | Upgrade office size. |
 
diff --git a/markdown/bitburner.officeapi.setautojobassignment.md b/markdown/bitburner.officeapi.setautojobassignment.md
index ed92c21f8..db5113da4 100644
--- a/markdown/bitburner.officeapi.setautojobassignment.md
+++ b/markdown/bitburner.officeapi.setautojobassignment.md
@@ -9,7 +9,7 @@ Set the auto job assignment for a job
 <b>Signature:</b>
 
 ```typescript
-setAutoJobAssignment(divisionName: string, cityName: string, job: string, amount: number): boolean;
+setAutoJobAssignment(divisionName: string, city: CityName | `${CityName}`, job: string, amount: number): boolean;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ setAutoJobAssignment(divisionName: string, cityName: string, job: string, amount
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  job | string | Name of the job |
 |  amount | number | Number of employees to assign to that job |
 
diff --git a/markdown/bitburner.officeapi.throwparty.md b/markdown/bitburner.officeapi.throwparty.md
index 5b8543a90..9c4b7cd40 100644
--- a/markdown/bitburner.officeapi.throwparty.md
+++ b/markdown/bitburner.officeapi.throwparty.md
@@ -9,7 +9,7 @@ Throw a party for your employees
 <b>Signature:</b>
 
 ```typescript
-throwParty(divisionName: string, cityName: string, costPerEmployee: number): number;
+throwParty(divisionName: string, city: CityName | `${CityName}`, costPerEmployee: number): number;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ throwParty(divisionName: string, cityName: string, costPerEmployee: number): num
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  costPerEmployee | number | Amount to spend per employee. |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.officeapi.upgradeofficesize.md b/markdown/bitburner.officeapi.upgradeofficesize.md
index 25c7f46af..e99a3f638 100644
--- a/markdown/bitburner.officeapi.upgradeofficesize.md
+++ b/markdown/bitburner.officeapi.upgradeofficesize.md
@@ -9,7 +9,7 @@ Upgrade office size.
 <b>Signature:</b>
 
 ```typescript
-upgradeOfficeSize(divisionName: string, cityName: string, size: number): void;
+upgradeOfficeSize(divisionName: string, city: CityName | `${CityName}`, size: number): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ upgradeOfficeSize(divisionName: string, cityName: string, size: number): void;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  size | number | Amount of positions to open |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.person.city.md b/markdown/bitburner.person.city.md
index c335af9c0..3f83b97b1 100644
--- a/markdown/bitburner.person.city.md
+++ b/markdown/bitburner.person.city.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-city: string;
+city: CityName;
 ```
diff --git a/markdown/bitburner.person.md b/markdown/bitburner.person.md
index 3a152f97c..c9f44349a 100644
--- a/markdown/bitburner.person.md
+++ b/markdown/bitburner.person.md
@@ -15,7 +15,7 @@ interface Person
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [city](./bitburner.person.city.md) | string |  |
+|  [city](./bitburner.person.city.md) | [CityName](./bitburner.cityname.md) |  |
 |  [exp](./bitburner.person.exp.md) | [Skills](./bitburner.skills.md) |  |
 |  [hp](./bitburner.person.hp.md) | [HP](./bitburner.hp.md) |  |
 |  [mults](./bitburner.person.mults.md) | [Multipliers](./bitburner.multipliers.md) |  |
diff --git a/markdown/bitburner.product.citydata.md b/markdown/bitburner.product.citydata.md
index aad8ca9c2..fac1296f2 100644
--- a/markdown/bitburner.product.citydata.md
+++ b/markdown/bitburner.product.citydata.md
@@ -9,5 +9,5 @@ Data refers to the production, sale, and quantity of the products These values a
 <b>Signature:</b>
 
 ```typescript
-cityData: { [key: string]: number[] };
+cityData: Record<CityName | `${CityName}`, number[]>;
 ```
diff --git a/markdown/bitburner.product.md b/markdown/bitburner.product.md
index be31c122d..c694eb033 100644
--- a/markdown/bitburner.product.md
+++ b/markdown/bitburner.product.md
@@ -16,7 +16,7 @@ interface Product
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [cityData](./bitburner.product.citydata.md) | { \[key: string\]: number\[\] } | Data refers to the production, sale, and quantity of the products These values are specific to a city For each city, the data is \[qty, prod, sell\] |
+|  [cityData](./bitburner.product.citydata.md) | Record&lt;[CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\`, number\[\]&gt; | Data refers to the production, sale, and quantity of the products These values are specific to a city For each city, the data is \[qty, prod, sell\] |
 |  [cmp](./bitburner.product.cmp.md) | number \| undefined | Competition for the product, only present if "Market Research - Competition" unlocked |
 |  [developmentProgress](./bitburner.product.developmentprogress.md) | number | Creation progress - A number between 0-100 representing percentage |
 |  [dmd](./bitburner.product.dmd.md) | number \| undefined | Demand for the product, only present if "Market Research - Demand" unlocked |
diff --git a/markdown/bitburner.singularity.commitcrime.md b/markdown/bitburner.singularity.commitcrime.md
index 8a9c44fd9..7ff0da6fc 100644
--- a/markdown/bitburner.singularity.commitcrime.md
+++ b/markdown/bitburner.singularity.commitcrime.md
@@ -31,5 +31,5 @@ RAM cost: 5 GB \* 16/4/1
 
 This function is used to automatically attempt to commit crimes. If you are already in the middle of some ‘working’ action (such as working for a company or training at a gym), then running this function will automatically cancel that action and give you your earnings.
 
-This function returns the number of milliseconds it takes to attempt the specified crime (e.g It takes 60 seconds to attempt the ‘Rob Store’ crime, so running `commitCrime('ROBSTORE')` will return 60,000).
+This function returns the number of milliseconds it takes to attempt the specified crime (e.g It takes 60 seconds to attempt the ‘Rob Store’ crime, so running `commitCrime('Rob Store')` will return 60,000).
 
diff --git a/markdown/bitburner.singularity.traveltocity.md b/markdown/bitburner.singularity.traveltocity.md
index 89a5faa9c..5936c8a6a 100644
--- a/markdown/bitburner.singularity.traveltocity.md
+++ b/markdown/bitburner.singularity.traveltocity.md
@@ -9,14 +9,14 @@ Travel to another city.
 <b>Signature:</b>
 
 ```typescript
-travelToCity(city: string): boolean;
+travelToCity(city: CityName | `${CityName}`): boolean;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  city | string | City to travel to. |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | City to travel to. |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.sleeve.md b/markdown/bitburner.sleeve.md
index e1d6e419a..28040a996 100644
--- a/markdown/bitburner.sleeve.md
+++ b/markdown/bitburner.sleeve.md
@@ -36,5 +36,5 @@ If you are not in BitNode-10, then you must have Source-File 10 in order to use
 |  [setToShockRecovery(sleeveNumber)](./bitburner.sleeve.settoshockrecovery.md) | Set a sleeve to shock recovery. |
 |  [setToSynchronize(sleeveNumber)](./bitburner.sleeve.settosynchronize.md) | Set a sleeve to synchronize. |
 |  [setToUniversityCourse(sleeveNumber, university, className)](./bitburner.sleeve.settouniversitycourse.md) | Set a sleeve to take a class at a university. |
-|  [travel(sleeveNumber, cityName)](./bitburner.sleeve.travel.md) | Make a sleeve travel to another city. |
+|  [travel(sleeveNumber, city)](./bitburner.sleeve.travel.md) | Make a sleeve travel to another city. |
 
diff --git a/markdown/bitburner.sleeve.settocommitcrime.md b/markdown/bitburner.sleeve.settocommitcrime.md
index eb6919eb1..835be4e00 100644
--- a/markdown/bitburner.sleeve.settocommitcrime.md
+++ b/markdown/bitburner.sleeve.settocommitcrime.md
@@ -31,29 +31,15 @@ RAM cost: 4 GB
 
 Return a boolean indicating whether or not this action was set successfully (false if an invalid action is specified).
 
-## Example 1
+## Example
 
 
 ```ts
-// NS1
-// Assign the first 3 sleeves to commit various crimes.
-var crime = ["MUG", "ROBSTORE", "SHOPLIFT"];
-for (var i = 0; i < crime.length; i++) {
-    tprintf("Sleeve %d commits crime: %s", i, crime[i]);
-    sleeve.setToCommitCrime(i, crime[i]);
-}
-```
-
-## Example 2
-
-
-```ts
-// NS2
-// Assign the first 3 sleeves to commit various crimes.
-const crime = ["MUG", "ROBSTORE", "SHOPLIFT"];
-for (let i = 0; i < crime.length; i++) {
-    ns.tprintf("Sleeve %d commits crime: %s", i, crime[i]);
-    ns.sleeve.setToCommitCrime(i, crime[i]);
-}
+// Assigns the first sleeve to Homicide.
+ns.sleeve.setToCommitCrime(0, "Homicide");
+
+// Assigns the second sleeve to Grand Theft Auto, using enum
+const crimes = ns.enums.CrimeType;
+ns.sleeve.setToCommitCrime(1, crimes.grandTheftAuto)
 ```
 
diff --git a/markdown/bitburner.sleeve.travel.md b/markdown/bitburner.sleeve.travel.md
index e3d98cbfa..8ff1d85cb 100644
--- a/markdown/bitburner.sleeve.travel.md
+++ b/markdown/bitburner.sleeve.travel.md
@@ -9,7 +9,7 @@ Make a sleeve travel to another city.
 <b>Signature:</b>
 
 ```typescript
-travel(sleeveNumber: number, cityName: string): boolean;
+travel(sleeveNumber: number, city: CityName | `${CityName}`): boolean;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ travel(sleeveNumber: number, cityName: string): boolean;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  sleeveNumber | number | Index of the sleeve to travel. |
-|  cityName | string | Name of the destination city. |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the destination city. |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.tix.getprice.md b/markdown/bitburner.tix.getprice.md
index 01d1b1b40..6c199342a 100644
--- a/markdown/bitburner.tix.getprice.md
+++ b/markdown/bitburner.tix.getprice.md
@@ -34,26 +34,11 @@ The stock’s price is the average of its bid and ask prices. This function requ
 
 1. TIX API Access
 
-## Example 1
+## Example
 
 
-```ts
-// NS1
-stock.getPrice("FSIG");
-
-// Choose the first stock symbol from the array of stock symbols.  Get the price
-// of the corresponding stock.
-var sym = stock.getSymbols()[0];
-tprint("Stock symbol: " + sym);
-tprint("Stock price: " + stock.getPrice(sym));
-```
-
-## Example 2
-
-
-```ts
-// NS2
-ns.stock.getPrice("FSIG");
+```js
+const fourSigmaStockPrice = ns.stock.getPrice("FSIG");
 
 // Choose the first stock symbol from the array of stock symbols.  Get the price
 // of the corresponding stock.
diff --git a/markdown/bitburner.warehouse.loc.md b/markdown/bitburner.warehouse.loc.md
index 1985da2f3..28d61e1c5 100644
--- a/markdown/bitburner.warehouse.loc.md
+++ b/markdown/bitburner.warehouse.loc.md
@@ -9,5 +9,5 @@ City in which the warehouse is located
 <b>Signature:</b>
 
 ```typescript
-loc: string;
+loc: CityName;
 ```
diff --git a/markdown/bitburner.warehouse.md b/markdown/bitburner.warehouse.md
index f2248aa39..5b46fc8f7 100644
--- a/markdown/bitburner.warehouse.md
+++ b/markdown/bitburner.warehouse.md
@@ -17,7 +17,7 @@ interface Warehouse
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [level](./bitburner.warehouse.level.md) | number | Amount of size upgrade bought |
-|  [loc](./bitburner.warehouse.loc.md) | string | City in which the warehouse is located |
+|  [loc](./bitburner.warehouse.loc.md) | [CityName](./bitburner.cityname.md) | City in which the warehouse is located |
 |  [size](./bitburner.warehouse.size.md) | number | Total space in the warehouse |
 |  [sizeUsed](./bitburner.warehouse.sizeused.md) | number | Used space in the warehouse |
 |  [smartSupplyEnabled](./bitburner.warehouse.smartsupplyenabled.md) | boolean | Smart Supply status in the warehouse |
diff --git a/markdown/bitburner.warehouseapi.bulkpurchase.md b/markdown/bitburner.warehouseapi.bulkpurchase.md
index 3f55a3cac..861e41285 100644
--- a/markdown/bitburner.warehouseapi.bulkpurchase.md
+++ b/markdown/bitburner.warehouseapi.bulkpurchase.md
@@ -9,7 +9,7 @@ Set material to bulk buy
 <b>Signature:</b>
 
 ```typescript
-bulkPurchase(divisionName: string, cityName: string, materialName: string, amt: number): void;
+bulkPurchase(divisionName: string, city: CityName | `${CityName}`, materialName: string, amt: number): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ bulkPurchase(divisionName: string, cityName: string, materialName: string, amt:
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 |  amt | number | Amount of material to buy |
 
diff --git a/markdown/bitburner.warehouseapi.buymaterial.md b/markdown/bitburner.warehouseapi.buymaterial.md
index e11506cae..4dd91bafa 100644
--- a/markdown/bitburner.warehouseapi.buymaterial.md
+++ b/markdown/bitburner.warehouseapi.buymaterial.md
@@ -9,7 +9,7 @@ Set material buy data
 <b>Signature:</b>
 
 ```typescript
-buyMaterial(divisionName: string, cityName: string, materialName: string, amt: number): void;
+buyMaterial(divisionName: string, city: CityName | `${CityName}`, materialName: string, amt: number): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ buyMaterial(divisionName: string, cityName: string, materialName: string, amt: n
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 |  amt | number | Amount of material to buy |
 
diff --git a/markdown/bitburner.warehouseapi.cancelexportmaterial.md b/markdown/bitburner.warehouseapi.cancelexportmaterial.md
index 344740dc9..bbc0c9709 100644
--- a/markdown/bitburner.warehouseapi.cancelexportmaterial.md
+++ b/markdown/bitburner.warehouseapi.cancelexportmaterial.md
@@ -11,9 +11,9 @@ Cancel material export
 ```typescript
 cancelExportMaterial(
     sourceDivision: string,
-    sourceCity: string,
+    sourceCity: CityName | `${CityName}`,
     targetDivision: string,
-    targetCity: string,
+    targetCity: CityName | `${CityName}`,
     materialName: string,
     amt: number,
   ): void;
@@ -24,9 +24,9 @@ cancelExportMaterial(
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  sourceDivision | string | Source division |
-|  sourceCity | string | Source city |
+|  sourceCity | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Source city |
 |  targetDivision | string | Target division |
-|  targetCity | string | Target city |
+|  targetCity | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Target city |
 |  materialName | string | Name of the material |
 |  amt | number | Amount of material to export. |
 
diff --git a/markdown/bitburner.warehouseapi.exportmaterial.md b/markdown/bitburner.warehouseapi.exportmaterial.md
index 7fae1f948..4c7cfef4f 100644
--- a/markdown/bitburner.warehouseapi.exportmaterial.md
+++ b/markdown/bitburner.warehouseapi.exportmaterial.md
@@ -11,9 +11,9 @@ Set material export data
 ```typescript
 exportMaterial(
     sourceDivision: string,
-    sourceCity: string,
+    sourceCity: CityName | `${CityName}`,
     targetDivision: string,
-    targetCity: string,
+    targetCity: CityName | `${CityName}`,
     materialName: string,
     amt: number,
   ): void;
@@ -24,9 +24,9 @@ exportMaterial(
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  sourceDivision | string | Source division |
-|  sourceCity | string | Source city |
+|  sourceCity | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Source city |
 |  targetDivision | string | Target division |
-|  targetCity | string | Target city |
+|  targetCity | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Target city |
 |  materialName | string | Name of the material |
 |  amt | number | Amount of material to export. |
 
diff --git a/markdown/bitburner.warehouseapi.getmaterial.md b/markdown/bitburner.warehouseapi.getmaterial.md
index 4aa393c22..523fc64ef 100644
--- a/markdown/bitburner.warehouseapi.getmaterial.md
+++ b/markdown/bitburner.warehouseapi.getmaterial.md
@@ -9,7 +9,7 @@ Get material data
 <b>Signature:</b>
 
 ```typescript
-getMaterial(divisionName: string, cityName: string, materialName: string): Material;
+getMaterial(divisionName: string, city: CityName | `${CityName}`, materialName: string): Material;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ getMaterial(divisionName: string, cityName: string, materialName: string): Mater
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string |  |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.warehouseapi.getpurchasewarehousecost.md b/markdown/bitburner.warehouseapi.getpurchasewarehousecost.md
deleted file mode 100644
index e8fbc61d0..000000000
--- a/markdown/bitburner.warehouseapi.getpurchasewarehousecost.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [WarehouseAPI](./bitburner.warehouseapi.md) &gt; [getPurchaseWarehouseCost](./bitburner.warehouseapi.getpurchasewarehousecost.md)
-
-## WarehouseAPI.getPurchaseWarehouseCost() method
-
-Gets the cost to purchase a warehouse
-
-<b>Signature:</b>
-
-```typescript
-getPurchaseWarehouseCost(): number;
-```
-<b>Returns:</b>
-
-number
-
-cost
-
diff --git a/markdown/bitburner.warehouseapi.getupgradewarehousecost.md b/markdown/bitburner.warehouseapi.getupgradewarehousecost.md
index 131013517..a5e3e6d6a 100644
--- a/markdown/bitburner.warehouseapi.getupgradewarehousecost.md
+++ b/markdown/bitburner.warehouseapi.getupgradewarehousecost.md
@@ -9,16 +9,16 @@ Gets the cost to upgrade a warehouse to the next level
 <b>Signature:</b>
 
 ```typescript
-getUpgradeWarehouseCost(adivisionName: string, acityName: string, amt?: number): number;
+getUpgradeWarehouseCost(divisionName: string, city: CityName | `${CityName}`, amt?: number): number;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  adivisionName | string |  |
-|  acityName | string |  |
-|  amt | number | amount of upgrades defaults to 1 |
+|  divisionName | string | Name of the division |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
+|  amt | number | amount of upgrades. Optional, defaults to 1 |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.warehouseapi.getwarehouse.md b/markdown/bitburner.warehouseapi.getwarehouse.md
index de2373f7e..336582981 100644
--- a/markdown/bitburner.warehouseapi.getwarehouse.md
+++ b/markdown/bitburner.warehouseapi.getwarehouse.md
@@ -9,7 +9,7 @@ Get warehouse data
 <b>Signature:</b>
 
 ```typescript
-getWarehouse(divisionName: string, cityName: string): Warehouse;
+getWarehouse(divisionName: string, city: CityName | `${CityName}`): Warehouse;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ getWarehouse(divisionName: string, cityName: string): Warehouse;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.warehouseapi.haswarehouse.md b/markdown/bitburner.warehouseapi.haswarehouse.md
index 653d8f61e..c8d6a16ec 100644
--- a/markdown/bitburner.warehouseapi.haswarehouse.md
+++ b/markdown/bitburner.warehouseapi.haswarehouse.md
@@ -9,15 +9,15 @@ Check if you have a warehouse in city
 <b>Signature:</b>
 
 ```typescript
-hasWarehouse(adivisionName: string, acityName: string): boolean;
+hasWarehouse(divisionName: string, city: CityName | `${CityName}`): boolean;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  adivisionName | string |  |
-|  acityName | string |  |
+|  divisionName | string |  |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` |  |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.warehouseapi.limitmaterialproduction.md b/markdown/bitburner.warehouseapi.limitmaterialproduction.md
index 67fb1983b..93233e565 100644
--- a/markdown/bitburner.warehouseapi.limitmaterialproduction.md
+++ b/markdown/bitburner.warehouseapi.limitmaterialproduction.md
@@ -9,7 +9,12 @@ Limit Material Production.
 <b>Signature:</b>
 
 ```typescript
-limitMaterialProduction(divisionName: string, cityName: string, materialName: string, qty: number): void;
+limitMaterialProduction(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    qty: number,
+  ): void;
 ```
 
 ## Parameters
@@ -17,7 +22,7 @@ limitMaterialProduction(divisionName: string, cityName: string, materialName: st
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division. |
-|  cityName | string | Name of the city. |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city. |
 |  materialName | string | Name of the material. |
 |  qty | number | Amount to limit to. Pass a negative value to remove the limit instead. |
 
diff --git a/markdown/bitburner.warehouseapi.limitproductproduction.md b/markdown/bitburner.warehouseapi.limitproductproduction.md
index 77f211deb..f83fdf313 100644
--- a/markdown/bitburner.warehouseapi.limitproductproduction.md
+++ b/markdown/bitburner.warehouseapi.limitproductproduction.md
@@ -9,7 +9,7 @@ Limit Product Production.
 <b>Signature:</b>
 
 ```typescript
-limitProductProduction(divisionName: string, cityName: string, productName: string, qty: number): void;
+limitProductProduction(divisionName: string, city: CityName | `${CityName}`, productName: string, qty: number): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ limitProductProduction(divisionName: string, cityName: string, productName: stri
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division. |
-|  cityName | string | Name of the city. |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city. |
 |  productName | string | Name of the product. |
 |  qty | number | Amount to limit to. Pass a negative value to remove the limit instead. |
 
diff --git a/markdown/bitburner.warehouseapi.makeproduct.md b/markdown/bitburner.warehouseapi.makeproduct.md
index b279ffdce..e35e1bade 100644
--- a/markdown/bitburner.warehouseapi.makeproduct.md
+++ b/markdown/bitburner.warehouseapi.makeproduct.md
@@ -11,7 +11,7 @@ Create a new product
 ```typescript
 makeProduct(
     divisionName: string,
-    cityName: string,
+    city: CityName | `${CityName}`,
     productName: string,
     designInvest: number,
     marketingInvest: number,
@@ -23,7 +23,7 @@ makeProduct(
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  productName | string | Name of the product |
 |  designInvest | number | Amount to invest for the design of the product. |
 |  marketingInvest | number | Amount to invest for the marketing of the product. |
diff --git a/markdown/bitburner.warehouseapi.md b/markdown/bitburner.warehouseapi.md
index 47131265b..b19d41d7d 100644
--- a/markdown/bitburner.warehouseapi.md
+++ b/markdown/bitburner.warehouseapi.md
@@ -20,28 +20,27 @@ Requires the Warehouse API upgrade from your corporation.
 
 |  Method | Description |
 |  --- | --- |
-|  [bulkPurchase(divisionName, cityName, materialName, amt)](./bitburner.warehouseapi.bulkpurchase.md) | Set material to bulk buy |
-|  [buyMaterial(divisionName, cityName, materialName, amt)](./bitburner.warehouseapi.buymaterial.md) | Set material buy data |
+|  [bulkPurchase(divisionName, city, materialName, amt)](./bitburner.warehouseapi.bulkpurchase.md) | Set material to bulk buy |
+|  [buyMaterial(divisionName, city, materialName, amt)](./bitburner.warehouseapi.buymaterial.md) | Set material buy data |
 |  [cancelExportMaterial(sourceDivision, sourceCity, targetDivision, targetCity, materialName, amt)](./bitburner.warehouseapi.cancelexportmaterial.md) | Cancel material export |
 |  [discontinueProduct(divisionName, productName)](./bitburner.warehouseapi.discontinueproduct.md) | Discontinue a product. |
 |  [exportMaterial(sourceDivision, sourceCity, targetDivision, targetCity, materialName, amt)](./bitburner.warehouseapi.exportmaterial.md) | Set material export data |
-|  [getMaterial(divisionName, cityName, materialName)](./bitburner.warehouseapi.getmaterial.md) | Get material data |
+|  [getMaterial(divisionName, city, materialName)](./bitburner.warehouseapi.getmaterial.md) | Get material data |
 |  [getProduct(divisionName, productName)](./bitburner.warehouseapi.getproduct.md) | Get product data |
-|  [getPurchaseWarehouseCost()](./bitburner.warehouseapi.getpurchasewarehousecost.md) | Gets the cost to purchase a warehouse |
-|  [getUpgradeWarehouseCost(adivisionName, acityName, amt)](./bitburner.warehouseapi.getupgradewarehousecost.md) | Gets the cost to upgrade a warehouse to the next level |
-|  [getWarehouse(divisionName, cityName)](./bitburner.warehouseapi.getwarehouse.md) | Get warehouse data |
-|  [hasWarehouse(adivisionName, acityName)](./bitburner.warehouseapi.haswarehouse.md) | Check if you have a warehouse in city |
-|  [limitMaterialProduction(divisionName, cityName, materialName, qty)](./bitburner.warehouseapi.limitmaterialproduction.md) | Limit Material Production. |
-|  [limitProductProduction(divisionName, cityName, productName, qty)](./bitburner.warehouseapi.limitproductproduction.md) | Limit Product Production. |
-|  [makeProduct(divisionName, cityName, productName, designInvest, marketingInvest)](./bitburner.warehouseapi.makeproduct.md) | Create a new product |
-|  [purchaseWarehouse(divisionName, cityName)](./bitburner.warehouseapi.purchasewarehouse.md) | Purchase warehouse for a new city |
-|  [sellMaterial(divisionName, cityName, materialName, amt, price)](./bitburner.warehouseapi.sellmaterial.md) | Set material sell data. |
-|  [sellProduct(divisionName, cityName, productName, amt, price, all)](./bitburner.warehouseapi.sellproduct.md) | Set product sell data. |
-|  [setMaterialMarketTA1(divisionName, cityName, materialName, on)](./bitburner.warehouseapi.setmaterialmarketta1.md) | Set market TA 1 for a material. |
-|  [setMaterialMarketTA2(divisionName, cityName, materialName, on)](./bitburner.warehouseapi.setmaterialmarketta2.md) | Set market TA 2 for a material. |
+|  [getUpgradeWarehouseCost(divisionName, city, amt)](./bitburner.warehouseapi.getupgradewarehousecost.md) | Gets the cost to upgrade a warehouse to the next level |
+|  [getWarehouse(divisionName, city)](./bitburner.warehouseapi.getwarehouse.md) | Get warehouse data |
+|  [hasWarehouse(divisionName, city)](./bitburner.warehouseapi.haswarehouse.md) | Check if you have a warehouse in city |
+|  [limitMaterialProduction(divisionName, city, materialName, qty)](./bitburner.warehouseapi.limitmaterialproduction.md) | Limit Material Production. |
+|  [limitProductProduction(divisionName, city, productName, qty)](./bitburner.warehouseapi.limitproductproduction.md) | Limit Product Production. |
+|  [makeProduct(divisionName, city, productName, designInvest, marketingInvest)](./bitburner.warehouseapi.makeproduct.md) | Create a new product |
+|  [purchaseWarehouse(divisionName, city)](./bitburner.warehouseapi.purchasewarehouse.md) | Purchase warehouse for a new city |
+|  [sellMaterial(divisionName, city, materialName, amt, price)](./bitburner.warehouseapi.sellmaterial.md) | Set material sell data. |
+|  [sellProduct(divisionName, city, productName, amt, price, all)](./bitburner.warehouseapi.sellproduct.md) | Set product sell data. |
+|  [setMaterialMarketTA1(divisionName, city, materialName, on)](./bitburner.warehouseapi.setmaterialmarketta1.md) | Set market TA 1 for a material. |
+|  [setMaterialMarketTA2(divisionName, city, materialName, on)](./bitburner.warehouseapi.setmaterialmarketta2.md) | Set market TA 2 for a material. |
 |  [setProductMarketTA1(divisionName, productName, on)](./bitburner.warehouseapi.setproductmarketta1.md) | Set market TA 1 for a product. |
 |  [setProductMarketTA2(divisionName, productName, on)](./bitburner.warehouseapi.setproductmarketta2.md) | Set market TA 2 for a product. |
-|  [setSmartSupply(divisionName, cityName, enabled)](./bitburner.warehouseapi.setsmartsupply.md) | Set smart supply |
-|  [setSmartSupplyUseLeftovers(divisionName, cityName, materialName, enabled)](./bitburner.warehouseapi.setsmartsupplyuseleftovers.md) | Set whether smart supply uses leftovers before buying |
-|  [upgradeWarehouse(divisionName, cityName, amt)](./bitburner.warehouseapi.upgradewarehouse.md) | Upgrade warehouse |
+|  [setSmartSupply(divisionName, city, enabled)](./bitburner.warehouseapi.setsmartsupply.md) | Set smart supply |
+|  [setSmartSupplyUseLeftovers(divisionName, city, materialName, enabled)](./bitburner.warehouseapi.setsmartsupplyuseleftovers.md) | Set whether smart supply uses leftovers before buying |
+|  [upgradeWarehouse(divisionName, city, amt)](./bitburner.warehouseapi.upgradewarehouse.md) | Upgrade warehouse |
 
diff --git a/markdown/bitburner.warehouseapi.purchasewarehouse.md b/markdown/bitburner.warehouseapi.purchasewarehouse.md
index 57642376f..9cc7742f3 100644
--- a/markdown/bitburner.warehouseapi.purchasewarehouse.md
+++ b/markdown/bitburner.warehouseapi.purchasewarehouse.md
@@ -9,7 +9,7 @@ Purchase warehouse for a new city
 <b>Signature:</b>
 
 ```typescript
-purchaseWarehouse(divisionName: string, cityName: string): void;
+purchaseWarehouse(divisionName: string, city: CityName | `${CityName}`): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ purchaseWarehouse(divisionName: string, cityName: string): void;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 
 <b>Returns:</b>
 
diff --git a/markdown/bitburner.warehouseapi.sellmaterial.md b/markdown/bitburner.warehouseapi.sellmaterial.md
index 3595cf80d..78758479a 100644
--- a/markdown/bitburner.warehouseapi.sellmaterial.md
+++ b/markdown/bitburner.warehouseapi.sellmaterial.md
@@ -9,7 +9,13 @@ Set material sell data.
 <b>Signature:</b>
 
 ```typescript
-sellMaterial(divisionName: string, cityName: string, materialName: string, amt: string, price: string): void;
+sellMaterial(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    amt: string,
+    price: string,
+  ): void;
 ```
 
 ## Parameters
@@ -17,7 +23,7 @@ sellMaterial(divisionName: string, cityName: string, materialName: string, amt:
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 |  amt | string | Amount to sell, can be "MAX" |
 |  price | string | Price to sell, can be "MP" |
diff --git a/markdown/bitburner.warehouseapi.sellproduct.md b/markdown/bitburner.warehouseapi.sellproduct.md
index a5a5e7fff..eed38f42f 100644
--- a/markdown/bitburner.warehouseapi.sellproduct.md
+++ b/markdown/bitburner.warehouseapi.sellproduct.md
@@ -11,7 +11,7 @@ Set product sell data.
 ```typescript
 sellProduct(
     divisionName: string,
-    cityName: string,
+    city: CityName | `${CityName}`,
     productName: string,
     amt: string,
     price: string,
@@ -24,7 +24,7 @@ sellProduct(
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  productName | string | Name of the product |
 |  amt | string | Amount to sell, can be "MAX" |
 |  price | string | Price to sell, can be "MP" |
diff --git a/markdown/bitburner.warehouseapi.setmaterialmarketta1.md b/markdown/bitburner.warehouseapi.setmaterialmarketta1.md
index 0016fb239..3d0d158a7 100644
--- a/markdown/bitburner.warehouseapi.setmaterialmarketta1.md
+++ b/markdown/bitburner.warehouseapi.setmaterialmarketta1.md
@@ -9,7 +9,7 @@ Set market TA 1 for a material.
 <b>Signature:</b>
 
 ```typescript
-setMaterialMarketTA1(divisionName: string, cityName: string, materialName: string, on: boolean): void;
+setMaterialMarketTA1(divisionName: string, city: CityName | `${CityName}`, materialName: string, on: boolean): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ setMaterialMarketTA1(divisionName: string, cityName: string, materialName: strin
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 |  on | boolean | market ta enabled |
 
diff --git a/markdown/bitburner.warehouseapi.setmaterialmarketta2.md b/markdown/bitburner.warehouseapi.setmaterialmarketta2.md
index aed035e71..3c9546691 100644
--- a/markdown/bitburner.warehouseapi.setmaterialmarketta2.md
+++ b/markdown/bitburner.warehouseapi.setmaterialmarketta2.md
@@ -9,7 +9,7 @@ Set market TA 2 for a material.
 <b>Signature:</b>
 
 ```typescript
-setMaterialMarketTA2(divisionName: string, cityName: string, materialName: string, on: boolean): void;
+setMaterialMarketTA2(divisionName: string, city: CityName | `${CityName}`, materialName: string, on: boolean): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ setMaterialMarketTA2(divisionName: string, cityName: string, materialName: strin
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 |  on | boolean | market ta enabled |
 
diff --git a/markdown/bitburner.warehouseapi.setsmartsupply.md b/markdown/bitburner.warehouseapi.setsmartsupply.md
index 3c34c18d1..6daa5d4ca 100644
--- a/markdown/bitburner.warehouseapi.setsmartsupply.md
+++ b/markdown/bitburner.warehouseapi.setsmartsupply.md
@@ -9,7 +9,7 @@ Set smart supply
 <b>Signature:</b>
 
 ```typescript
-setSmartSupply(divisionName: string, cityName: string, enabled: boolean): void;
+setSmartSupply(divisionName: string, city: CityName | `${CityName}`, enabled: boolean): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ setSmartSupply(divisionName: string, cityName: string, enabled: boolean): void;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  enabled | boolean | smart supply enabled |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.warehouseapi.setsmartsupplyuseleftovers.md b/markdown/bitburner.warehouseapi.setsmartsupplyuseleftovers.md
index b1c00312c..60efe8471 100644
--- a/markdown/bitburner.warehouseapi.setsmartsupplyuseleftovers.md
+++ b/markdown/bitburner.warehouseapi.setsmartsupplyuseleftovers.md
@@ -9,7 +9,12 @@ Set whether smart supply uses leftovers before buying
 <b>Signature:</b>
 
 ```typescript
-setSmartSupplyUseLeftovers(divisionName: string, cityName: string, materialName: string, enabled: boolean): void;
+setSmartSupplyUseLeftovers(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    enabled: boolean,
+  ): void;
 ```
 
 ## Parameters
@@ -17,7 +22,7 @@ setSmartSupplyUseLeftovers(divisionName: string, cityName: string, materialName:
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  materialName | string | Name of the material |
 |  enabled | boolean | smart supply use leftovers enabled |
 
diff --git a/markdown/bitburner.warehouseapi.upgradewarehouse.md b/markdown/bitburner.warehouseapi.upgradewarehouse.md
index cd6d59c2b..7f867bbbb 100644
--- a/markdown/bitburner.warehouseapi.upgradewarehouse.md
+++ b/markdown/bitburner.warehouseapi.upgradewarehouse.md
@@ -9,7 +9,7 @@ Upgrade warehouse
 <b>Signature:</b>
 
 ```typescript
-upgradeWarehouse(divisionName: string, cityName: string, amt?: number): void;
+upgradeWarehouse(divisionName: string, city: CityName | `${CityName}`, amt?: number): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ upgradeWarehouse(divisionName: string, cityName: string, amt?: number): void;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  divisionName | string | Name of the division |
-|  cityName | string | Name of the city |
+|  city | [CityName](./bitburner.cityname.md) \| \`${[CityName](./bitburner.cityname.md)<!-- -->}\` | Name of the city |
 |  amt | number | amount of upgrades defaults to 1 |
 
 <b>Returns:</b>
diff --git a/markdown/bitburner.workformulas.companygains.md b/markdown/bitburner.workformulas.companygains.md
index 8b1dc5be4..6ea7f8cf4 100644
--- a/markdown/bitburner.workformulas.companygains.md
+++ b/markdown/bitburner.workformulas.companygains.md
@@ -7,12 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-companyGains(
-    person: Person,
-    companyName: string,
-    workType: CompanyPosName | `${CompanyPosName}`,
-    favor: number,
-  ): WorkStats;
+companyGains(person: Person, companyName: string, workType: JobName | `${JobName}`, favor: number): WorkStats;
 ```
 
 ## Parameters
@@ -21,7 +16,7 @@ companyGains(
 |  --- | --- | --- |
 |  person | [Person](./bitburner.person.md) |  |
 |  companyName | string |  |
-|  workType | [CompanyPosName](./bitburner.companyposname.md) \| \`${[CompanyPosName](./bitburner.companyposname.md)<!-- -->}\` |  |
+|  workType | [JobName](./bitburner.jobname.md) \| \`${[JobName](./bitburner.jobname.md)<!-- -->}\` |  |
 |  favor | number |  |
 
 <b>Returns:</b>
diff --git a/src/Achievements/Achievements.ts b/src/Achievements/Achievements.ts
index b90c1eaa9..abbe8c9f0 100644
--- a/src/Achievements/Achievements.ts
+++ b/src/Achievements/Achievements.ts
@@ -3,7 +3,7 @@ import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
 import { SkillNames } from "../Bladeburner/data/SkillNames";
 import { Skills } from "../Bladeburner/Skills";
 import { CONSTANTS } from "../Constants";
-import { IndustryType } from "../Corporation/IndustryData";
+import { IndustryType } from "../Corporation/data/Enums";
 import { Exploit } from "../Exploits/Exploit";
 import { Factions } from "../Faction/Factions";
 import { AllGangs } from "../Gang/AllGangs";
@@ -12,7 +12,7 @@ import { HacknetNodeConstants, HacknetServerConstants } from "../Hacknet/data/Co
 import { hasHacknetServers } from "../Hacknet/HacknetHelpers";
 import { HacknetNode } from "../Hacknet/HacknetNode";
 import { HacknetServer } from "../Hacknet/HacknetServer";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { Player } from "@player";
 import { Programs } from "../Programs/Programs";
 import { GetAllServers, GetServer } from "../Server/AllServers";
diff --git a/src/Augmentation/Augmentation.tsx b/src/Augmentation/Augmentation.tsx
index f767ef763..df2896e5f 100644
--- a/src/Augmentation/Augmentation.tsx
+++ b/src/Augmentation/Augmentation.tsx
@@ -68,13 +68,8 @@ export interface IConstructorParams {
 }
 
 function generateStatsDescription(mults: Multipliers, programs?: string[], startingMoney?: number): JSX.Element {
-  const f = (x: number, decimals = 0): string => {
-    // look, I don't know how to make a "smart decimals"
-    // todo, make it smarter
-    if (x === 1.0777 - 1) return "7.77%";
-    if (x === 1.777 - 1) return "77.7%";
-    return numeralWrapper.formatPercentage(x, decimals);
-  };
+  // For a percentage that is <10, show x.xx%, otherwise show xx.x%
+  const f = (x: number) => numeralWrapper.formatPercentage(x, x - 1 < 0.1 ? 2 : 1);
   let desc = <>Effects:</>;
 
   if (
diff --git a/src/BitNode/BitNode.tsx b/src/BitNode/BitNode.tsx
index 7bfc575c1..c5640d5d5 100644
--- a/src/BitNode/BitNode.tsx
+++ b/src/BitNode/BitNode.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Player } from "@player";
 import { BitNodeMultipliers, IBitNodeMultipliers } from "./BitNodeMultipliers";
 import { FactionNames } from "../Faction/data/FactionNames";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 
 class BitNode {
   // A short description, or tagline, about the BitNode
diff --git a/src/Bladeburner/Bladeburner.tsx b/src/Bladeburner/Bladeburner.tsx
index e0139fb38..1bc19e035 100644
--- a/src/Bladeburner/Bladeburner.tsx
+++ b/src/Bladeburner/Bladeburner.tsx
@@ -35,6 +35,8 @@ import { KEY } from "../utils/helpers/keyCodes";
 import { isSleeveInfiltrateWork } from "../PersonObjects/Sleeve/Work/SleeveInfiltrateWork";
 import { isSleeveSupportWork } from "../PersonObjects/Sleeve/Work/SleeveSupportWork";
 import { WorkStats, newWorkStats } from "../Work/WorkStats";
+import { CityName } from "../Enums";
+import { getRandomMember } from "../utils/helpers/enum";
 
 export interface BlackOpsAttempt {
   error?: string;
@@ -68,8 +70,9 @@ export class Bladeburner {
     type: ActionTypes["Idle"],
   });
 
-  cities: Record<string, City> = {};
-  city: string = BladeburnerConstants.CityNames[2];
+  cities: Record<CityName, City>;
+  city = CityName.Sector12;
+  // Todo: better types for all these Record<string, etc> types. Will need custom types or enums for the named string categories (e.g. skills).
   skills: Record<string, number> = {};
   skillMultipliers: Record<string, number> = {};
   staminaBonus = 0;
@@ -98,9 +101,9 @@ export class Bladeburner {
   consoleLogs: string[] = ["Bladeburner Console", "Type 'help' to see console commands"];
 
   constructor() {
-    for (let i = 0; i < BladeburnerConstants.CityNames.length; ++i) {
-      this.cities[BladeburnerConstants.CityNames[i]] = new City(BladeburnerConstants.CityNames[i]);
-    }
+    this.cities = {} as Record<CityName, City>;
+    // This for loop ensures the above type is met for this.cities.
+    for (const city of Object.values(CityName)) this.cities[city] = new City(city);
 
     this.updateSkillMultipliers(); // Calls resetSkillMultipliers()
 
@@ -111,9 +114,7 @@ export class Bladeburner {
   }
 
   getCurrentCity(): City {
-    const city = this.cities[this.city];
-    if (!city) throw new Error("Invalid city in Bladeburner.getCurrentCity()");
-    return city;
+    return this.cities[this.city];
   }
 
   calculateStaminaPenalty(): number {
@@ -157,7 +158,8 @@ export class Bladeburner {
     return { isAvailable: true, action };
   }
 
-  /** This function is only for the player. Sleeves use their own functions to perform blade work. */
+  /** This function is only for the player. Sleeves use their own functions to perform blade work.
+   *  Todo: partial unification of player and sleeve methods? */
   startAction(actionId: ActionIdentifier): void {
     if (actionId == null) return;
     this.action = actionId;
@@ -849,16 +851,13 @@ export class Bladeburner {
     }
   }
 
-  triggerMigration(sourceCityName: string): void {
-    let destCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
-    while (destCityName === sourceCityName) {
-      destCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
-    }
+  triggerMigration(sourceCityName: CityName): void {
+    let destCityName = getRandomMember(CityName);
+    while (destCityName === sourceCityName) destCityName = getRandomMember(CityName);
+
     const destCity = this.cities[destCityName];
     const sourceCity = this.cities[sourceCityName];
-    if (destCity == null || sourceCity == null) {
-      throw new Error("Failed to find City with name: " + destCityName);
-    }
+
     const rand = Math.random();
     let percentage = getRandomInt(3, 15) / 100;
 
@@ -873,7 +872,7 @@ export class Bladeburner {
     destCity.pop += count;
   }
 
-  triggerPotentialMigration(sourceCityName: string, chance: number): void {
+  triggerPotentialMigration(sourceCityName: CityName, chance: number): void {
     if (chance == null || isNaN(chance)) {
       console.error("Invalid 'chance' parameter passed into Bladeburner.triggerPotentialMigration()");
     }
@@ -889,18 +888,13 @@ export class Bladeburner {
     const chance = Math.random();
 
     // Choose random source/destination city for events
-    const sourceCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
+    const sourceCityName = getRandomMember(CityName);
     const sourceCity = this.cities[sourceCityName];
-    if (!sourceCity) throw new Error("Invalid sourceCity in Bladeburner.randomEvent()");
 
-    let destCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
-    while (destCityName === sourceCityName) {
-      destCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
-    }
+    let destCityName = getRandomMember(CityName);
+    while (destCityName === sourceCityName) destCityName = getRandomMember(CityName);
     const destCity = this.cities[destCityName];
 
-    if (!sourceCity || !destCity) throw new Error("Invalid sourceCity or destCity in Bladeburner.randomEvent()");
-
     if (chance <= 0.05) {
       // New Synthoid Community, 5%
       ++sourceCity.comms;
@@ -1571,7 +1565,7 @@ export class Bladeburner {
         if (this.logging.general) {
           this.log(`${person.whoAmI()}: Incited violence in the synthoid communities.`);
         }
-        for (const cityName of Object.keys(this.cities)) {
+        for (const cityName of Object.values(CityName)) {
           const city = this.cities[cityName];
           city.chaos += 10;
           city.chaos += city.chaos / (Math.log(city.chaos) / Math.log(10));
@@ -2007,7 +2001,7 @@ export class Bladeburner {
       }
 
       // Chaos goes down very slowly
-      for (const cityName of BladeburnerConstants.CityNames) {
+      for (const cityName of Object.values(CityName)) {
         const city = this.cities[cityName];
         if (!city) throw new Error("Invalid city when processing passive chaos reduction in Bladeburner.process");
         city.chaos -= 0.0001 * seconds;
diff --git a/src/Bladeburner/City.ts b/src/Bladeburner/City.ts
index 6affac207..cf218d875 100644
--- a/src/Bladeburner/City.ts
+++ b/src/Bladeburner/City.ts
@@ -2,6 +2,7 @@ import { BladeburnerConstants } from "./data/Constants";
 import { getRandomInt } from "../utils/helpers/getRandomInt";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
 import { addOffset } from "../utils/helpers/addOffset";
+import { CityName } from "../Enums";
 
 interface IChangePopulationByCountParams {
   /** How much the estimate should change by. */
@@ -17,7 +18,7 @@ interface IChangePopulationByPercentageParams {
 
 export class City {
   /** Name of the city. */
-  name = "";
+  name: CityName;
 
   /** Population of the city. */
   pop = 0;
@@ -31,7 +32,7 @@ export class City {
   /** Chaos level of the city. */
   chaos = 0;
 
-  constructor(name: string = BladeburnerConstants.CityNames[2]) {
+  constructor(name = CityName.Sector12) {
     this.name = name;
 
     // Synthoid population and estimate
diff --git a/src/Bladeburner/data/BlackOperations.tsx b/src/Bladeburner/data/BlackOperations.tsx
index f0f419b4f..b8a396def 100644
--- a/src/Bladeburner/data/BlackOperations.tsx
+++ b/src/Bladeburner/data/BlackOperations.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { FactionNames } from "../../Faction/data/FactionNames";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 import { BlackOperationNames } from "./BlackOperationNames";
 
 interface IBlackOp {
diff --git a/src/Bladeburner/data/Constants.ts b/src/Bladeburner/data/Constants.ts
index 96151f7fc..eeec14345 100644
--- a/src/Bladeburner/data/Constants.ts
+++ b/src/Bladeburner/data/Constants.ts
@@ -1,13 +1,4 @@
-import { CityName } from "./../../Locations/data/CityNames";
 export const BladeburnerConstants = {
-  CityNames: [
-    CityName.Aevum,
-    CityName.Chongqing,
-    CityName.Sector12,
-    CityName.NewTokyo,
-    CityName.Ishima,
-    CityName.Volhaven,
-  ],
   CyclesPerSecond: 5, // Game cycle is 200 ms
 
   StaminaGainPerSecond: 0.0085,
diff --git a/src/Bladeburner/ui/Console.tsx b/src/Bladeburner/ui/Console.tsx
index 5c5565e08..fec48d64c 100644
--- a/src/Bladeburner/ui/Console.tsx
+++ b/src/Bladeburner/ui/Console.tsx
@@ -183,7 +183,7 @@ interface ILogProps {
 function Logs({ entries }: ILogProps): React.ReactElement {
   const scrollHook = useRef<HTMLUListElement>(null);
 
-  // TODO: Text gets shifted up as new entries appear, if the user scrolled up it should attempt to keep the text focused
+  // TODO unplanned: Text gets shifted up as new entries appear, if the user scrolled up it should attempt to keep the text focused
   function scrollToBottom(): void {
     if (!scrollHook.current) return;
     scrollHook.current.scrollTop = scrollHook.current.scrollHeight;
diff --git a/src/Bladeburner/ui/TravelModal.tsx b/src/Bladeburner/ui/TravelModal.tsx
index fb7bcaef5..675418b65 100644
--- a/src/Bladeburner/ui/TravelModal.tsx
+++ b/src/Bladeburner/ui/TravelModal.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Bladeburner } from "../Bladeburner";
 import { WorldMap } from "../../ui/React/WorldMap";
 import { Modal } from "../../ui/React/Modal";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 import { Settings } from "../../Settings/Settings";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
@@ -14,7 +14,7 @@ interface IProps {
 }
 
 export function TravelModal(props: IProps): React.ReactElement {
-  function travel(city: string): void {
+  function travel(city: CityName): void {
     props.bladeburner.city = city;
     props.onClose();
   }
@@ -27,13 +27,13 @@ export function TravelModal(props: IProps): React.ReactElement {
           for your Bladeburner duties does not affect your location in the game otherwise.
         </Typography>
         {Settings.DisableASCIIArt ? (
-          Object.values(CityName).map((city: CityName) => (
+          Object.values(CityName).map((city) => (
             <Button key={city} onClick={() => travel(city)}>
               {city}
             </Button>
           ))
         ) : (
-          <WorldMap currentCity={props.bladeburner.city as CityName} onTravel={(city: CityName) => travel(city)} />
+          <WorldMap currentCity={props.bladeburner.city as CityName} onTravel={travel} />
         )}
       </>
     </Modal>
diff --git a/src/Casino/Blackjack.tsx b/src/Casino/Blackjack.tsx
index 885eb192f..ce6e86da4 100644
--- a/src/Casino/Blackjack.tsx
+++ b/src/Casino/Blackjack.tsx
@@ -70,8 +70,6 @@ export class Blackjack extends React.Component<Record<string, never>, State> {
       return;
     }
 
-    // Take money from player right away so that players don't just "leave" to avoid the loss (I mean they could
-    // always reload without saving but w.e) TODO: Save/Restore the RNG state to limit the value of save-scumming.
     win(-this.state.bet);
 
     const playerHand = new Hand([this.deck.safeDrawCard(), this.deck.safeDrawCard()]);
diff --git a/src/Company/Company.ts b/src/Company/Company.ts
index 07be49826..aee521ac9 100644
--- a/src/Company/Company.ts
+++ b/src/Company/Company.ts
@@ -1,5 +1,5 @@
 import { CompanyPosition } from "./CompanyPosition";
-import * as posNames from "./data/companypositionnames";
+import * as posNames from "./data/JobTracks";
 import { favorToRep, repToFavor } from "../Faction/formulas/favor";
 
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
diff --git a/src/Company/CompanyPosition.ts b/src/Company/CompanyPosition.ts
index ecb3ac039..ad4748293 100644
--- a/src/Company/CompanyPosition.ts
+++ b/src/Company/CompanyPosition.ts
@@ -1,12 +1,13 @@
-import { Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { CONSTANTS } from "../Constants";
-import * as names from "./data/companypositionnames";
+import * as names from "./data/JobTracks";
+import { JobName } from "../Enums";
 
 /* tslint:disable:completed-docs */
 
 export interface IConstructorParams {
-  name: string;
-  nextPosition: string | null;
+  name: JobName;
+  nextPosition: JobName | null;
   baseSalary: number;
   repMultiplier: number;
 
@@ -35,10 +36,10 @@ export interface IConstructorParams {
 
 export class CompanyPosition {
   /** Position title */
-  name: string;
+  name: JobName;
 
   /** Title of next position to be promoted to */
-  nextPosition: string | null;
+  nextPosition: JobName | null;
 
   /**
    * Base salary for this position ($ per 200ms game cycle)
diff --git a/src/Company/data/CompaniesMetadata.ts b/src/Company/data/CompaniesMetadata.ts
index f6ce72ba0..0809c6703 100644
--- a/src/Company/data/CompaniesMetadata.ts
+++ b/src/Company/data/CompaniesMetadata.ts
@@ -1,7 +1,7 @@
-import * as posNames from "./companypositionnames";
+import * as posNames from "./JobTracks";
 import { IConstructorParams } from "../Company";
 
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 
 // Create Objects containing Company Positions by category
 // Will help in metadata construction later
diff --git a/src/Company/data/CompanyPositionsMetadata.ts b/src/Company/data/CompanyPositionsMetadata.ts
index 4cfeaccc9..dbd9e3c7f 100644
--- a/src/Company/data/CompanyPositionsMetadata.ts
+++ b/src/Company/data/CompanyPositionsMetadata.ts
@@ -1,6 +1,6 @@
 // Metadata used for constructing Company Positions
 import { IConstructorParams } from "../CompanyPosition";
-import * as posNames from "./companypositionnames";
+import * as posNames from "./JobTracks";
 
 export const companyPositionMetadata: IConstructorParams[] = [
   {
diff --git a/src/Company/data/JobTracks.ts b/src/Company/data/JobTracks.ts
new file mode 100644
index 000000000..c90dc9776
--- /dev/null
+++ b/src/Company/data/JobTracks.ts
@@ -0,0 +1,45 @@
+import { JobName } from "../../Enums";
+export const SoftwareCompanyPositions: JobName[] = [
+  JobName.software0,
+  JobName.software1,
+  JobName.software2,
+  JobName.software3,
+  JobName.software4,
+  JobName.software5,
+  JobName.software6,
+  JobName.software7,
+];
+
+export const ITCompanyPositions: JobName[] = [JobName.IT0, JobName.IT1, JobName.IT2, JobName.IT3];
+
+export const SecurityEngineerCompanyPositions: JobName[] = [JobName.securityEng];
+
+export const NetworkEngineerCompanyPositions: JobName[] = [JobName.networkEng0, JobName.networkEng1];
+
+export const BusinessCompanyPositions: JobName[] = [
+  JobName.business0,
+  JobName.business1,
+  JobName.business2,
+  JobName.business3,
+  JobName.business4,
+  JobName.business5,
+];
+
+export const SecurityCompanyPositions: JobName[] = [
+  JobName.security0,
+  JobName.security1,
+  JobName.security2,
+  JobName.security3,
+  JobName.security4,
+  JobName.security5,
+];
+
+export const AgentCompanyPositions: JobName[] = [JobName.agent0, JobName.agent1, JobName.agent2];
+
+export const MiscCompanyPositions: JobName[] = [JobName.waiter, JobName.employee];
+
+export const SoftwareConsultantCompanyPositions: JobName[] = [JobName.softwareConsult0, JobName.softwareConsult1];
+
+export const BusinessConsultantCompanyPositions: JobName[] = [JobName.businessConsult0, JobName.businessConsult1];
+
+export const PartTimeCompanyPositions: JobName[] = [JobName.waiterPT, JobName.employeePT];
diff --git a/src/Company/data/companypositionnames.ts b/src/Company/data/companypositionnames.ts
deleted file mode 100644
index 9dc1a5b04..000000000
--- a/src/Company/data/companypositionnames.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// TODO: Convert all to CompanyPosNames[] and make everything that uses these expect a CompanyPosNames enum member.
-
-export const SoftwareCompanyPositions: string[] = [
-  "Software Engineering Intern",
-  "Junior Software Engineer",
-  "Senior Software Engineer",
-  "Lead Software Developer",
-  "Head of Software",
-  "Head of Engineering",
-  "Vice President of Technology",
-  "Chief Technology Officer",
-];
-
-export const ITCompanyPositions: string[] = ["IT Intern", "IT Analyst", "IT Manager", "Systems Administrator"];
-
-export const SecurityEngineerCompanyPositions: string[] = ["Security Engineer"];
-
-export const NetworkEngineerCompanyPositions: string[] = ["Network Engineer", "Network Administrator"];
-
-export const BusinessCompanyPositions: string[] = [
-  "Business Intern",
-  "Business Analyst",
-  "Business Manager",
-  "Operations Manager",
-  "Chief Financial Officer",
-  "Chief Executive Officer",
-];
-
-export const SecurityCompanyPositions: string[] = [
-  "Police Officer",
-  "Police Chief",
-  "Security Guard",
-  "Security Officer",
-  "Security Supervisor",
-  "Head of Security",
-];
-
-export const AgentCompanyPositions: string[] = ["Field Agent", "Secret Agent", "Special Operative"];
-
-export const MiscCompanyPositions: string[] = ["Waiter", "Employee"];
-
-export const SoftwareConsultantCompanyPositions: string[] = ["Software Consultant", "Senior Software Consultant"];
-
-export const BusinessConsultantCompanyPositions: string[] = ["Business Consultant", "Senior Business Consultant"];
-
-export const PartTimeCompanyPositions: string[] = ["Part-time Waiter", "Part-time Employee"];
diff --git a/src/Constants.ts b/src/Constants.ts
index 74096c713..2db5ed7c8 100644
--- a/src/Constants.ts
+++ b/src/Constants.ts
@@ -232,18 +232,22 @@ export const CONSTANTS: {
   Donations: 41,
 
   LatestUpdate: `
-  v2.2.0 - 2022-12-01
+  v2.2.0 - 2022-12-21
 
   BREAKING CHANGES:
-  *  ns.codingcontract.attempt no longer returns a boolean, it returns empty string on failure or the reward string
-     on success, so comparing the result directly to true/false will no longer work. The result can still be used as
-     a condition directly.
+  *  ns.getPlayer no longer provides properties tor, inBladeburner, or hasCorporation. This information can be looked
+     up using standlone functions: ns.hasTorRouter(), ns.bladeburner.inBladeburner(), ns.corporation.hasCorporation().
   *  (NS2 only) ns functions use the this value from ns: if you move the function to its own variable off of ns, it
      needs to be bound to ns. e.g.:
      const tprint = ns.tprint.bind(ns);
   *  ns.formulas.work.classGains removed, replaced with ns.formulas.work.universityGains and ns.formulas.work.gymGains
   *  ns.sleeve.getSleeveStats and ns.sleeve.getSleeveInformation removed, ns.sleeve.getSleeve added and the returned
      sleeve can be used with formulas API the same way the getPlayer return can be.
+  *  ns.corporation.getEmployee and ns.corporation.assignJob have been removed because employees are no longer
+     represented as individual objects internally.
+  *  ns.codingcontract.attempt no longer returns a boolean, it returns empty string on failure or the reward string
+     on success, so comparing the result directly to true/false will no longer work. The result can still be used as
+     a condition directly.
 
   DEVELOPMENT
   *  Development repo moved to https://github.com/bitburner-official/bitburner-src
@@ -251,29 +255,42 @@ export const CONSTANTS: {
   *  Development is active again for non-bugfix.
   *  A bunch of fixes and setup related to moving to a new repo (@hydroflame)
 
+  TUTORIAL
+  *  Removed NS1/NS2 selection. Tutorial now only references .js files (NS1 is essentially deprecated) (@Mughur)
+  *  Fix Ram Text (by @jaculler)
+
   NETSCRIPT
-  *  Faster API wrapping on script launch. (by @d0sboots & @Snarling)
-  *  Expose more enums for player use under ns.enums (by @Snarling)
-  *  tFormat: Fix display for negative time (by @Snarling)
-    CODING CONTRACT
-    *  ns.codingcontract.attempt always returns a string (by @Snarling)
-    FORMULAS
-    *  ns.formulas.work.classGains removed, replaced with ns.formulas.work.universityGains and
-       ns.formulas.work.gymGains (@Snarling)
-    *  Add ns.formulas.work.companyGains function (by @AlexeyKozhemiakin)
-    PORTS
-    *  added portHandle.nextWrite() (by @LJNeon)
-    *  Make ns.writePort synchronous (by @Snarling)
-    SLEEVE
-    *  ns.sleeve.getSleeve added. getPlayer and getSleeve can both be used for formulas. (by @Snarling)
-    STOCK
-    *  ns.stock.getOrganization added for getting org from stock symbol (by @SamuraiNinjaGuy)
+  *  Added ns.pid property to access a script's PID without a function call. (@jeek)
+  *  Much faster API wrapping on script launch. (@d0sboots) To support this, ns functions need to keep their "this"
+     value from their parent object.
+  *  Expose more enums for player use under ns.enums (@Snarling)
+  *  tFormat: Fix display for negative time
+  *  ns.getPlayer: removed tor, inBladeburner, and hasCorporation properties
+  *  Added ns.hasTorRouter() function.
+  -- CODING CONTRACT
+     *  ns.codingcontract.attempt always returns a string (@Snarling)
+  -- CORPORATION
+     *  Removed ns.corporation.getEmployee and ns.corporation.assignJob, due to employees no longer being objects.
+     *  Added ns.corporation.hasCorporation();
+     *  Reworked how ram costs are applied for corporation.
+  -- FORMULAS
+     *  ns.formulas.work.classGains removed, replaced with ns.formulas.work.universityGains and
+        ns.formulas.work.gymGains (@Snarling)
+     *  Add ns.formulas.work.companyGains function (@AlexeyKozhemiakin)
+  -- PORTS
+     *  added portHandle.nextWrite() (@LJNeon)
+     *  Make ns.writePort synchronous (@Snarling)
+  -- SLEEVE
+     *  ns.sleeve.getSleeve added. getPlayer and getSleeve can both be used for formulas. (@Snarling)
+  -- STOCK
+     *  ns.stock.getOrganization added for getting org from stock symbol (@SamuraiNinjaGuy)
 
   SCRIPTS
-  *  Fixed bug where zombie scripts could be created after a soft reset (by @Snarling)
+  *  Fixed bug where zombie scripts could be created after a soft reset (@Snarling)
+  *  Scripts now have a maximum ram cost of 1024GB per thread.
 
   SCRIPT LOGS
-  *  Add ctrl-a support for selecting all text in tail window (by @Snarling)
+  *  Add ctrl-a support for selecting all text in tail window (@Snarling)
 
   CORPORATION
   *  Remove corp employees as objects (by @Kelenius)
@@ -297,12 +314,13 @@ export const CONSTANTS: {
   *  Connect command will connect to player owned servers from anywhere. (by @Snarling)
 
   UI
-  *  Fix keyboard shortcuts for other keyboard layouts (by @d0sboots)
+  *  Improve UI performance of sidebar and character overview using memoization (@d0sboots)
   *  Fixed spacing of text in Trade for reputation button after Infiltration (by @PyroGenesis)
   *  Fix spacing on ANSI background escape codes (by @Snarling)
   *  Fix several instances where newlines were not being displayed properly (by @quacksouls)
   *  SoftResetButton.tsx Tooltip changed to make more sense (by @rai68)
   *  GANG: Fix Gang UI to correctly report the bonus time multiplier as 25x (by @TheMas3212)
+  *  Change formatting for skill levels to use localeStr (@G4mingJon4s)
 
   DOC
   *  Fix incorrect examples for grow (by @quacksouls)
@@ -315,19 +333,22 @@ export const CONSTANTS: {
   *  Update documentation for ns.args (by @Snarling)
   *  De-uglify ns.print examples (by @LJNeon)
 
+  STATS
+  *  Fix logic for increasing HP based on defense skill levels (by @mattgarretson)
+
+  INFILTRATION
+  *  Fix SlashGame scaling. (by @Snarling)
+  
+  GANG
+  * When starting a gang, any in progress work with that faction will end. (@G4mingJon4s) 
+
   MISC
+  *  Remove google analytics (@hydroflame)
   *  Some error handling streamlining (by @Snarling)
   *  fix: check both ts and js source now (by @Tanimodori)
   *  chore: sync version in package-lock.json (by @Tanimodori)
   *  Better safety when loading game for multiple save corruption issues (by @Snarling)
   *  Nerf Noodle bar
 
-  STATS
-  *  Fix logic for increasing HP based on defense skill levels (by @mattgarretson)
-
-  TUTORIAL
-  *  Fix Ram Text (by @jaculler)
-
-  INFILTRATION
-  *  Fix SlashGame scaling. (by @Snarling)`,
+  `,
 };
diff --git a/src/Corporation/Actions.ts b/src/Corporation/Actions.ts
index a16f8bdd0..8faa0818a 100644
--- a/src/Corporation/Actions.ts
+++ b/src/Corporation/Actions.ts
@@ -1,9 +1,9 @@
 import { Player } from "@player";
 import { MaterialInfo } from "./MaterialInfo";
 import { Corporation } from "./Corporation";
-import { IndustryResearchTrees, IndustryType, IndustriesData } from "./IndustryData";
+import { IndustryResearchTrees, IndustriesData } from "./IndustryData";
 import { Industry } from "./Industry";
-import { CorporationConstants } from "./data/Constants";
+import * as corpConstants from "./data/Constants";
 import { OfficeSpace } from "./OfficeSpace";
 import { Material } from "./Material";
 import { Product } from "./Product";
@@ -11,12 +11,13 @@ import { Warehouse } from "./Warehouse";
 import { CorporationUnlockUpgrade } from "./data/CorporationUnlockUpgrades";
 import { CorporationUpgrade } from "./data/CorporationUpgrades";
 import { Cities } from "../Locations/Cities";
-import { EmployeePositions } from "./EmployeePositions";
+import { EmployeePositions, IndustryType } from "./data/Enums";
 import { ResearchMap } from "./ResearchMap";
 import { isRelevantMaterial } from "./ui/Helpers";
 import { checkEnum } from "../utils/helpers/enum";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { CorpResearchName } from "@nsdefs";
 
 export function NewIndustry(corporation: Corporation, industry: IndustryType, name: string): void {
   if (corporation.divisions.find(({ type }) => industry == type))
@@ -48,16 +49,16 @@ export function NewIndustry(corporation: Corporation, industry: IndustryType, na
 }
 
 export function NewCity(corporation: Corporation, division: Industry, city: CityName): void {
-  if (corporation.funds < CorporationConstants.OfficeInitialCost) {
+  if (corporation.funds < corpConstants.officeInitialCost) {
     throw new Error("You don't have enough company funds to open a new office!");
   }
   if (division.offices[city]) {
     throw new Error(`You have already expanded into ${city} for ${division.name}`);
   }
-  corporation.funds = corporation.funds - CorporationConstants.OfficeInitialCost;
+  corporation.funds = corporation.funds - corpConstants.officeInitialCost;
   division.offices[city] = new OfficeSpace({
     loc: city,
-    size: CorporationConstants.OfficeInitialSize,
+    size: corpConstants.officeInitialSize,
   });
 }
 
@@ -84,8 +85,8 @@ export function LevelUpgrade(corporation: Corporation, upgrade: CorporationUpgra
 }
 
 export function IssueDividends(corporation: Corporation, rate: number): void {
-  if (isNaN(rate) || rate < 0 || rate > CorporationConstants.DividendMaxRate) {
-    throw new Error(`Invalid value. Must be an number between 0 and ${CorporationConstants.DividendMaxRate}`);
+  if (isNaN(rate) || rate < 0 || rate > corpConstants.dividendMaxRate) {
+    throw new Error(`Invalid value. Must be an number between 0 and ${corpConstants.dividendMaxRate}`);
   }
 
   corporation.dividendRate = rate;
@@ -104,7 +105,7 @@ export function IssueNewShares(corporation: Corporation, amount: number): [numbe
   const newSharePrice = Math.round(corporation.sharePrice * 0.9);
 
   const profit = amount * newSharePrice;
-  corporation.issueNewSharesCooldown = CorporationConstants.IssueNewSharesCooldown;
+  corporation.issueNewSharesCooldown = corpConstants.issueNewSharesCooldown;
 
   const privateOwnedRatio = 1 - (corporation.numShares + corporation.issuedShares) / corporation.totalShares;
   const maxPrivateShares = Math.round((amount / 2) * privateOwnedRatio);
@@ -269,9 +270,7 @@ export function SetSmartSupply(warehouse: Warehouse, smartSupply: boolean): void
 }
 
 export function SetSmartSupplyUseLeftovers(warehouse: Warehouse, material: Material, useLeftover: boolean): void {
-  if (!Object.keys(warehouse.smartSupplyUseLeftovers).includes(material.name.replace(/ /g, "")))
-    throw new Error(`Invalid material '${material.name}'`);
-  warehouse.smartSupplyUseLeftovers[material.name.replace(/ /g, "")] = useLeftover;
+  warehouse.smartSupplyUseLeftovers[material.name] = useLeftover;
 }
 
 export function BuyMaterial(material: Material, amt: number): void {
@@ -282,7 +281,7 @@ export function BuyMaterial(material: Material, amt: number): void {
 }
 
 export function BulkPurchase(corp: Corporation, warehouse: Warehouse, material: Material, amt: number): void {
-  const matSize = MaterialInfo[material.name][1];
+  const matSize = MaterialInfo[material.name].size;
   const maxAmount = (warehouse.size - warehouse.sizeUsed) / matSize;
   if (isNaN(amt) || amt < 0) {
     throw new Error(`Invalid input amount`);
@@ -314,7 +313,7 @@ export function SellShares(corporation: Corporation, numShares: number): number
   corporation.issuedShares += numShares;
   corporation.sharePrice = newSharePrice;
   corporation.shareSalesUntilPriceUpdate = newSharesUntilUpdate;
-  corporation.shareSaleCooldown = CorporationConstants.SellSharesCooldown;
+  corporation.shareSaleCooldown = corpConstants.sellSharesCooldown;
   Player.gainMoney(profit, "corporation");
   return profit;
 }
@@ -338,14 +337,14 @@ export function AutoAssignJob(office: OfficeSpace, job: string, count: number):
 }
 
 export function UpgradeOfficeSize(corp: Corporation, office: OfficeSpace, size: number): void {
-  const initialPriceMult = Math.round(office.size / CorporationConstants.OfficeInitialSize);
+  const initialPriceMult = Math.round(office.size / corpConstants.officeInitialSize);
   const costMultiplier = 1.09;
   // Calculate cost to upgrade size by 15 employees
   let mult = 0;
-  for (let i = 0; i < size / CorporationConstants.OfficeInitialSize; ++i) {
+  for (let i = 0; i < size / corpConstants.officeInitialSize; ++i) {
     mult += Math.pow(costMultiplier, initialPriceMult + i);
   }
-  const cost = CorporationConstants.OfficeInitialCost * mult;
+  const cost = corpConstants.officeInitialCost * mult;
   if (corp.funds < cost) return;
   office.size += size;
   corp.funds = corp.funds - cost;
@@ -374,20 +373,20 @@ export function ThrowParty(corp: Corporation, office: OfficeSpace, costPerEmploy
 }
 
 export function PurchaseWarehouse(corp: Corporation, division: Industry, city: CityName): void {
-  if (corp.funds < CorporationConstants.WarehouseInitialCost) return;
+  if (corp.funds < corpConstants.warehouseInitialCost) return;
   if (division.warehouses[city]) return;
   division.warehouses[city] = new Warehouse({
     corp: corp,
     industry: division,
     loc: city,
-    size: CorporationConstants.WarehouseInitialSize,
+    size: corpConstants.warehouseInitialSize,
   });
-  corp.funds = corp.funds - CorporationConstants.WarehouseInitialCost;
+  corp.funds = corp.funds - corpConstants.warehouseInitialCost;
 }
 
 export function UpgradeWarehouseCost(warehouse: Warehouse, amt: number): number {
   return Array.from(Array(amt).keys()).reduce(
-    (acc, index) => acc + CorporationConstants.WarehouseUpgradeBaseCost * Math.pow(1.07, warehouse.level + 1 + index),
+    (acc, index) => acc + corpConstants.warehouseSizeUpgradeCostBase * Math.pow(1.07, warehouse.level + 1 + index),
     0,
   );
 }
@@ -461,7 +460,7 @@ export function MakeProduct(
   products[product.name] = product;
 }
 
-export function Research(division: Industry, researchName: string): void {
+export function Research(division: Industry, researchName: CorpResearchName): void {
   const researchTree = IndustryResearchTrees[division.type];
   if (researchTree === undefined) throw new Error(`No research tree for industry '${division.type}'`);
   const allResearch = researchTree.getAllNodes();
@@ -469,9 +468,9 @@ export function Research(division: Industry, researchName: string): void {
   const research = ResearchMap[researchName];
 
   if (division.researched[researchName]) return;
-  if (division.sciResearch.qty < research.cost)
+  if (division.sciResearch < research.cost)
     throw new Error(`You do not have enough Scientific Research for ${research.name}`);
-  division.sciResearch.qty -= research.cost;
+  division.sciResearch -= research.cost;
 
   // Get the Node from the Research Tree and set its 'researched' property
   researchTree.research(researchName);
@@ -481,12 +480,10 @@ export function Research(division: Industry, researchName: string): void {
   // whether research is done by script or UI. All other stats gets calculated in every cycle
   // Warehouse size gets updated only when something increases it.
   if (researchName == "Drones - Transport") {
-    for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
-      const city = CorporationConstants.Cities[i];
+    for (const city of Object.values(CityName)) {
       const warehouse = division.warehouses[city];
-      if (!warehouse) {
-        continue;
-      }
+      if (!warehouse) continue;
+
       if (Player.corporation) {
         // Stores cycles in a "buffer". Processed separately using Engine Counters
         warehouse.updateSize(Player.corporation, division);
diff --git a/src/Corporation/Corporation.tsx b/src/Corporation/Corporation.tsx
index 6f0d71595..b394d2870 100644
--- a/src/Corporation/Corporation.tsx
+++ b/src/Corporation/Corporation.tsx
@@ -1,7 +1,7 @@
 import { CorporationState } from "./CorporationState";
 import { CorporationUnlockUpgrade, CorporationUnlockUpgrades } from "./data/CorporationUnlockUpgrades";
 import { CorporationUpgrade, CorporationUpgrades } from "./data/CorporationUpgrades";
-import { CorporationConstants } from "./data/Constants";
+import * as corpConstants from "./data/Constants";
 import { Industry } from "./Industry";
 
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
@@ -12,7 +12,8 @@ import { Player } from "@player";
 import { dialogBoxCreate } from "../ui/React/DialogBox";
 import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
 import { isString } from "../utils/helpers/isString";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
+import { CorpStateName } from "@nsdefs";
 
 interface IParams {
   name?: string;
@@ -30,9 +31,9 @@ export class Corporation {
   expenses = 0;
   fundingRound = 0;
   public = false; //Publicly traded
-  totalShares = CorporationConstants.INITIALSHARES; // Total existing shares
-  numShares = CorporationConstants.INITIALSHARES; // Total shares owned by player
-  shareSalesUntilPriceUpdate = CorporationConstants.SHARESPERPRICEUPDATE;
+  totalShares = corpConstants.initialShares; // Total existing shares
+  numShares = corpConstants.initialShares; // Total shares owned by player
+  shareSalesUntilPriceUpdate = corpConstants.sharesPerPriceUpdate;
   shareSaleCooldown = 0; // Game cycles until player can sell shares again
   issueNewSharesCooldown = 0; // Game cycles until player can issue shares again
   dividendRate = 0;
@@ -68,7 +69,7 @@ export class Corporation {
     this.funds = this.funds + amt;
   }
 
-  getState(): string {
+  getState(): CorpStateName {
     return this.state.getState();
   }
 
@@ -77,10 +78,10 @@ export class Corporation {
   }
 
   process(): void {
-    if (this.storedCycles >= CorporationConstants.CyclesPerIndustryStateCycle) {
+    if (this.storedCycles >= corpConstants.gameCyclesPerCorpStateCycle) {
       const state = this.getState();
       const marketCycles = 1;
-      const gameCycles = marketCycles * CorporationConstants.CyclesPerIndustryStateCycle;
+      const gameCycles = marketCycles * corpConstants.gameCyclesPerCorpStateCycle;
       this.storedCycles -= gameCycles;
 
       this.divisions.forEach((ind) => {
@@ -116,7 +117,7 @@ export class Corporation {
         const profit = this.revenue - this.expenses;
         this.cycleValuation = this.determineCycleValuation();
         this.determineValuation();
-        const cycleProfit = profit * (marketCycles * CorporationConstants.SecsPerMarketCycle);
+        const cycleProfit = profit * (marketCycles * corpConstants.secondsPerMarketCycle);
         if (isNaN(this.funds) || this.funds === Infinity || this.funds === -Infinity) {
           dialogBoxCreate(
             "There was an error calculating your Corporations funds and they got reset to 0. " +
@@ -130,11 +131,7 @@ export class Corporation {
         this.updateDividendTax();
         if (this.dividendRate > 0 && cycleProfit > 0) {
           // Validate input again, just to be safe
-          if (
-            isNaN(this.dividendRate) ||
-            this.dividendRate < 0 ||
-            this.dividendRate > CorporationConstants.DividendMaxRate
-          ) {
+          if (isNaN(this.dividendRate) || this.dividendRate < 0 || this.dividendRate > corpConstants.dividendMaxRate) {
             console.error(`Invalid Corporation dividend rate: ${this.dividendRate}`);
           } else {
             const totalDividends = this.dividendRate * cycleProfit;
@@ -165,7 +162,7 @@ export class Corporation {
 
   getCycleDividends(): number {
     const profit = this.revenue - this.expenses;
-    const cycleProfit = profit * CorporationConstants.SecsPerMarketCycle;
+    const cycleProfit = profit * corpConstants.secondsPerMarketCycle;
     const totalDividends = this.dividendRate * cycleProfit;
     const dividendsPerShare = totalDividends / this.totalShares;
     const dividends = this.numShares * dividendsPerShare;
@@ -197,9 +194,9 @@ export class Corporation {
 
   determineValuation(): void {
     this.valuationsList.push(this.cycleValuation); //Add current valuation to the list
-    if (this.valuationsList.length > CorporationConstants.ValuationLength) this.valuationsList.shift();
+    if (this.valuationsList.length > corpConstants.valuationLength) this.valuationsList.shift();
     let val = this.valuationsList.reduce((a, b) => a + b); //Calculate valuations sum
-    val /= CorporationConstants.ValuationLength; //Calculate the average
+    val /= corpConstants.valuationLength; //Calculate the average
     this.valuation = val;
   }
 
@@ -242,7 +239,7 @@ export class Corporation {
     let profit = 0;
     let targetPrice = this.getTargetSharePrice();
 
-    const maxIterations = Math.ceil(numShares / CorporationConstants.SHARESPERPRICEUPDATE);
+    const maxIterations = Math.ceil(numShares / corpConstants.sharesPerPriceUpdate);
     if (isNaN(maxIterations) || maxIterations > 10e6) {
       console.error(
         `Something went wrong or unexpected when calculating share sale. Max iterations calculated to be ${maxIterations}`,
@@ -257,7 +254,7 @@ export class Corporation {
         break;
       } else {
         profit += sharePrice * sharesUntilUpdate;
-        sharesUntilUpdate = CorporationConstants.SHARESPERPRICEUPDATE;
+        sharesUntilUpdate = corpConstants.sharesPerPriceUpdate;
         sharesTracker -= sharesUntilUpdate;
         sharesSold += sharesUntilUpdate;
         targetPrice = this.valuation / (2 * (this.totalShares + sharesSold - this.numShares));
diff --git a/src/Corporation/CorporationState.ts b/src/Corporation/CorporationState.ts
index d8b913f95..df0060b62 100644
--- a/src/Corporation/CorporationState.ts
+++ b/src/Corporation/CorporationState.ts
@@ -1,8 +1,6 @@
+import { CorpStateName } from "@nsdefs";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
-
-// Array of all valid states
-const AllCorporationStates: string[] = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"];
-
+import { stateNames } from "./data/Constants";
 export class CorporationState {
   // Number representing what state the Corporation is in. The number
   // is an index for the array that holds all Corporation States
@@ -11,18 +9,18 @@ export class CorporationState {
   // Get the name of the current state
   // NOTE: This does NOT return the number stored in the 'state' property,
   // which is just an index for the array of all possible Corporation States.
-  getState(): string {
-    return AllCorporationStates[this.state];
+  getState(): CorpStateName {
+    return stateNames[this.state];
   }
 
   // Transition to the next state
   nextState(): void {
-    if (this.state < 0 || this.state >= AllCorporationStates.length) {
+    if (this.state < 0 || this.state >= stateNames.length) {
       this.state = 0;
     }
 
     ++this.state;
-    if (this.state >= AllCorporationStates.length) {
+    if (this.state >= stateNames.length) {
       this.state = 0;
     }
   }
diff --git a/src/Corporation/EmployeePositions.ts b/src/Corporation/EmployeePositions.ts
deleted file mode 100644
index c33eae207..000000000
--- a/src/Corporation/EmployeePositions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export enum EmployeePositions {
-  Operations = "Operations",
-  Engineer = "Engineer",
-  Business = "Business",
-  Management = "Management",
-  RandD = "Research & Development",
-  Training = "Training",
-  Unassigned = "Unassigned",
-}
diff --git a/src/Corporation/Export.ts b/src/Corporation/Export.ts
index ab706f566..2a83d28a2 100644
--- a/src/Corporation/Export.ts
+++ b/src/Corporation/Export.ts
@@ -1,4 +1,4 @@
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 
 export interface Export {
   ind: string;
diff --git a/src/Corporation/Industry.ts b/src/Corporation/Industry.ts
index 7f8199e6f..ff5ba93d3 100644
--- a/src/Corporation/Industry.ts
+++ b/src/Corporation/Industry.ts
@@ -1,9 +1,8 @@
 import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
-import { CityName } from "../Locations/data/CityNames";
-import { IndustryType, IndustryResearchTrees, IndustriesData } from "./IndustryData";
-import { CorporationConstants } from "./data/Constants";
-import { EmployeePositions } from "./EmployeePositions";
-import { Material } from "./Material";
+import { CityName } from "../Enums";
+import { IndustryResearchTrees, IndustriesData } from "./IndustryData";
+import * as corpConstants from "./data/Constants";
+import { EmployeePositions, IndustryType } from "./data/Enums";
 import { getRandomInt } from "../utils/helpers/getRandomInt";
 import { calculateEffectWithFactors } from "../utils/calculateEffectWithFactors";
 import { OfficeSpace } from "./OfficeSpace";
@@ -13,24 +12,25 @@ import { isString } from "../utils/helpers/isString";
 import { MaterialInfo } from "./MaterialInfo";
 import { Warehouse } from "./Warehouse";
 import { Corporation } from "./Corporation";
+import { CorpMaterialName, CorpResearchName, CorpStateName } from "@nsdefs";
 
 interface IParams {
   name?: string;
   corp?: Corporation;
-  type?: IndustryType | "Computer" | "Utilities";
+  type?: IndustryType;
 }
 
 export class Industry {
   name: string;
   type: IndustryType;
-  sciResearch = new Material({ name: "Scientific Research" });
-  researched: { [key: string]: boolean | undefined } = {};
-  reqMats: { [key: string]: number | undefined } = {};
+  sciResearch = 0;
+  researched: Partial<Record<CorpResearchName, boolean>> = {};
+  reqMats: Partial<Record<CorpMaterialName, number>> = {};
 
   //An array of the name of materials being produced
-  prodMats: string[];
+  prodMats: CorpMaterialName[];
 
-  products: { [key: string]: Product | undefined } = {};
+  products: Partial<Record<string, Product>> = {};
   makesProducts: boolean;
 
   awareness = 0;
@@ -57,7 +57,7 @@ export class Industry {
   thisCycleRevenue: number;
   thisCycleExpenses: number;
 
-  state = "START";
+  state: CorpStateName = "START";
   newInd = true;
 
   //Maps locations to warehouses. 0 if no warehouse at that location
@@ -69,7 +69,7 @@ export class Industry {
     [CityName.Chongqing]: 0,
     [CityName.Sector12]: new OfficeSpace({
       loc: CityName.Sector12,
-      size: CorporationConstants.OfficeInitialSize,
+      size: corpConstants.officeInitialSize,
     }),
     [CityName.NewTokyo]: 0,
     [CityName.Ishima]: 0,
@@ -79,8 +79,6 @@ export class Industry {
   numAdVerts = 0;
 
   constructor(params: IParams = {}) {
-    if (params.type === "Utilities") params.type = IndustryType.Utilities;
-    if (params.type === "Computer") params.type = IndustryType.Computers;
     this.type = params.type || IndustryType.Agriculture;
     this.name = params.name ? params.name : "";
 
@@ -97,7 +95,7 @@ export class Industry {
         corp: params.corp,
         industry: this,
         loc: CityName.Sector12,
-        size: CorporationConstants.WarehouseInitialSize,
+        size: corpConstants.warehouseInitialSize,
       }),
       [CityName.NewTokyo]: 0,
       [CityName.Ishima]: 0,
@@ -108,14 +106,14 @@ export class Industry {
     if (!data) throw new Error(`Invalid industry: "${this.type}"`);
     this.startingCost = data.startingCost;
     this.makesProducts = data.product ? true : false;
-    this.reFac = data.reFac ?? 0;
-    this.sciFac = data.sciFac ?? 0;
-    this.hwFac = data.hwFac ?? 0;
-    this.robFac = data.robFac ?? 0;
-    this.aiFac = data.aiFac ?? 0;
-    this.advFac = data.advFac ?? 0;
-    this.reqMats = data.reqMats;
-    this.prodMats = data.prodMats ?? [];
+    this.reFac = data.realEstateFactor ?? 0;
+    this.sciFac = data.scienceFactor ?? 0;
+    this.hwFac = data.hardwareFactor ?? 0;
+    this.robFac = data.robotFactor ?? 0;
+    this.aiFac = data.aiCoreFactor ?? 0;
+    this.advFac = data.advertisingFactor ?? 0;
+    this.reqMats = data.requiredMaterials;
+    this.prodMats = data.producedMaterials ?? [];
   }
 
   getMaximumNumberProducts(): number {
@@ -126,7 +124,7 @@ export class Industry {
     if (this.hasResearch("uPgrade: Capacity.I")) ++additional;
     if (this.hasResearch("uPgrade: Capacity.II")) ++additional;
 
-    return CorporationConstants.BaseMaxProducts + additional;
+    return corpConstants.maxProductsBase + additional;
   }
 
   hasMaximumNumberProducts(): boolean {
@@ -137,18 +135,17 @@ export class Industry {
   //materials/products (such as quality, etc.)
   calculateProductionFactors(): void {
     let multSum = 0;
-    for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
-      const city = CorporationConstants.Cities[i];
+    for (const city of Object.values(CityName)) {
       const warehouse = this.warehouses[city];
       if (!warehouse) continue;
 
       const materials = warehouse.materials;
 
       const cityMult =
-        Math.pow(0.002 * materials.RealEstate.qty + 1, this.reFac) *
+        Math.pow(0.002 * materials["Real Estate"].qty + 1, this.reFac) *
         Math.pow(0.002 * materials.Hardware.qty + 1, this.hwFac) *
         Math.pow(0.002 * materials.Robots.qty + 1, this.robFac) *
-        Math.pow(0.002 * materials.AICores.qty + 1, this.aiFac);
+        Math.pow(0.002 * materials["AI Cores"].qty + 1, this.aiFac);
       multSum += Math.pow(cityMult, 0.73);
     }
 
@@ -167,7 +164,7 @@ export class Industry {
     }
   }
 
-  process(marketCycles = 1, state: string, corporation: Corporation): void {
+  process(marketCycles = 1, state: CorpStateName, corporation: Corporation): void {
     this.state = state;
 
     //At the start of a cycle, store and reset revenue/expenses
@@ -181,8 +178,8 @@ export class Industry {
         this.thisCycleRevenue = 0;
         this.thisCycleExpenses = 0;
       }
-      this.lastCycleRevenue = this.thisCycleRevenue / (marketCycles * CorporationConstants.SecsPerMarketCycle);
-      this.lastCycleExpenses = this.thisCycleExpenses / (marketCycles * CorporationConstants.SecsPerMarketCycle);
+      this.lastCycleRevenue = this.thisCycleRevenue / (marketCycles * corpConstants.secondsPerMarketCycle);
+      this.lastCycleExpenses = this.thisCycleExpenses / (marketCycles * corpConstants.secondsPerMarketCycle);
       this.thisCycleRevenue = 0;
       this.thisCycleExpenses = 0;
 
@@ -244,28 +241,25 @@ export class Industry {
       prodMats = this.prodMats;
 
     //Only 'process the market' for materials that this industry deals with
-    for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
+    for (const city of Object.values(CityName)) {
       //If this industry has a warehouse in this city, process the market
       //for every material this industry requires or produces
-      if (this.warehouses[CorporationConstants.Cities[i]]) {
-        const wh = this.warehouses[CorporationConstants.Cities[i]];
-        if (wh === 0) continue;
-        for (const name of Object.keys(reqMats)) {
+      if (this.warehouses[city]) {
+        const wh = this.warehouses[city] as Warehouse; // Warehouse type is known due to if check above
+        for (const name of Object.keys(reqMats) as CorpMaterialName[]) {
           if (reqMats.hasOwnProperty(name)) {
             wh.materials[name].processMarket();
           }
         }
 
         //Produced materials are stored in an array
-        for (let foo = 0; foo < prodMats.length; ++foo) {
-          wh.materials[prodMats[foo]].processMarket();
-        }
+        for (const matName of prodMats) wh.materials[matName].processMarket();
 
         //Process these twice because these boost production
-        wh.materials["Hardware"].processMarket();
-        wh.materials["Robots"].processMarket();
-        wh.materials["AICores"].processMarket();
-        wh.materials["RealEstate"].processMarket();
+        wh.materials.Hardware.processMarket();
+        wh.materials.Robots.processMarket();
+        wh.materials["AI Cores"].processMarket();
+        wh.materials["Real Estate"].processMarket();
       }
     }
   }
@@ -302,8 +296,7 @@ export class Industry {
       expenses = 0;
     this.calculateProductionFactors();
 
-    for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
-      const city = CorporationConstants.Cities[i];
+    for (const city of Object.values(CityName)) {
       const office = this.offices[city];
       if (office === 0) continue;
 
@@ -314,7 +307,7 @@ export class Industry {
         switch (this.state) {
           case "PURCHASE": {
             /* Process purchase of materials */
-            for (const matName of Object.keys(warehouse.materials)) {
+            for (const matName of Object.values(corpConstants.materialNames)) {
               if (!warehouse.materials.hasOwnProperty(matName)) continue;
               const mat = warehouse.materials[matName];
               let buyAmt = 0;
@@ -322,9 +315,9 @@ export class Industry {
               if (warehouse.smartSupplyEnabled && Object.keys(this.reqMats).includes(matName)) {
                 continue;
               }
-              buyAmt = mat.buy * CorporationConstants.SecsPerMarketCycle * marketCycles;
+              buyAmt = mat.buy * corpConstants.secondsPerMarketCycle * marketCycles;
 
-              maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / MaterialInfo[matName][1]);
+              maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / MaterialInfo[matName].size);
 
               buyAmt = Math.min(buyAmt, maxAmt);
               if (buyAmt > 0) {
@@ -335,8 +328,8 @@ export class Industry {
             } //End process purchase of materials
 
             // smart supply
-            const smartBuy: { [key: string]: number | undefined } = {};
-            for (const matName of Object.keys(warehouse.materials)) {
+            const smartBuy: Partial<Record<CorpMaterialName, number>> = {};
+            for (const matName of Object.values(corpConstants.materialNames)) {
               if (!warehouse.materials.hasOwnProperty(matName)) continue;
               if (!warehouse.smartSupplyEnabled || !Object.keys(this.reqMats).includes(matName)) continue;
               const mat = warehouse.materials[matName];
@@ -345,15 +338,15 @@ export class Industry {
               const reqMat = this.reqMats[matName];
               if (reqMat === undefined) throw new Error(`reqMat "${matName}" is undefined`);
               mat.buy = reqMat * warehouse.smartSupplyStore;
-              let buyAmt = mat.buy * CorporationConstants.SecsPerMarketCycle * marketCycles;
-              const maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / MaterialInfo[matName][1]);
+              let buyAmt = mat.buy * corpConstants.secondsPerMarketCycle * marketCycles;
+              const maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / MaterialInfo[matName].size);
               buyAmt = Math.min(buyAmt, maxAmt);
               if (buyAmt > 0) smartBuy[matName] = buyAmt;
             }
 
             // Find which material were trying to create the least amount of product with.
             let worseAmt = 1e99;
-            for (const matName of Object.keys(smartBuy)) {
+            for (const matName of Object.keys(smartBuy) as CorpMaterialName[]) {
               const buyAmt = smartBuy[matName];
               if (buyAmt === undefined) throw new Error(`Somehow smartbuy matname is undefined`);
               const reqMat = this.reqMats[matName];
@@ -363,7 +356,7 @@ export class Industry {
             }
 
             // Align all the materials to the smallest amount.
-            for (const matName of Object.keys(smartBuy)) {
+            for (const matName of Object.keys(smartBuy) as CorpMaterialName[]) {
               const reqMat = this.reqMats[matName];
               if (reqMat === undefined) throw new Error(`reqMat "${matName}" is undefined`);
               smartBuy[matName] = worseAmt * reqMat;
@@ -371,25 +364,24 @@ export class Industry {
 
             // Calculate the total size of all things were trying to buy
             let totalSize = 0;
-            for (const matName of Object.keys(smartBuy)) {
+            for (const matName of Object.keys(smartBuy) as CorpMaterialName[]) {
               const buyAmt = smartBuy[matName];
               if (buyAmt === undefined) throw new Error(`Somehow smartbuy matname is undefined`);
-              totalSize += buyAmt * MaterialInfo[matName][1];
+              totalSize += buyAmt * MaterialInfo[matName].size;
             }
 
             // Shrink to the size of available space.
             const freeSpace = warehouse.size - warehouse.sizeUsed;
             if (totalSize > freeSpace) {
-              for (const matName of Object.keys(smartBuy)) {
+              for (const matName of Object.keys(smartBuy) as CorpMaterialName[]) {
                 const buyAmt = smartBuy[matName];
                 if (buyAmt === undefined) throw new Error(`Somehow smartbuy matname is undefined`);
                 smartBuy[matName] = Math.floor((buyAmt * freeSpace) / totalSize);
               }
             }
 
-            // TODO: Change all these Object.keys where the value is also needed to Object.entries.
             // Use the materials already in the warehouse if the option is on.
-            for (const matName of Object.keys(smartBuy)) {
+            for (const matName of Object.keys(smartBuy) as CorpMaterialName[]) {
               if (!warehouse.smartSupplyUseLeftovers[matName]) continue;
               const mat = warehouse.materials[matName];
               const buyAmt = smartBuy[matName];
@@ -398,7 +390,7 @@ export class Industry {
             }
 
             // buy them
-            for (const [matName, buyAmt] of Object.entries(smartBuy)) {
+            for (const [matName, buyAmt] of Object.entries(smartBuy) as [CorpMaterialName, number][]) {
               const mat = warehouse.materials[matName];
               if (buyAmt === undefined) throw new Error(`Somehow smartbuy matname is undefined`);
               mat.qty += buyAmt;
@@ -427,17 +419,17 @@ export class Industry {
               } else {
                 prod = maxProd;
               }
-              prod *= CorporationConstants.SecsPerMarketCycle * marketCycles; //Convert production from per second to per market cycle
+              prod *= corpConstants.secondsPerMarketCycle * marketCycles; //Convert production from per second to per market cycle
 
               // Calculate net change in warehouse storage making the produced materials will cost
               let totalMatSize = 0;
               for (let tmp = 0; tmp < this.prodMats.length; ++tmp) {
-                totalMatSize += MaterialInfo[this.prodMats[tmp]][1];
+                totalMatSize += MaterialInfo[this.prodMats[tmp]].size;
               }
-              for (const reqMatName of Object.keys(this.reqMats)) {
+              for (const reqMatName of Object.keys(this.reqMats) as CorpMaterialName[]) {
                 const normQty = this.reqMats[reqMatName];
                 if (normQty === undefined) continue;
-                totalMatSize -= MaterialInfo[reqMatName][1] * normQty;
+                totalMatSize -= MaterialInfo[reqMatName].size * normQty;
               }
               // If not enough space in warehouse, limit the amount of produced materials
               if (totalMatSize > 0) {
@@ -450,11 +442,11 @@ export class Industry {
               }
 
               // Keep track of production for smart supply (/s)
-              warehouse.smartSupplyStore += prod / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+              warehouse.smartSupplyStore += prod / (corpConstants.secondsPerMarketCycle * marketCycles);
 
               // Make sure we have enough resource to make our materials
               let producableFrac = 1;
-              for (const reqMatName of Object.keys(this.reqMats)) {
+              for (const reqMatName of Object.keys(this.reqMats) as CorpMaterialName[]) {
                 if (this.reqMats.hasOwnProperty(reqMatName)) {
                   const reqMat = this.reqMats[reqMatName];
                   if (reqMat === undefined) continue;
@@ -471,24 +463,24 @@ export class Industry {
 
               // Make our materials if they are producable
               if (producableFrac > 0 && prod > 0) {
-                for (const reqMatName of Object.keys(this.reqMats)) {
+                for (const reqMatName of Object.keys(this.reqMats) as CorpMaterialName[]) {
                   const reqMat = this.reqMats[reqMatName];
                   if (reqMat === undefined) continue;
                   const reqMatQtyNeeded = reqMat * prod * producableFrac;
                   warehouse.materials[reqMatName].qty -= reqMatQtyNeeded;
                   warehouse.materials[reqMatName].prd = 0;
                   warehouse.materials[reqMatName].prd -=
-                    reqMatQtyNeeded / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+                    reqMatQtyNeeded / (corpConstants.secondsPerMarketCycle * marketCycles);
                 }
                 for (let j = 0; j < this.prodMats.length; ++j) {
                   warehouse.materials[this.prodMats[j]].qty += prod * producableFrac;
                   warehouse.materials[this.prodMats[j]].qlt =
                     office.employeeProd[EmployeePositions.Engineer] / 90 +
-                    Math.pow(this.sciResearch.qty, this.sciFac) +
-                    Math.pow(warehouse.materials["AICores"].qty, this.aiFac) / 10e3;
+                    Math.pow(this.sciResearch, this.sciFac) +
+                    Math.pow(warehouse.materials["AI Cores"].qty, this.aiFac) / 10e3;
                 }
               } else {
-                for (const reqMatName of Object.keys(this.reqMats)) {
+                for (const reqMatName of Object.keys(this.reqMats) as CorpMaterialName[]) {
                   if (this.reqMats.hasOwnProperty(reqMatName)) {
                     warehouse.materials[reqMatName].prd = 0;
                   }
@@ -496,7 +488,7 @@ export class Industry {
               }
 
               //Per second
-              const fooProd = (prod * producableFrac) / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+              const fooProd = (prod * producableFrac) / (corpConstants.secondsPerMarketCycle * marketCycles);
               for (let fooI = 0; fooI < this.prodMats.length; ++fooI) {
                 warehouse.materials[this.prodMats[fooI]].prd = fooProd;
               }
@@ -504,7 +496,7 @@ export class Industry {
               //If this doesn't produce any materials, then it only creates
               //Products. Creating products will consume materials. The
               //Production of all consumed materials must be set to 0
-              for (const reqMatName of Object.keys(this.reqMats)) {
+              for (const reqMatName of Object.keys(this.reqMats) as CorpMaterialName[]) {
                 warehouse.materials[reqMatName].prd = 0;
               }
             }
@@ -512,7 +504,7 @@ export class Industry {
 
           case "SALE":
             /* Process sale of materials */
-            for (const matName of Object.keys(warehouse.materials)) {
+            for (const matName of Object.values(corpConstants.materialNames)) {
               if (warehouse.materials.hasOwnProperty(matName)) {
                 const mat = warehouse.materials[matName];
                 if (mat.sCost < 0 || mat.sllman[0] === false) {
@@ -617,7 +609,7 @@ export class Industry {
                   sellAmt = Math.min(mat.maxsll, mat.sllman[1] as number);
                 }
 
-                sellAmt = sellAmt * CorporationConstants.SecsPerMarketCycle * marketCycles;
+                sellAmt = sellAmt * corpConstants.secondsPerMarketCycle * marketCycles;
                 sellAmt = Math.min(mat.qty, sellAmt);
                 if (sellAmt < 0) {
                   console.warn(`sellAmt calculated to be negative for ${matName} in ${city}`);
@@ -627,7 +619,7 @@ export class Industry {
                 if (sellAmt && sCost >= 0) {
                   mat.qty -= sellAmt;
                   revenue += sellAmt * sCost;
-                  mat.sll = sellAmt / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+                  mat.sll = sellAmt / (corpConstants.secondsPerMarketCycle * marketCycles);
                 } else {
                   mat.sll = 0;
                 }
@@ -636,7 +628,7 @@ export class Industry {
             break;
 
           case "EXPORT":
-            for (const matName of Object.keys(warehouse.materials)) {
+            for (const matName of Object.values(corpConstants.materialNames)) {
               if (warehouse.materials.hasOwnProperty(matName)) {
                 const mat = warehouse.materials[matName];
                 mat.totalExp = 0; //Reset export
@@ -644,7 +636,7 @@ export class Industry {
                   const exp = mat.exp[expI];
                   const amtStr = exp.amt.replace(
                     /MAX/g,
-                    (mat.qty / (CorporationConstants.SecsPerMarketCycle * marketCycles) + "").toUpperCase(),
+                    (mat.qty / (corpConstants.secondsPerMarketCycle * marketCycles) + "").toUpperCase(),
                   );
                   let amt = 0;
                   try {
@@ -661,7 +653,7 @@ export class Industry {
                     );
                     continue;
                   }
-                  amt = amt * CorporationConstants.SecsPerMarketCycle * marketCycles;
+                  amt = amt * corpConstants.secondsPerMarketCycle * marketCycles;
 
                   if (mat.qty < amt) {
                     amt = mat.qty;
@@ -685,12 +677,11 @@ export class Industry {
                         return [0, 0];
                       } else {
                         const maxAmt = Math.floor(
-                          (expWarehouse.size - expWarehouse.sizeUsed) / MaterialInfo[matName][1],
+                          (expWarehouse.size - expWarehouse.sizeUsed) / MaterialInfo[matName].size,
                         );
                         amt = Math.min(maxAmt, amt);
                       }
-                      expWarehouse.materials[matName].imp +=
-                        amt / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+                      expWarehouse.materials[matName].imp += amt / (corpConstants.secondsPerMarketCycle * marketCycles);
                       expWarehouse.materials[matName].qty += amt;
                       expWarehouse.materials[matName].qlt = mat.qlt;
                       mat.qty -= amt;
@@ -701,7 +692,7 @@ export class Industry {
                   }
                 }
                 //totalExp should be per second
-                mat.totalExp /= CorporationConstants.SecsPerMarketCycle * marketCycles;
+                mat.totalExp /= corpConstants.secondsPerMarketCycle * marketCycles;
               }
             }
 
@@ -719,7 +710,7 @@ export class Industry {
       //Produce Scientific Research based on R&D employees
       //Scientific Research can be produced without a warehouse
       if (office) {
-        this.sciResearch.qty +=
+        this.sciResearch +=
           0.004 *
           Math.pow(office.employeeProd[EmployeePositions.RandD], 0.5) *
           corporation.getScientificResearchMultiplier() *
@@ -768,8 +759,7 @@ export class Industry {
   //Processes FINISHED products
   processProduct(marketCycles = 1, product: Product, corporation: Corporation): number {
     let totalProfit = 0;
-    for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
-      const city = CorporationConstants.Cities[i];
+    for (const city of Object.values(CityName)) {
       const office = this.offices[city];
       if (office === 0) continue;
       const warehouse = this.warehouses[city];
@@ -792,14 +782,14 @@ export class Industry {
             } else {
               prod = maxProd;
             }
-            prod *= CorporationConstants.SecsPerMarketCycle * marketCycles;
+            prod *= corpConstants.secondsPerMarketCycle * marketCycles;
 
             //Calculate net change in warehouse storage making the Products will cost
             let netStorageSize = product.siz;
-            for (const reqMatName of Object.keys(product.reqMats)) {
+            for (const reqMatName of Object.keys(product.reqMats) as CorpMaterialName[]) {
               if (product.reqMats.hasOwnProperty(reqMatName)) {
-                const normQty = product.reqMats[reqMatName];
-                netStorageSize -= MaterialInfo[reqMatName][1] * normQty;
+                const normQty = product.reqMats[reqMatName] as number;
+                netStorageSize -= MaterialInfo[reqMatName].size * normQty;
               }
             }
 
@@ -809,48 +799,42 @@ export class Industry {
               prod = Math.min(maxAmt, prod);
             }
 
-            warehouse.smartSupplyStore += prod / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+            warehouse.smartSupplyStore += prod / (corpConstants.secondsPerMarketCycle * marketCycles);
 
             //Make sure we have enough resources to make our Products
             let producableFrac = 1;
-            for (const reqMatName of Object.keys(product.reqMats)) {
-              if (product.reqMats.hasOwnProperty(reqMatName)) {
-                const req = product.reqMats[reqMatName] * prod;
-                if (warehouse.materials[reqMatName].qty < req) {
-                  producableFrac = Math.min(producableFrac, warehouse.materials[reqMatName].qty / req);
-                }
+            for (const [reqMatName, reqQty] of Object.entries(product.reqMats) as [CorpMaterialName, number][]) {
+              const req = reqQty * prod;
+              if (warehouse.materials[reqMatName].qty < req) {
+                producableFrac = Math.min(producableFrac, warehouse.materials[reqMatName].qty / req);
               }
             }
 
             //Make our Products if they are producable
             if (producableFrac > 0 && prod > 0) {
-              for (const reqMatName of Object.keys(product.reqMats)) {
-                if (product.reqMats.hasOwnProperty(reqMatName)) {
-                  const reqMatQtyNeeded = product.reqMats[reqMatName] * prod * producableFrac;
-                  warehouse.materials[reqMatName].qty -= reqMatQtyNeeded;
-                  warehouse.materials[reqMatName].prd -=
-                    reqMatQtyNeeded / (CorporationConstants.SecsPerMarketCycle * marketCycles);
-                }
+              for (const [reqMatName, reqQty] of Object.entries(product.reqMats) as [CorpMaterialName, number][]) {
+                const reqMatQtyNeeded = reqQty * prod * producableFrac;
+                warehouse.materials[reqMatName].qty -= reqMatQtyNeeded;
+                warehouse.materials[reqMatName].prd -=
+                  reqMatQtyNeeded / (corpConstants.secondsPerMarketCycle * marketCycles);
               }
               //Quantity
               product.data[city][0] += prod * producableFrac;
             }
 
             //Keep track of production Per second
-            product.data[city][1] = (prod * producableFrac) / (CorporationConstants.SecsPerMarketCycle * marketCycles);
+            product.data[city][1] = (prod * producableFrac) / (corpConstants.secondsPerMarketCycle * marketCycles);
             break;
           }
           case "SALE": {
             //Process sale of Products
             product.pCost = 0; //Estimated production cost
-            for (const reqMatName of Object.keys(product.reqMats)) {
-              if (product.reqMats.hasOwnProperty(reqMatName)) {
-                product.pCost += product.reqMats[reqMatName] * warehouse.materials[reqMatName].bCost;
-              }
+            for (const [reqMatName, reqQty] of Object.entries(product.reqMats) as [CorpMaterialName, number][]) {
+              product.pCost += reqQty * warehouse.materials[reqMatName].bCost;
             }
 
             // Since its a product, its production cost is increased for labor
-            product.pCost *= CorporationConstants.ProductProductionCostRatio;
+            product.pCost *= corpConstants.baseProductProfitMult;
 
             // Sale multipliers
             const businessFactor = this.getBusinessFactor(office); //Business employee productivity
@@ -948,12 +932,12 @@ export class Industry {
             if (sellAmt < 0) {
               sellAmt = 0;
             }
-            sellAmt = sellAmt * CorporationConstants.SecsPerMarketCycle * marketCycles;
+            sellAmt = sellAmt * corpConstants.secondsPerMarketCycle * marketCycles;
             sellAmt = Math.min(product.data[city][0], sellAmt); //data[0] is qty
             if (sellAmt && sCost) {
               product.data[city][0] -= sellAmt; //data[0] is qty
               totalProfit += sellAmt * sCost;
-              product.data[city][2] = sellAmt / (CorporationConstants.SecsPerMarketCycle * marketCycles); //data[2] is sell property
+              product.data[city][2] = sellAmt / (corpConstants.secondsPerMarketCycle * marketCycles); //data[2] is sell property
             } else {
               product.data[city][2] = 0; //data[2] is sell property
             }
@@ -975,14 +959,12 @@ export class Industry {
   resetImports(state: string): void {
     //At the start of the export state, set the imports of everything to 0
     if (state === "EXPORT") {
-      for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
-        const city = CorporationConstants.Cities[i];
-        if (!this.warehouses[city]) {
-          continue;
-        }
+      for (const city of Object.values(CityName)) {
+        if (!this.warehouses[city]) continue;
+
         const warehouse = this.warehouses[city];
         if (warehouse === 0) continue;
-        for (const matName of Object.keys(warehouse.materials)) {
+        for (const matName of Object.values(corpConstants.materialNames)) {
           if (warehouse.materials.hasOwnProperty(matName)) {
             const mat = warehouse.materials[matName];
             mat.imp = 0;
@@ -1068,7 +1050,7 @@ export class Industry {
   }
 
   // Returns a boolean indicating whether this Industry has the specified Research
-  hasResearch(name: string): boolean {
+  hasResearch(name: CorpResearchName): boolean {
     return this.researched[name] === true;
   }
 
@@ -1079,7 +1061,7 @@ export class Industry {
     // Since ResearchTree data isn't saved, we'll update the Research Tree data
     // based on the stored 'researched' property in the Industry object
     if (Object.keys(researchTree.researched).length !== Object.keys(this.researched).length) {
-      for (const research of Object.keys(this.researched)) {
+      for (const research of Object.keys(this.researched) as CorpResearchName[]) {
         researchTree.research(research);
       }
     }
@@ -1163,6 +1145,11 @@ export class Industry {
 
   /** Initializes a Industry object from a JSON save state. */
   static fromJSON(value: IReviverValue): Industry {
+    //Gracefully load saves which have old names for industries
+    if (value.data.type === "RealEstate") value.data.type = IndustryType.RealEstate;
+    if (value.data.type === "Utilities") value.data.type = IndustryType.Utilities;
+    if (value.data.type === "Computers") value.data.type = IndustryType.Computers;
+    if (value.data.type === "Computer") value.data.type = IndustryType.Computers;
     return Generic_fromJSON(Industry, value.data);
   }
 }
diff --git a/src/Corporation/IndustryData.tsx b/src/Corporation/IndustryData.tsx
index b1dbaecc4..5820b18b6 100644
--- a/src/Corporation/IndustryData.tsx
+++ b/src/Corporation/IndustryData.tsx
@@ -3,292 +3,277 @@ import { ResearchTree } from "./ResearchTree";
 import { Corporation } from "./Corporation";
 import { getBaseResearchTreeCopy, getProductIndustryResearchTreeCopy } from "./data/BaseResearchTree";
 import { MoneyCost } from "./ui/MoneyCost";
+import { CorpIndustryData, CorpIndustryName } from "@nsdefs";
+import { IndustryType } from "./data/Enums";
 
-export enum IndustryType {
-  Energy = "Energy",
-  Utilities = "Water Utilities",
-  Agriculture = "Agriculture",
-  Fishing = "Fishing",
-  Mining = "Mining",
-  Food = "Food",
-  Tobacco = "Tobacco",
-  Chemical = "Chemical",
-  Pharmaceutical = "Pharmaceutical",
-  Computers = "Computer Hardware",
-  Robotics = "Robotics",
-  Software = "Software",
-  Healthcare = "Healthcare",
-  RealEstate = "RealEstate",
-}
-
-export interface IProductRatingWeight {
-  Aesthetics?: number;
-  Durability?: number;
-  Features?: number;
-  Quality?: number;
-  Performance?: number;
-  Reliability?: number;
-}
-
-type IndustryData = {
-  startingCost: number;
-  description: string;
-  /** Product name for industry. Empty string for industries with no products. */
-  product?: { name: string; verb: string; desc: string };
-  ProductRatingWeights?: IProductRatingWeight;
-  recommendStarting: boolean;
-  reqMats: Record<string, number>;
-  /** Real estate factor */
-  reFac?: number;
-  /** Scientific research factor (affects quality) */
-  sciFac?: number;
-  /** Hardware factor */
-  hwFac?: number;
-  /** Robots factor */
-  robFac?: number;
-  /** AI Cores factor */
-  aiFac?: number;
-  /** Advertising factor (affects sales) */
-  advFac?: number;
-  prodMats?: string[];
-};
-
-export const IndustriesData: Record<IndustryType, IndustryData> = {
+export const IndustriesData: Record<CorpIndustryName, CorpIndustryData> = {
   [IndustryType.Agriculture]: {
     startingCost: 40e9,
     description: "Cultivate crops and breed livestock to produce food.",
     recommendStarting: true,
-    reFac: 0.72,
-    sciFac: 0.5,
-    hwFac: 0.2,
-    robFac: 0.3,
-    aiFac: 0.3,
-    advFac: 0.04,
-    reqMats: { Water: 0.5, Energy: 0.5 },
-    prodMats: ["Plants", "Food"],
+    realEstateFactor: 0.72,
+    scienceFactor: 0.5,
+    hardwareFactor: 0.2,
+    robotFactor: 0.3,
+    aiCoreFactor: 0.3,
+    advertisingFactor: 0.04,
+    requiredMaterials: { Water: 0.5, Energy: 0.5 },
+    producedMaterials: ["Plants", "Food"],
   },
   [IndustryType.Chemical]: {
     startingCost: 70e9,
     description: "Produce industrial chemicals.",
     recommendStarting: false,
-    reFac: 0.25,
-    sciFac: 0.75,
-    hwFac: 0.2,
-    robFac: 0.25,
-    aiFac: 0.2,
-    advFac: 0.07,
-    reqMats: { Plants: 1, Energy: 0.5, Water: 0.5 },
-    prodMats: ["Chemicals"],
+    realEstateFactor: 0.25,
+    scienceFactor: 0.75,
+    hardwareFactor: 0.2,
+    robotFactor: 0.25,
+    aiCoreFactor: 0.2,
+    advertisingFactor: 0.07,
+    requiredMaterials: { Plants: 1, Energy: 0.5, Water: 0.5 },
+    producedMaterials: ["Chemicals"],
   },
   [IndustryType.Computers]: {
     startingCost: 500e9,
     description: "Develop and manufacture new computer hardware and networking infrastructures.",
-    product: { name: "Product", verb: "Create", desc: "Design and manufacture a new computer hardware product!" },
-    ProductRatingWeights: {
-      Quality: 0.15,
-      Performance: 0.25,
-      Durability: 0.25,
-      Reliability: 0.2,
-      Aesthetics: 0.05,
-      Features: 0.1,
+    product: {
+      name: "Product",
+      verb: "Create",
+      desc: "Design and manufacture a new computer hardware product!",
+      ratingWeights: {
+        quality: 0.15,
+        performance: 0.25,
+        durability: 0.25,
+        reliability: 0.2,
+        aesthetics: 0.05,
+        features: 0.1,
+      },
     },
     recommendStarting: false,
-    reFac: 0.2,
-    sciFac: 0.62,
-    robFac: 0.36,
-    aiFac: 0.19,
-    advFac: 0.17,
-    reqMats: { Metal: 2, Energy: 1 },
-    prodMats: ["Hardware"],
+    realEstateFactor: 0.2,
+    scienceFactor: 0.62,
+    robotFactor: 0.36,
+    aiCoreFactor: 0.19,
+    advertisingFactor: 0.17,
+    requiredMaterials: { Metal: 2, Energy: 1 },
+    producedMaterials: ["Hardware"],
   },
   [IndustryType.Energy]: {
     startingCost: 225e9,
     description: "Engage in the production and distribution of energy.",
     recommendStarting: false,
-    reFac: 0.65,
-    sciFac: 0.7,
-    robFac: 0.05,
-    aiFac: 0.3,
-    advFac: 0.08,
-    reqMats: { Hardware: 0.1, Metal: 0.2 },
-    prodMats: ["Energy"],
+    realEstateFactor: 0.65,
+    scienceFactor: 0.7,
+    robotFactor: 0.05,
+    aiCoreFactor: 0.3,
+    advertisingFactor: 0.08,
+    requiredMaterials: { Hardware: 0.1, Metal: 0.2 },
+    producedMaterials: ["Energy"],
   },
   [IndustryType.Fishing]: {
     startingCost: 80e9,
     description: "Produce food through the breeding and processing of fish and fish products.",
     recommendStarting: false,
-    reFac: 0.15,
-    sciFac: 0.35,
-    hwFac: 0.35,
-    robFac: 0.5,
-    aiFac: 0.2,
-    advFac: 0.08,
-    reqMats: { Energy: 0.5 },
-    prodMats: ["Food"],
+    realEstateFactor: 0.15,
+    scienceFactor: 0.35,
+    hardwareFactor: 0.35,
+    robotFactor: 0.5,
+    aiCoreFactor: 0.2,
+    advertisingFactor: 0.08,
+    requiredMaterials: { Energy: 0.5 },
+    producedMaterials: ["Food"],
   },
   [IndustryType.Food]: {
     startingCost: 10e9,
     description: "Create your own restaurants all around the world.",
-    product: { name: "Restaurant", verb: "Build", desc: "Build and manage a new restaurant!" },
-    ProductRatingWeights: {
-      Quality: 0.7,
-      Durability: 0.1,
-      Aesthetics: 0.2,
+    product: {
+      name: "Restaurant",
+      verb: "Build",
+      desc: "Build and manage a new restaurant!",
+      ratingWeights: {
+        quality: 0.7,
+        durability: 0.1,
+        aesthetics: 0.2,
+      },
     },
     recommendStarting: true,
-    sciFac: 0.12,
-    hwFac: 0.15,
-    robFac: 0.3,
-    aiFac: 0.25,
-    advFac: 0.25,
-    reFac: 0.05,
-    reqMats: { Food: 0.5, Water: 0.5, Energy: 0.2 },
+    scienceFactor: 0.12,
+    hardwareFactor: 0.15,
+    robotFactor: 0.3,
+    aiCoreFactor: 0.25,
+    advertisingFactor: 0.25,
+    realEstateFactor: 0.05,
+    requiredMaterials: { Food: 0.5, Water: 0.5, Energy: 0.2 },
   },
   [IndustryType.Healthcare]: {
     startingCost: 750e9,
     description: "Create and manage hospitals.",
-    product: { name: "Hospital", verb: "Build", desc: "Build and manage a new hospital!" },
-    ProductRatingWeights: {
-      Quality: 0.4,
-      Performance: 0.1,
-      Durability: 0.1,
-      Reliability: 0.3,
-      Features: 0.1,
+    product: {
+      name: "Hospital",
+      verb: "Build",
+      desc: "Build and manage a new hospital!",
+      ratingWeights: {
+        quality: 0.4,
+        performance: 0.1,
+        durability: 0.1,
+        reliability: 0.3,
+        features: 0.1,
+      },
     },
     recommendStarting: false,
-    reFac: 0.1,
-    sciFac: 0.75,
-    advFac: 0.11,
-    hwFac: 0.1,
-    robFac: 0.1,
-    aiFac: 0.1,
-    reqMats: { Robots: 10, AICores: 5, Energy: 5, Water: 5 },
+    realEstateFactor: 0.1,
+    scienceFactor: 0.75,
+    advertisingFactor: 0.11,
+    hardwareFactor: 0.1,
+    robotFactor: 0.1,
+    aiCoreFactor: 0.1,
+    requiredMaterials: { Robots: 10, "AI Cores": 5, Energy: 5, Water: 5 },
   },
   [IndustryType.Mining]: {
     startingCost: 300e9,
     description: "Extract and process metals from the earth.",
     recommendStarting: false,
-    reFac: 0.3,
-    sciFac: 0.26,
-    hwFac: 0.4,
-    robFac: 0.45,
-    aiFac: 0.45,
-    advFac: 0.06,
-    reqMats: { Energy: 0.8 },
-    prodMats: ["Metal"],
+    realEstateFactor: 0.3,
+    scienceFactor: 0.26,
+    hardwareFactor: 0.4,
+    robotFactor: 0.45,
+    aiCoreFactor: 0.45,
+    advertisingFactor: 0.06,
+    requiredMaterials: { Energy: 0.8 },
+    producedMaterials: ["Metal"],
   },
   [IndustryType.Pharmaceutical]: {
     startingCost: 200e9,
     description: "Discover, develop, and create new pharmaceutical drugs.",
-    product: { name: "Drug", verb: "Develop", desc: "Design and develop a new pharmaceutical drug!" },
-    ProductRatingWeights: {
-      Quality: 0.2,
-      Performance: 0.2,
-      Durability: 0.1,
-      Reliability: 0.3,
-      Features: 0.2,
+    product: {
+      name: "Drug",
+      verb: "Develop",
+      desc: "Design and develop a new pharmaceutical drug!",
+      ratingWeights: {
+        quality: 0.2,
+        performance: 0.2,
+        durability: 0.1,
+        reliability: 0.3,
+        features: 0.2,
+      },
     },
     recommendStarting: false,
-    reFac: 0.05,
-    sciFac: 0.8,
-    hwFac: 0.15,
-    robFac: 0.25,
-    aiFac: 0.2,
-    advFac: 0.16,
-    reqMats: { Chemicals: 2, Energy: 1, Water: 0.5 },
-    prodMats: ["Drugs"],
+    realEstateFactor: 0.05,
+    scienceFactor: 0.8,
+    hardwareFactor: 0.15,
+    robotFactor: 0.25,
+    aiCoreFactor: 0.2,
+    advertisingFactor: 0.16,
+    requiredMaterials: { Chemicals: 2, Energy: 1, Water: 0.5 },
+    producedMaterials: ["Drugs"],
   },
   [IndustryType.RealEstate]: {
     startingCost: 600e9,
     description: "Develop and manage real estate properties.",
-    product: { name: "Property", verb: "Develop", desc: "Develop a new piece of real estate property!" },
-    ProductRatingWeights: {
-      Quality: 0.2,
-      Durability: 0.25,
-      Reliability: 0.1,
-      Aesthetics: 0.35,
-      Features: 0.1,
+    product: {
+      name: "Property",
+      verb: "Develop",
+      desc: "Develop a new piece of real estate property!",
+      ratingWeights: {
+        quality: 0.2,
+        durability: 0.25,
+        reliability: 0.1,
+        aesthetics: 0.35,
+        features: 0.1,
+      },
     },
     recommendStarting: false,
-    robFac: 0.6,
-    aiFac: 0.6,
-    advFac: 0.25,
-    sciFac: 0.05,
-    hwFac: 0.05,
-    reqMats: { Metal: 5, Energy: 5, Water: 2, Hardware: 4 },
-    prodMats: ["Real Estate"],
+    robotFactor: 0.6,
+    aiCoreFactor: 0.6,
+    advertisingFactor: 0.25,
+    scienceFactor: 0.05,
+    hardwareFactor: 0.05,
+    requiredMaterials: { Metal: 5, Energy: 5, Water: 2, Hardware: 4 },
+    producedMaterials: ["Real Estate"],
   },
   [IndustryType.Robotics]: {
     startingCost: 1e12,
     description: "Develop and create robots.",
-    product: { name: "Robot", verb: "Design", desc: "Design and create a new robot or robotic system!" },
-    ProductRatingWeights: {
-      Quality: 0.1,
-      Performance: 0.2,
-      Durability: 0.2,
-      Reliability: 0.2,
-      Aesthetics: 0.1,
-      Features: 0.2,
+    product: {
+      name: "Robot",
+      verb: "Design",
+      desc: "Design and create a new robot or robotic system!",
+      ratingWeights: {
+        quality: 0.1,
+        performance: 0.2,
+        durability: 0.2,
+        reliability: 0.2,
+        aesthetics: 0.1,
+        features: 0.2,
+      },
     },
     recommendStarting: false,
-    reFac: 0.32,
-    sciFac: 0.65,
-    aiFac: 0.36,
-    advFac: 0.18,
-    hwFac: 0.19,
-    reqMats: { Hardware: 5, Energy: 3 },
-    prodMats: ["Robots"],
+    realEstateFactor: 0.32,
+    scienceFactor: 0.65,
+    aiCoreFactor: 0.36,
+    advertisingFactor: 0.18,
+    hardwareFactor: 0.19,
+    requiredMaterials: { Hardware: 5, Energy: 3 },
+    producedMaterials: ["Robots"],
   },
   [IndustryType.Software]: {
     startingCost: 25e9,
     description: "Develop computer software and create AI Cores.",
-    product: { name: "Software", verb: "Develop", desc: "Develop a new piece of software!" },
-    ProductRatingWeights: {
-      Quality: 0.2,
-      Performance: 0.2,
-      Reliability: 0.2,
-      Durability: 0.2,
-      Features: 0.2,
+    product: {
+      name: "Software",
+      verb: "Develop",
+      desc: "Develop a new piece of software!",
+      ratingWeights: {
+        quality: 0.2,
+        performance: 0.2,
+        reliability: 0.2,
+        durability: 0.2,
+        features: 0.2,
+      },
     },
     recommendStarting: false,
-    sciFac: 0.62,
-    advFac: 0.16,
-    hwFac: 0.25,
-    reFac: 0.15,
-    aiFac: 0.18,
-    robFac: 0.05,
-    reqMats: { Hardware: 0.5, Energy: 0.5 },
-    prodMats: ["AI Cores"],
+    scienceFactor: 0.62,
+    advertisingFactor: 0.16,
+    hardwareFactor: 0.25,
+    realEstateFactor: 0.15,
+    aiCoreFactor: 0.18,
+    robotFactor: 0.05,
+    requiredMaterials: { Hardware: 0.5, Energy: 0.5 },
+    producedMaterials: ["AI Cores"],
   },
   [IndustryType.Tobacco]: {
     startingCost: 20e9,
     description: "Create and distribute tobacco and tobacco-related products.",
-    product: { name: "Product", verb: "Create", desc: "Create a new tobacco product!" },
-    ProductRatingWeights: {
-      Quality: 0.7,
-      Durability: 0.1,
-      Aesthetics: 0.2,
+    product: {
+      name: "Product",
+      verb: "Create",
+      desc: "Create a new tobacco product!",
+      ratingWeights: {
+        quality: 0.7,
+        durability: 0.1,
+        aesthetics: 0.2,
+      },
     },
     recommendStarting: true,
-    reFac: 0.15,
-    sciFac: 0.75,
-    hwFac: 0.15,
-    robFac: 0.2,
-    aiFac: 0.15,
-    advFac: 0.2,
-    reqMats: { Plants: 1, Water: 0.2 },
+    realEstateFactor: 0.15,
+    scienceFactor: 0.75,
+    hardwareFactor: 0.15,
+    robotFactor: 0.2,
+    aiCoreFactor: 0.15,
+    advertisingFactor: 0.2,
+    requiredMaterials: { Plants: 1, Water: 0.2 },
   },
   [IndustryType.Utilities]: {
     startingCost: 150e9,
     description: "Distribute water and provide wastewater services.",
     recommendStarting: false,
-    reFac: 0.5,
-    sciFac: 0.6,
-    robFac: 0.4,
-    aiFac: 0.4,
-    advFac: 0.08,
-    reqMats: { Hardware: 0.1, Metal: 0.1 },
-    prodMats: ["Water"],
+    realEstateFactor: 0.5,
+    scienceFactor: 0.6,
+    robotFactor: 0.4,
+    aiCoreFactor: 0.4,
+    advertisingFactor: 0.08,
+    requiredMaterials: { Hardware: 0.1, Metal: 0.1 },
+    producedMaterials: ["Water"],
   },
 };
 
diff --git a/src/Corporation/Material.ts b/src/Corporation/Material.ts
index b2042a8b3..15228126e 100644
--- a/src/Corporation/Material.ts
+++ b/src/Corporation/Material.ts
@@ -1,13 +1,16 @@
+import { CorpMaterialName } from "@nsdefs";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
+import { materialNames } from "./data/Constants";
 import { Export } from "./Export";
+import { MaterialInfo } from "./MaterialInfo";
 
 interface IConstructorParams {
-  name?: string;
+  name: CorpMaterialName;
 }
 
 export class Material {
   // Name of material
-  name = "InitName";
+  name: CorpMaterialName;
 
   // Amount of material owned
   qty = 0;
@@ -65,127 +68,21 @@ export class Material {
   // Determines the maximum amount of this material that can be sold in one market cycle
   maxsll = 0;
 
-  constructor(params: IConstructorParams = {}) {
-    if (params.name) {
-      this.name = params.name;
-    }
-    this.init();
+  constructor(params?: IConstructorParams) {
+    this.name = params?.name ?? materialNames[0];
+    this.dmd = MaterialInfo[this.name].demandBase;
+    this.dmdR = MaterialInfo[this.name].demandRange;
+    this.cmp = MaterialInfo[this.name].competitionBase;
+    this.cmpR = MaterialInfo[this.name].competitionRange;
+    this.bCost = MaterialInfo[this.name].baseCost;
+    this.mv = MaterialInfo[this.name].maxVolatility;
+    this.mku = MaterialInfo[this.name].baseMarkup;
   }
 
   getMarkupLimit(): number {
     return this.qlt / this.mku;
   }
 
-  init(): void {
-    switch (this.name) {
-      case "Water":
-        this.dmd = 75;
-        this.dmdR = [65, 85];
-        this.cmp = 50;
-        this.cmpR = [40, 60];
-        this.bCost = 1500;
-        this.mv = 0.2;
-        this.mku = 6;
-        break;
-      case "Energy":
-        this.dmd = 90;
-        this.dmdR = [80, 99];
-        this.cmp = 80;
-        this.cmpR = [65, 95];
-        this.bCost = 2000;
-        this.mv = 0.2;
-        this.mku = 6;
-        break;
-      case "Food":
-        this.dmd = 80;
-        this.dmdR = [70, 90];
-        this.cmp = 60;
-        this.cmpR = [35, 85];
-        this.bCost = 5000;
-        this.mv = 1;
-        this.mku = 3;
-        break;
-      case "Plants":
-        this.dmd = 70;
-        this.dmdR = [20, 90];
-        this.cmp = 50;
-        this.cmpR = [30, 70];
-        this.bCost = 3000;
-        this.mv = 0.6;
-        this.mku = 3.75;
-        break;
-      case "Metal":
-        this.dmd = 80;
-        this.dmdR = [75, 85];
-        this.cmp = 70;
-        this.cmpR = [60, 80];
-        this.bCost = 2650;
-        this.mv = 1;
-        this.mku = 6;
-        break;
-      case "Hardware":
-        this.dmd = 85;
-        this.dmdR = [80, 90];
-        this.cmp = 80;
-        this.cmpR = [65, 95];
-        this.bCost = 8e3;
-        this.mv = 0.5; //Less mv bc its processed twice
-        this.mku = 1;
-        break;
-      case "Chemicals":
-        this.dmd = 55;
-        this.dmdR = [40, 70];
-        this.cmp = 60;
-        this.cmpR = [40, 80];
-        this.bCost = 9e3;
-        this.mv = 1.2;
-        this.mku = 2;
-        break;
-      case "Real Estate":
-        this.dmd = 50;
-        this.dmdR = [5, 99];
-        this.cmp = 50;
-        this.cmpR = [25, 75];
-        this.bCost = 80e3;
-        this.mv = 1.5; //Less mv bc its processed twice
-        this.mku = 1.5;
-        break;
-      case "Drugs":
-        this.dmd = 60;
-        this.dmdR = [45, 75];
-        this.cmp = 70;
-        this.cmpR = [40, 99];
-        this.bCost = 40e3;
-        this.mv = 1.6;
-        this.mku = 1;
-        break;
-      case "Robots":
-        this.dmd = 90;
-        this.dmdR = [80, 99];
-        this.cmp = 90;
-        this.cmpR = [80, 99];
-        this.bCost = 75e3;
-        this.mv = 0.5; //Less mv bc its processed twice
-        this.mku = 1;
-        break;
-      case "AI Cores":
-        this.dmd = 90;
-        this.dmdR = [80, 99];
-        this.cmp = 90;
-        this.cmpR = [80, 99];
-        this.bCost = 15e3;
-        this.mv = 0.8; //Less mv bc its processed twice
-        this.mku = 0.5;
-        break;
-      case "Scientific Research":
-      case "InitName":
-        break;
-      default:
-        console.error(`Invalid material type in init(): ${this.name}`);
-        break;
-    }
-  }
-
   // Process change in demand, competition, and buy cost of this material
   processMarket(): void {
     // The price will change in accordance with demand and competition.
@@ -235,6 +132,8 @@ export class Material {
 
   // Initializes a Material object from a JSON save state.
   static fromJSON(value: IReviverValue): Material {
+    // Gracefully load save files from when Scientific Research was considered a Material (pre 2.2).
+    if (value.data.name === "Scientific Research") return value.data.qty;
     return Generic_fromJSON(Material, value.data);
   }
 }
diff --git a/src/Corporation/MaterialInfo.ts b/src/Corporation/MaterialInfo.ts
index b5c0633cb..b67b802e9 100644
--- a/src/Corporation/MaterialInfo.ts
+++ b/src/Corporation/MaterialInfo.ts
@@ -1,14 +1,126 @@
+import { CorpMaterialConstantData, CorpMaterialName } from "@nsdefs";
+
 // Map of material (by name) to their sizes (how much space it takes in warehouse)
-export const MaterialInfo: Record<string, [string, number, boolean]> = {
-  Water: ["Water", 0.05, false],
-  Energy: ["Energy", 0.01, false],
-  Food: ["Food", 0.03, false],
-  Plants: ["Plants", 0.05, false],
-  Metal: ["Metal", 0.1, false],
-  Hardware: ["Hardware", 0.06, true],
-  Chemicals: ["Chemicals", 0.05, false],
-  Drugs: ["Drugs", 0.02, false],
-  Robots: ["Robots", 0.5, true],
-  AICores: ["AI Cores", 0.1, true],
-  RealEstate: ["Real Estate", 0.005, true],
+export const MaterialInfo: Record<CorpMaterialName, CorpMaterialConstantData> = {
+  Water: {
+    name: "Water",
+    size: 0.05,
+    demandBase: 75,
+    demandRange: [65, 85],
+    competitionBase: 50,
+    competitionRange: [40, 60],
+    baseCost: 1500,
+    maxVolatility: 0.2,
+    baseMarkup: 6,
+  },
+  Energy: {
+    name: "Energy",
+    size: 0.01,
+    demandBase: 90,
+    demandRange: [80, 99],
+    competitionBase: 80,
+    competitionRange: [65, 95],
+    baseCost: 2000,
+    maxVolatility: 0.2,
+    baseMarkup: 6,
+  },
+  Food: {
+    name: "Food",
+    size: 0.03,
+    demandBase: 80,
+    demandRange: [70, 90],
+    competitionBase: 60,
+    competitionRange: [35, 85],
+    baseCost: 5000,
+    maxVolatility: 1,
+    baseMarkup: 3,
+  },
+  Plants: {
+    name: "Plants",
+    size: 0.05,
+    demandBase: 70,
+    demandRange: [20, 90],
+    competitionBase: 50,
+    competitionRange: [30, 70],
+    baseCost: 3000,
+    maxVolatility: 0.6,
+    baseMarkup: 3.75,
+  },
+  Metal: {
+    name: "Metal",
+    size: 0.1,
+    demandBase: 80,
+    demandRange: [75, 85],
+    competitionBase: 70,
+    competitionRange: [60, 80],
+    baseCost: 2650,
+    maxVolatility: 1,
+    baseMarkup: 6,
+  },
+  Hardware: {
+    name: "Hardware",
+    size: 0.06,
+    demandBase: 85,
+    demandRange: [80, 90],
+    competitionBase: 80,
+    competitionRange: [65, 95],
+    baseCost: 8e3,
+    maxVolatility: 0.5,
+    baseMarkup: 1,
+  },
+  Chemicals: {
+    name: "Chemicals",
+    size: 0.05,
+    demandBase: 55,
+    demandRange: [40, 70],
+    competitionBase: 60,
+    competitionRange: [40, 80],
+    baseCost: 9e3,
+    maxVolatility: 1.2,
+    baseMarkup: 2,
+  },
+  Drugs: {
+    name: "Drugs",
+    size: 0.02,
+    demandBase: 60,
+    demandRange: [45, 75],
+    competitionBase: 70,
+    competitionRange: [40, 99],
+    baseCost: 40e3,
+    maxVolatility: 1.6,
+    baseMarkup: 1,
+  },
+  Robots: {
+    name: "Robots",
+    size: 0.5,
+    demandBase: 90,
+    demandRange: [80, 99],
+    competitionBase: 90,
+    competitionRange: [80, 99],
+    baseCost: 75e3,
+    maxVolatility: 0.5,
+    baseMarkup: 1,
+  },
+  "AI Cores": {
+    name: "AI Cores",
+    size: 0.1,
+    demandBase: 90,
+    demandRange: [80, 99],
+    competitionBase: 90,
+    competitionRange: [80, 99],
+    baseCost: 15e3,
+    maxVolatility: 0.8,
+    baseMarkup: 0.5,
+  },
+  "Real Estate": {
+    name: "Real Estate",
+    size: 0.005,
+    demandBase: 50,
+    demandRange: [5, 99],
+    competitionBase: 50,
+    competitionRange: [25, 75],
+    baseCost: 80e3,
+    maxVolatility: 1.5,
+    baseMarkup: 1.5,
+  },
 };
diff --git a/src/Corporation/OfficeSpace.ts b/src/Corporation/OfficeSpace.ts
index 2d0007865..7d20d0bba 100644
--- a/src/Corporation/OfficeSpace.ts
+++ b/src/Corporation/OfficeSpace.ts
@@ -1,22 +1,23 @@
-import { EmployeePositions } from "./EmployeePositions";
-import { CorporationConstants } from "./data/Constants";
+import { EmployeePositions } from "./data/Enums";
+import * as corpConstants from "./data/Constants";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
 import { Industry } from "./Industry";
 import { Corporation } from "./Corporation";
 import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { CityName } from "../Enums";
 
 interface IParams {
-  loc?: string;
+  loc?: CityName;
   size?: number;
 }
 
 export class OfficeSpace {
-  loc: string;
+  loc: CityName;
   size: number;
 
-  minEne = 0;
-  minHap = 0;
-  minMor = 0;
+  minEne = 5;
+  minHap = 5;
+  minMor = 5;
 
   maxEne = 100;
   maxHap = 100;
@@ -70,7 +71,7 @@ export class OfficeSpace {
   };
 
   constructor(params: IParams = {}) {
-    this.loc = params.loc ? params.loc : "";
+    this.loc = params.loc ? params.loc : CityName.Sector12;
     this.size = params.size ? params.size : 1;
   }
 
@@ -161,7 +162,7 @@ export class OfficeSpace {
       this.totalSalary = 0;
     } else {
       this.totalSalary =
-        CorporationConstants.EmployeeSalaryMultiplier *
+        corpConstants.employeeSalaryMultiplier *
         marketCycles *
         this.totalEmployees *
         (this.avgInt + this.avgCha + this.totalExp / this.totalEmployees + this.avgCre + this.avgEff);
@@ -247,7 +248,7 @@ export class OfficeSpace {
   }
 
   getCoffeeCost(): number {
-    return 500e3 * this.totalEmployees;
+    return corpConstants.coffeeCostPerEmployee * this.totalEmployees;
   }
 
   setCoffee(): boolean {
diff --git a/src/Corporation/Product.ts b/src/Corporation/Product.ts
index 4d3ea2df2..85de60b76 100644
--- a/src/Corporation/Product.ts
+++ b/src/Corporation/Product.ts
@@ -1,4 +1,4 @@
-import { EmployeePositions } from "./EmployeePositions";
+import { EmployeePositions } from "./data/Enums";
 import { MaterialInfo } from "./MaterialInfo";
 import { Industry } from "./Industry";
 import { IndustriesData } from "./IndustryData";
@@ -7,7 +7,9 @@ import { createCityMap } from "../Locations/createCityMap";
 
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
 import { getRandomInt } from "../utils/helpers/getRandomInt";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
+import { materialNames } from "./data/Constants";
+import { CorpMaterialName } from "@nsdefs";
 
 interface IConstructorParams {
   name?: string;
@@ -25,7 +27,7 @@ interface IConstructorParams {
   features?: number;
   loc?: string;
   size?: number;
-  req?: Record<string, number>;
+  req?: Partial<Record<CorpMaterialName, number>>;
 }
 
 export class Product {
@@ -93,7 +95,7 @@ export class Product {
 
   // Material requirements. An object that maps the name of a material to how much it requires
   // to make 1 unit of the product.
-  reqMats: Record<string, number> = {};
+  reqMats: Partial<Record<CorpMaterialName, number>> = {};
 
   // Data to keep track of whether production/sale of this Product is
   // manually limited. These values are specific to a city
@@ -170,7 +172,7 @@ export class Product {
 
     const designMult = 1 + Math.pow(this.designCost, 0.1) / 100;
     const balanceMult = 1.2 * engrRatio + 0.9 * mgmtRatio + 1.3 * rndRatio + 1.5 * opsRatio + busRatio;
-    const sciMult = 1 + Math.pow(industry.sciResearch.qty, industry.sciFac) / 800;
+    const sciMult = 1 + Math.pow(industry.sciResearch, industry.sciFac) / 800;
     const totalMult = balanceMult * designMult * sciMult;
 
     this.qlt =
@@ -230,7 +232,7 @@ export class Product {
 
     //Calculate the product's required materials
     //For now, just set it to be the same as the requirements to make materials
-    for (const matName of Object.keys(industry.reqMats)) {
+    for (const matName of Object.keys(industry.reqMats) as CorpMaterialName[]) {
       if (industry.reqMats.hasOwnProperty(matName)) {
         const reqMat = industry.reqMats[matName];
         if (reqMat === undefined) continue;
@@ -241,23 +243,23 @@ export class Product {
     //Calculate the product's size
     //For now, just set it to be the same size as the requirements to make materials
     this.siz = 0;
-    for (const matName of Object.keys(industry.reqMats)) {
+    for (const matName of Object.values(materialNames)) {
       const reqMat = industry.reqMats[matName];
       if (reqMat === undefined) continue;
-      this.siz += MaterialInfo[matName][1] * reqMat;
+      this.siz += MaterialInfo[matName].size * reqMat;
     }
   }
 
   calculateRating(industry: Industry): void {
-    const weights = IndustriesData[industry.type].ProductRatingWeights;
+    const weights = IndustriesData[industry.type].product?.ratingWeights;
     if (!weights) return console.error(`Could not find product rating weights for: ${industry}`);
     this.rat = 0;
-    this.rat += weights.Quality ? this.qlt * weights.Quality : 0;
-    this.rat += weights.Performance ? this.per * weights.Performance : 0;
-    this.rat += weights.Durability ? this.dur * weights.Durability : 0;
-    this.rat += weights.Reliability ? this.rel * weights.Reliability : 0;
-    this.rat += weights.Aesthetics ? this.aes * weights.Aesthetics : 0;
-    this.rat += weights.Features ? this.fea * weights.Features : 0;
+    this.rat += weights.quality ? this.qlt * weights.quality : 0;
+    this.rat += weights.performance ? this.per * weights.performance : 0;
+    this.rat += weights.durability ? this.dur * weights.durability : 0;
+    this.rat += weights.reliability ? this.rel * weights.reliability : 0;
+    this.rat += weights.aesthetics ? this.aes * weights.aesthetics : 0;
+    this.rat += weights.features ? this.fea * weights.features : 0;
   }
 
   // Serialize the current object to a JSON save state.
@@ -267,6 +269,18 @@ export class Product {
 
   // Initializes a Product object from a JSON save state.
   static fromJSON(value: IReviverValue): Product {
+    // TODO: Remove all corp graceful loading measures during major corp rebalance / rework.
+    //       For that version, Player.corporation will just get reset to null when loading from older version.
+
+    // Gracefully load saves from when RealEstate and AICores didn't have spaces
+    if (value.data.reqMats?.RealEstate) {
+      value.data.reqMats["Real Estate"] = value.data.reqMats.RealEstate;
+      delete value.data.reqMats.RealEstate;
+    }
+    if (value.data.reqMats?.AICores) {
+      value.data.reqMats["AI Cores"] = value.data.reqMats.AICores;
+      delete value.data.reqMats.AICores;
+    }
     return Generic_fromJSON(Product, value.data);
   }
 }
diff --git a/src/Corporation/Research.ts b/src/Corporation/Research.ts
index 85432166c..3e6faeff3 100644
--- a/src/Corporation/Research.ts
+++ b/src/Corporation/Research.ts
@@ -1,5 +1,8 @@
+import { CorpResearchName } from "@nsdefs";
+import { researchNames } from "./data/Constants";
+
 export interface IConstructorParams {
-  name: string;
+  name: CorpResearchName;
   cost: number;
   desc: string;
   advertisingMult?: number;
@@ -16,7 +19,7 @@ export interface IConstructorParams {
 
 export class Research {
   // Name of research. This will be used to identify researches in the Research Tree
-  name = "";
+  name: CorpResearchName;
 
   // How much scientific research it costs to unlock this
   cost = 0;
@@ -36,7 +39,7 @@ export class Research {
   sciResearchMult = 1;
   storageMult = 1;
 
-  constructor(p: IConstructorParams = { name: "", cost: 0, desc: "" }) {
+  constructor(p: IConstructorParams = { name: researchNames[0], cost: 0, desc: "" }) {
     this.name = p.name;
     this.cost = p.cost;
     this.desc = p.desc;
diff --git a/src/Corporation/ResearchTree.ts b/src/Corporation/ResearchTree.ts
index f0d88a706..b915b738d 100644
--- a/src/Corporation/ResearchTree.ts
+++ b/src/Corporation/ResearchTree.ts
@@ -3,13 +3,15 @@
 // Each Node in the Research Trees only holds the name(s) of Research,
 // not an actual Research object. The name can be used to obtain a reference
 // to the corresponding Research object using the ResearchMap
+import { CorpResearchName } from "@nsdefs";
+import { researchNames } from "./data/Constants";
 import { Research } from "./Research";
 import { ResearchMap } from "./ResearchMap";
 
 interface IConstructorParams {
   children?: Node[];
   cost: number;
-  text: string;
+  text: CorpResearchName;
   parent?: Node | null;
 }
 
@@ -32,9 +34,9 @@ export class Node {
   parent: Node | null = null;
 
   // Name of the Research held in this Node
-  text = "";
+  text: CorpResearchName;
 
-  constructor(p: IConstructorParams = { cost: 0, text: "" }) {
+  constructor(p: IConstructorParams = { cost: 0, text: researchNames[0] }) {
     if (ResearchMap[p.text] == null) {
       throw new Error(`Invalid Research name used when constructing ResearchTree Node: ${p.text}`);
     }
@@ -90,8 +92,8 @@ export class ResearchTree {
   root: Node | null = null;
 
   // Gets an array with the 'text' values of ALL Nodes in the Research Tree
-  getAllNodes(): string[] {
-    const res: string[] = [];
+  getAllNodes(): CorpResearchName[] {
+    const res: CorpResearchName[] = [];
     const queue: Node[] = [];
 
     if (this.root == null) {
@@ -211,7 +213,7 @@ export class ResearchTree {
 
   // Search for a Node with the given name ('text' property on the Node)
   // Returns 'null' if it cannot be found
-  findNode(name: string): Node | null {
+  findNode(name: CorpResearchName): Node | null {
     if (this.root == null) {
       return null;
     }
@@ -219,7 +221,7 @@ export class ResearchTree {
   }
 
   // Marks a Node as researched
-  research(name: string): void {
+  research(name: CorpResearchName): void {
     if (this.root == null) {
       return;
     }
diff --git a/src/Corporation/Warehouse.ts b/src/Corporation/Warehouse.ts
index 1b370aac7..6ee6d8f25 100644
--- a/src/Corporation/Warehouse.ts
+++ b/src/Corporation/Warehouse.ts
@@ -4,11 +4,14 @@ import { Industry } from "./Industry";
 import { MaterialInfo } from "./MaterialInfo";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
 import { exceptionAlert } from "../utils/helpers/exceptionAlert";
+import { CityName } from "../Enums";
+import { CorpMaterialName } from "@nsdefs";
+import { materialNames } from "./data/Constants";
 
 interface IConstructorParams {
   corp?: Corporation;
   industry?: Industry;
-  loc?: string;
+  loc?: CityName;
   size?: number;
 }
 
@@ -17,10 +20,10 @@ export class Warehouse {
   level = 1;
 
   // City that this Warehouse is in
-  loc: string;
+  loc: CityName;
 
   // Map of Materials held by this Warehouse
-  materials: Record<string, Material>;
+  materials: Record<CorpMaterialName, Material>;
 
   // Maximum amount warehouse can hold
   size: number;
@@ -32,7 +35,7 @@ export class Warehouse {
   smartSupplyEnabled = false;
 
   // Decide if smart supply should use the materials already in the warehouse when deciding on the amount to buy.
-  smartSupplyUseLeftovers: { [key: string]: boolean | undefined } = {};
+  smartSupplyUseLeftovers: Record<CorpMaterialName, boolean>;
 
   // Stores the amount of product to be produced. Used for Smart Supply unlock.
   // The production tracked by smart supply is always based on the previous cycle,
@@ -40,36 +43,15 @@ export class Warehouse {
   smartSupplyStore = 0;
 
   constructor(params: IConstructorParams = {}) {
-    this.loc = params.loc ? params.loc : "";
+    this.loc = params.loc ? params.loc : CityName.Sector12;
     this.size = params.size ? params.size : 0;
 
-    this.materials = {
-      Water: new Material({ name: "Water" }),
-      Energy: new Material({ name: "Energy" }),
-      Food: new Material({ name: "Food" }),
-      Plants: new Material({ name: "Plants" }),
-      Metal: new Material({ name: "Metal" }),
-      Hardware: new Material({ name: "Hardware" }),
-      Chemicals: new Material({ name: "Chemicals" }),
-      Drugs: new Material({ name: "Drugs" }),
-      Robots: new Material({ name: "Robots" }),
-      AICores: new Material({ name: "AI Cores" }),
-      RealEstate: new Material({ name: "Real Estate" }),
-    };
-
-    this.smartSupplyUseLeftovers = {
-      Water: true,
-      Energy: true,
-      Food: true,
-      Plants: true,
-      Metal: true,
-      Hardware: true,
-      Chemicals: true,
-      Drugs: true,
-      Robots: true,
-      AICores: true,
-      RealEstate: true,
-    };
+    this.materials = {} as Record<CorpMaterialName, Material>;
+    this.smartSupplyUseLeftovers = {} as Record<CorpMaterialName, boolean>;
+    for (const matName of materialNames) {
+      this.materials[matName] = new Material({ name: matName });
+      this.smartSupplyUseLeftovers[matName] = true;
+    }
 
     if (params.corp && params.industry) {
       this.updateSize(params.corp, params.industry);
@@ -84,11 +66,9 @@ export class Warehouse {
   // Re-calculate how much space is being used by this Warehouse
   updateMaterialSizeUsed(): void {
     this.sizeUsed = 0;
-    for (const matName of Object.keys(this.materials)) {
+    for (const matName of Object.values(materialNames)) {
       const mat = this.materials[matName];
-      if (MaterialInfo.hasOwnProperty(matName)) {
-        this.sizeUsed += mat.qty * MaterialInfo[matName][1];
-      }
+      this.sizeUsed += mat.qty * MaterialInfo[matName].size;
     }
     if (this.sizeUsed > this.size) {
       console.warn("Warehouse size used greater than capacity, something went wrong");
@@ -110,6 +90,19 @@ export class Warehouse {
 
   // Initializes a Warehouse object from a JSON save state.
   static fromJSON(value: IReviverValue): Warehouse {
+    //Gracefully load saves where AICores and RealEstate material names sometimes did not use spaces
+    if (value.data?.materials?.AICores) {
+      value.data.materials["AI Cores"] = value.data.materials.AICores;
+      value.data.smartSupplyUseLeftovers["AI Cores"] = value.data.smartSupplyUseLeftovers.AICores;
+      delete value.data.materials.AICores;
+      delete value.data.smartSupplyUseLeftovers.AICores;
+    }
+    if (value.data?.materials?.RealEstate) {
+      value.data.materials["Real Estate"] = value.data.materials.RealEstate;
+      value.data.smartSupplyUseLeftovers["Real Estate"] = value.data.smartSupplyUseLeftovers.RealEstate;
+      delete value.data.materials.RealEstate;
+      delete value.data.smartSupplyUseLeftovers.RealEstate;
+    }
     return Generic_fromJSON(Warehouse, value.data);
   }
 }
diff --git a/src/Corporation/data/Constants.ts b/src/Corporation/data/Constants.ts
index fd2eaa37d..6d2cd931b 100644
--- a/src/Corporation/data/Constants.ts
+++ b/src/Corporation/data/Constants.ts
@@ -1,47 +1,28 @@
-import { CityName } from "./../../Locations/data/CityNames";
-const CyclesPerMarketCycle = 50;
-const AllCorporationStates = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"];
-export const CorporationConstants = {
-  INITIALSHARES: 1e9, //Total number of shares you have at your company
-  SHARESPERPRICEUPDATE: 1e6, //When selling large number of shares, price is dynamically updated for every batch of this amount
-  IssueNewSharesCooldown: 216e3, // 12 Hour in terms of game cycles
-  SellSharesCooldown: 18e3, // 1 Hour in terms of game cycles
+import {
+  CorpEmployeePosition,
+  CorpIndustryName,
+  CorpMaterialName,
+  CorpResearchName,
+  CorpStateName,
+  CorpUnlockName,
+  CorpUpgradeName,
+} from "@nsdefs";
+import { CONSTANTS } from "../../Constants";
+import { IndustryType, EmployeePositions } from "./Enums";
 
-  CyclesPerMarketCycle: CyclesPerMarketCycle,
-  CyclesPerIndustryStateCycle: CyclesPerMarketCycle / AllCorporationStates.length,
-  SecsPerMarketCycle: CyclesPerMarketCycle / 5,
+// For typed strings, we need runtime objects to do API typechecking against.
 
-  Cities: [
-    CityName.Aevum,
-    CityName.Chongqing,
-    CityName.Sector12,
-    CityName.NewTokyo,
-    CityName.Ishima,
-    CityName.Volhaven,
-  ],
+// This structure + import * as corpConstants allows easier type definitions for individual properties.
 
-  WarehouseInitialCost: 5e9, //Initial purchase cost of warehouse
-  WarehouseInitialSize: 100,
-  WarehouseUpgradeBaseCost: 1e9,
-
-  OfficeInitialCost: 4e9,
-  OfficeInitialSize: 3,
-  OfficeUpgradeBaseCost: 1e9,
-
-  BribeThreshold: 100e12, //Money needed to be able to bribe for faction rep
-  BribeToRepRatio: 1e9, //Bribe Value divided by this = rep gain
-
-  ProductProductionCostRatio: 5, //Ratio of material cost of a product to its production cost
-
-  DividendMaxRate: 1,
-
-  EmployeeSalaryMultiplier: 3, // Employee stats multiplied by this to determine initial salary
-  CyclesPerEmployeeRaise: 400, // All employees get a raise every X market cycles
-  EmployeeRaiseAmount: 50, // Employee salary increases by this (additive)
-
-  BaseMaxProducts: 3, // Initial value for maximum number of products allowed
-  AllCorporationStates: AllCorporationStates,
-  AllMaterials: [
+/** Names of all corporation game states */
+export const stateNames: CorpStateName[] = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"],
+  // TODO: remove IndustryType and EmployeePositions enums and just use the typed strings.
+  /** Names of all corporation employee positions */
+  employeePositions: CorpEmployeePosition[] = Object.values(EmployeePositions),
+  /** Names of all industries. */
+  industryNames: CorpIndustryName[] = Object.values(IndustryType),
+  /** Names of all materials */
+  materialNames: CorpMaterialName[] = [
     "Water",
     "Energy",
     "Food",
@@ -54,7 +35,8 @@ export const CorporationConstants = {
     "AI Cores",
     "Real Estate",
   ],
-  AllUnlocks: [
+  /** Names of all one-time corporation-wide unlocks */
+  unlockNames: CorpUnlockName[] = [
     "Export",
     "Smart Supply",
     "Market Research - Demand",
@@ -65,7 +47,7 @@ export const CorporationConstants = {
     "Warehouse API",
     "Office API",
   ],
-  AllUpgrades: [
+  upgradeNames: CorpUpgradeName[] = [
     "Smart Factories",
     "Smart Storage",
     "DreamSense",
@@ -77,7 +59,8 @@ export const CorporationConstants = {
     "ABC SalesBots",
     "Project Insight",
   ],
-  BaseResearch: [
+  /** Names of all reasearches common to all industries */
+  researchNamesBase: CorpResearchName[] = [
     "Hi-Tech R&D Laboratory",
     "AutoBrew",
     "AutoPartyManager",
@@ -97,9 +80,42 @@ export const CorporationConstants = {
     "Self-Correcting Assemblers",
     "Sti.mu",
   ],
-  ProdResearch: ["uPgrade: Capacity.I", "uPgrade: Capacity.II", "uPgrade: Dashboard", "uPgrade: Fulcrum"],
-  FundingRoundShares: [0.1, 0.35, 0.25, 0.2],
-  FundingRoundMultiplier: [4, 3, 3, 2.5],
-
-  ValuationLength: 5,
-};
+  /** Names of all researches only available to product industries */
+  researchNamesProductOnly: CorpResearchName[] = [
+    "uPgrade: Capacity.I",
+    "uPgrade: Capacity.II",
+    "uPgrade: Dashboard",
+    "uPgrade: Fulcrum",
+  ],
+  /** Names of all researches */
+  researchNames: CorpResearchName[] = [...researchNamesBase, ...researchNamesProductOnly],
+  initialShares = 1e9,
+  /** When selling large number of shares, price is dynamically updated for every batch of this amount */
+  sharesPerPriceUpdate = 1e6,
+  /** Cooldown for issue new shares cooldown in game cycles. 12 hours. */
+  issueNewSharesCooldown = 216e3,
+  /** Cooldown for selling shares in game cycles. 1 hour. */
+  sellSharesCooldown = 18e3,
+  coffeeCostPerEmployee = 500e3,
+  gameCyclesPerMarketCycle = 50,
+  gameCyclesPerCorpStateCycle = gameCyclesPerMarketCycle / stateNames.length,
+  secondsPerMarketCycle = (gameCyclesPerMarketCycle * CONSTANTS.MilliPerCycle) / 1000,
+  warehouseInitialCost = 5e9,
+  warehouseInitialSize = 100,
+  warehouseSizeUpgradeCostBase = 1e9,
+  officeInitialCost = 4e9,
+  officeInitialSize = 3,
+  officeSizeUpgradeCostBase = 1e9,
+  bribeThreshold = 100e12,
+  bribeAmountPerReputation = 1e9,
+  baseProductProfitMult = 5,
+  dividendMaxRate = 1,
+  /** Conversion factor for employee stats to initial salary */
+  employeeSalaryMultiplier = 3,
+  marketCyclesPerEmployeeRaise = 400,
+  employeeRaiseAmount = 50,
+  /** Max products for a division without upgrades */
+  maxProductsBase = 3,
+  fundingRoundShares = [0.1, 0.35, 0.25, 0.2],
+  fundingRoundMultiplier = [4, 3, 3, 2.5],
+  valuationLength = 5;
diff --git a/src/Corporation/data/Enums.ts b/src/Corporation/data/Enums.ts
new file mode 100644
index 000000000..9123fe51c
--- /dev/null
+++ b/src/Corporation/data/Enums.ts
@@ -0,0 +1,26 @@
+export enum IndustryType {
+  Energy = "Energy",
+  Utilities = "Water Utilities",
+  Agriculture = "Agriculture",
+  Fishing = "Fishing",
+  Mining = "Mining",
+  Food = "Food",
+  Tobacco = "Tobacco",
+  Chemical = "Chemical",
+  Pharmaceutical = "Pharmaceutical",
+  Computers = "Computer Hardware",
+  Robotics = "Robotics",
+  Software = "Software",
+  Healthcare = "Healthcare",
+  RealEstate = "Real Estate",
+}
+
+export enum EmployeePositions {
+  Operations = "Operations",
+  Engineer = "Engineer",
+  Business = "Business",
+  Management = "Management",
+  RandD = "Research & Development",
+  Training = "Training",
+  Unassigned = "Unassigned",
+}
diff --git a/src/Corporation/ui/CityTabs.tsx b/src/Corporation/ui/CityTabs.tsx
index a94d018fd..e72cd5ed6 100644
--- a/src/Corporation/ui/CityTabs.tsx
+++ b/src/Corporation/ui/CityTabs.tsx
@@ -7,7 +7,7 @@ import { ExpandNewCity } from "./ExpandNewCity";
 import { useDivision } from "./Context";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 
 interface IProps {
   city: CityName | "Expand";
diff --git a/src/Corporation/ui/CorporationRoot.tsx b/src/Corporation/ui/CorporationRoot.tsx
index 1538965cc..cffe84a5a 100644
--- a/src/Corporation/ui/CorporationRoot.tsx
+++ b/src/Corporation/ui/CorporationRoot.tsx
@@ -3,7 +3,7 @@
 // divisions, see an overview of your corporation, or create a new industry
 import React, { useState, useEffect } from "react";
 import { MainPanel } from "./MainPanel";
-import { IndustryType } from "../IndustryData";
+import { IndustryType } from "../data/Enums";
 import { ExpandIndustryTab } from "./ExpandIndustryTab";
 import { Player } from "@player";
 import { Context } from "./Context";
diff --git a/src/Corporation/ui/ExpandIndustryTab.tsx b/src/Corporation/ui/ExpandIndustryTab.tsx
index 279f55a9b..41c33e3fe 100644
--- a/src/Corporation/ui/ExpandIndustryTab.tsx
+++ b/src/Corporation/ui/ExpandIndustryTab.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { IndustryType, IndustryDescriptions, IndustriesData } from "../IndustryData";
+import { IndustryDescriptions, IndustriesData } from "../IndustryData";
+import { IndustryType } from "../data/Enums";
 import { useCorporation } from "./Context";
 import { Industry } from "../Industry";
 import { NewIndustry } from "../Actions";
diff --git a/src/Corporation/ui/ExpandNewCity.tsx b/src/Corporation/ui/ExpandNewCity.tsx
index a6b15a920..13b693065 100644
--- a/src/Corporation/ui/ExpandNewCity.tsx
+++ b/src/Corporation/ui/ExpandNewCity.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { CorporationConstants } from "../data/Constants";
+import * as corpConstants from "../data/Constants";
 import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { NewCity } from "../Actions";
 import { MoneyCost } from "./MoneyCost";
@@ -8,7 +8,7 @@ import Typography from "@mui/material/Typography";
 import MenuItem from "@mui/material/MenuItem";
 import Select, { SelectChangeEvent } from "@mui/material/Select";
 import Button from "@mui/material/Button";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 
 interface IProps {
   cityStateSetter: (city: CityName | "Expand") => void;
@@ -20,7 +20,7 @@ export function ExpandNewCity(props: IProps): React.ReactElement {
   const possibleCities = Object.values(CityName).filter((cityName) => division.offices[cityName] === 0);
   const [city, setCity] = useState(possibleCities[0]);
 
-  const disabled = corp.funds < CorporationConstants.OfficeInitialCost;
+  const disabled = corp.funds < corpConstants.officeInitialCost;
 
   function onCityChange(event: SelectChangeEvent<string>): void {
     setCity(event.target.value as CityName);
@@ -42,7 +42,7 @@ export function ExpandNewCity(props: IProps): React.ReactElement {
     <>
       <Typography>
         Would you like to expand into a new city by opening an office? This would cost{" "}
-        <MoneyCost money={CorporationConstants.OfficeInitialCost} corp={corp} />
+        <MoneyCost money={corpConstants.officeInitialCost} corp={corp} />
       </Typography>
       <Select
         endAdornment={
diff --git a/src/Corporation/ui/Helpers.tsx b/src/Corporation/ui/Helpers.tsx
index 9f7b505d5..1583c4161 100644
--- a/src/Corporation/ui/Helpers.tsx
+++ b/src/Corporation/ui/Helpers.tsx
@@ -1,20 +1,15 @@
+import { CorpMaterialName } from "@nsdefs";
 import { Industry } from "../Industry";
 
 // Returns a boolean indicating whether the given material is relevant for the
 // current industry.
-export function isRelevantMaterial(matName: string, division: Industry): boolean {
+export function isRelevantMaterial(matName: CorpMaterialName, division: Industry): boolean {
   // Materials that affect Production multiplier
-  const prodMultiplierMats = ["Hardware", "Robots", "AICores", "RealEstate", "AI Cores", "Real Estate"];
+  const prodMultiplierMats: CorpMaterialName[] = ["Hardware", "Robots", "AI Cores", "Real Estate"];
 
-  if (Object.keys(division.reqMats).includes(matName)) {
-    return true;
-  }
-  if (division.prodMats.includes(matName)) {
-    return true;
-  }
-  if (prodMultiplierMats.includes(matName)) {
-    return true;
-  }
+  if (Object.keys(division.reqMats).includes(matName)) return true;
+  if (division.prodMats.includes(matName)) return true;
+  if (prodMultiplierMats.includes(matName)) return true;
 
   return false;
 }
diff --git a/src/Corporation/ui/Industry.tsx b/src/Corporation/ui/Industry.tsx
index 4a68add5f..3f30310de 100644
--- a/src/Corporation/ui/Industry.tsx
+++ b/src/Corporation/ui/Industry.tsx
@@ -9,7 +9,7 @@ import { Warehouse } from "../Warehouse";
 import { OfficeSpace } from "../OfficeSpace";
 import { useCorporation, useDivision } from "./Context";
 import Box from "@mui/material/Box";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 
 interface IProps {
   city: CityName;
diff --git a/src/Corporation/ui/IndustryOffice.tsx b/src/Corporation/ui/IndustryOffice.tsx
index 7a9a29031..0be4049b9 100644
--- a/src/Corporation/ui/IndustryOffice.tsx
+++ b/src/Corporation/ui/IndustryOffice.tsx
@@ -3,7 +3,7 @@
 import React, { useState } from "react";
 
 import { OfficeSpace } from "../OfficeSpace";
-import { EmployeePositions } from "../EmployeePositions";
+import { EmployeePositions } from "../data/Enums";
 import { BuyCoffee } from "../Actions";
 
 import { MoneyCost } from "./MoneyCost";
diff --git a/src/Corporation/ui/IndustryOverview.tsx b/src/Corporation/ui/IndustryOverview.tsx
index ee49ab956..bb84a8d6d 100644
--- a/src/Corporation/ui/IndustryOverview.tsx
+++ b/src/Corporation/ui/IndustryOverview.tsx
@@ -2,7 +2,7 @@
 // (top-left panel in the Industry UI)
 import React, { useState } from "react";
 
-import { IndustryType } from "../IndustryData";
+import { IndustryType } from "../data/Enums";
 import { HireAdVert } from "../Actions";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
@@ -207,7 +207,7 @@ export function IndustryOverview(props: IProps): React.ReactElement {
             </Typography>
           }
         >
-          <Typography>Scientific Research: {numeralWrapper.formatReallyBigNumber(division.sciResearch.qty)}</Typography>
+          <Typography>Scientific Research: {numeralWrapper.formatReallyBigNumber(division.sciResearch)}</Typography>
         </Tooltip>
         <Button sx={{ mx: 1 }} onClick={() => setResearchOpen(true)}>
           Research
diff --git a/src/Corporation/ui/IndustryProductEquation.tsx b/src/Corporation/ui/IndustryProductEquation.tsx
index c245b06b0..54be0fa9f 100644
--- a/src/Corporation/ui/IndustryProductEquation.tsx
+++ b/src/Corporation/ui/IndustryProductEquation.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { Industry } from "../Industry";
 import { MathJaxWrapper } from "../../MathJaxWrapper";
+import { CorpMaterialName } from "@nsdefs";
 
 interface IProps {
   division: Industry;
@@ -8,7 +9,7 @@ interface IProps {
 
 export function IndustryProductEquation(props: IProps): React.ReactElement {
   const reqs = [];
-  for (const reqMat of Object.keys(props.division.reqMats)) {
+  for (const reqMat of Object.keys(props.division.reqMats) as CorpMaterialName[]) {
     const reqAmt = props.division.reqMats[reqMat];
     if (reqAmt === undefined) continue;
     reqs.push(String.raw`${reqAmt}\text{ }${reqMat}`);
diff --git a/src/Corporation/ui/IndustryWarehouse.tsx b/src/Corporation/ui/IndustryWarehouse.tsx
index 84ee53fff..24c3cbfc3 100644
--- a/src/Corporation/ui/IndustryWarehouse.tsx
+++ b/src/Corporation/ui/IndustryWarehouse.tsx
@@ -2,7 +2,7 @@
 // (right-side panel in the Industry UI)
 import React, { useState } from "react";
 
-import { CorporationConstants } from "../data/Constants";
+import * as corpConstants from "../data/Constants";
 import { Warehouse } from "../Warehouse";
 import { SmartSupplyModal } from "./modals/SmartSupplyModal";
 import { ProductElem } from "./ProductElem";
@@ -26,7 +26,7 @@ import Button from "@mui/material/Button";
 import Box from "@mui/material/Box";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 
 interface IProps {
   corp: Corporation;
@@ -51,7 +51,7 @@ function WarehouseRoot(props: IProps): React.ReactElement {
   if (props.warehouse === 0) return <></>;
 
   // Upgrade Warehouse size button
-  const sizeUpgradeCost = CorporationConstants.WarehouseUpgradeBaseCost * Math.pow(1.07, props.warehouse.level + 1);
+  const sizeUpgradeCost = corpConstants.warehouseSizeUpgradeCostBase * Math.pow(1.07, props.warehouse.level + 1);
   const canAffordUpgrade = corp.funds > sizeUpgradeCost;
   function upgradeWarehouseOnClick(): void {
     if (division === null) return;
@@ -90,7 +90,7 @@ function WarehouseRoot(props: IProps): React.ReactElement {
 
   // Create React components for materials
   const mats = [];
-  for (const matName of Object.keys(props.warehouse.materials)) {
+  for (const matName of Object.values(corpConstants.materialNames)) {
     if (!props.warehouse.materials[matName]) continue;
     // Only create UI for materials that are relevant for the industry or in stock
     const isInStock = props.warehouse.materials[matName].qty > 0;
@@ -120,13 +120,13 @@ function WarehouseRoot(props: IProps): React.ReactElement {
   }
 
   const breakdownItems: JSX.Element[] = [];
-  for (const matName of Object.keys(props.warehouse.materials)) {
+  for (const matName of Object.values(corpConstants.materialNames)) {
     const mat = props.warehouse.materials[matName];
     if (!MaterialInfo.hasOwnProperty(matName)) continue;
     if (mat.qty === 0) continue;
     breakdownItems.push(
       <>
-        {matName}: {numeralWrapper.format(mat.qty * MaterialInfo[matName][1], "0,0.0")}
+        {matName}: {numeralWrapper.format(mat.qty * MaterialInfo[matName].size, "0,0.0")}
       </>,
     );
   }
@@ -231,7 +231,7 @@ interface IEmptyProps {
 function EmptyWarehouse(props: IEmptyProps): React.ReactElement {
   const corp = useCorporation();
   const division = useDivision();
-  const disabled = corp.funds < CorporationConstants.WarehouseInitialCost;
+  const disabled = corp.funds < corpConstants.warehouseInitialCost;
   function purchaseWarehouse(): void {
     if (disabled) return;
     PurchaseWarehouse(corp, division, props.city);
@@ -241,7 +241,7 @@ function EmptyWarehouse(props: IEmptyProps): React.ReactElement {
     <Paper>
       <Button onClick={purchaseWarehouse} disabled={disabled}>
         Purchase Warehouse (
-        <MoneyCost money={CorporationConstants.WarehouseInitialCost} corp={corp} />)
+        <MoneyCost money={corpConstants.warehouseInitialCost} corp={corp} />)
       </Button>
     </Paper>
   );
diff --git a/src/Corporation/ui/MainPanel.tsx b/src/Corporation/ui/MainPanel.tsx
index ac865870d..b57def809 100644
--- a/src/Corporation/ui/MainPanel.tsx
+++ b/src/Corporation/ui/MainPanel.tsx
@@ -7,7 +7,7 @@ import { CityTabs } from "./CityTabs";
 import { Industry } from "../Industry";
 import { Context, useCorporation } from "./Context";
 
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 
 interface IProps {
   divisionName: string;
diff --git a/src/Corporation/ui/MaterialElem.tsx b/src/Corporation/ui/MaterialElem.tsx
index 46783c5ec..970ecd6e7 100644
--- a/src/Corporation/ui/MaterialElem.tsx
+++ b/src/Corporation/ui/MaterialElem.tsx
@@ -21,7 +21,7 @@ import Paper from "@mui/material/Paper";
 import Button from "@mui/material/Button";
 import Box from "@mui/material/Box";
 import { LimitMaterialProductionModal } from "./modals/LimitMaterialProductionModal";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 
 interface IMaterialProps {
   warehouse: Warehouse;
diff --git a/src/Corporation/ui/Overview.tsx b/src/Corporation/ui/Overview.tsx
index 73f9e14bd..1b10075d5 100644
--- a/src/Corporation/ui/Overview.tsx
+++ b/src/Corporation/ui/Overview.tsx
@@ -11,7 +11,7 @@ import { FindInvestorsModal } from "./modals/FindInvestorsModal";
 import { GoPublicModal } from "./modals/GoPublicModal";
 import { Factions } from "../../Faction/Factions";
 
-import { CorporationConstants } from "../data/Constants";
+import * as corpConstants from "../data/Constants";
 import { CorporationUnlockUpgrade, CorporationUnlockUpgrades } from "../data/CorporationUnlockUpgrades";
 import { CorporationUpgrade, CorporationUpgradeIndex, CorporationUpgrades } from "../data/CorporationUpgrades";
 
@@ -242,7 +242,7 @@ function BribeButton(): React.ReactElement {
   const corp = useCorporation();
   const [open, setOpen] = useState(false);
   const canBribe =
-    corp.valuation >= CorporationConstants.BribeThreshold &&
+    corp.valuation >= corpConstants.bribeThreshold &&
     Player.factions.filter((f) => Factions[f].getInfo().offersWork()).length > 0;
 
   function openBribe(): void {
@@ -277,7 +277,7 @@ function DividendsStats({ profit }: IDividendsStatsProps): React.ReactElement {
   const totalDividends = corp.dividendRate * profit;
   const retainedEarnings = profit - totalDividends;
   const dividendsPerShare = totalDividends / corp.totalShares;
-  const playerEarnings = corp.getCycleDividends() / CorporationConstants.SecsPerMarketCycle;
+  const playerEarnings = corp.getCycleDividends() / corpConstants.secondsPerMarketCycle;
   return (
     <StatsTable
       rows={[
diff --git a/src/Corporation/ui/ProductElem.tsx b/src/Corporation/ui/ProductElem.tsx
index 3308fef66..b8c866806 100644
--- a/src/Corporation/ui/ProductElem.tsx
+++ b/src/Corporation/ui/ProductElem.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 
-import { CorporationConstants } from "../data/Constants";
+import * as corpConstants from "../data/Constants";
 import { Product } from "../Product";
 import { DiscontinueProductModal } from "./modals/DiscontinueProductModal";
 import { LimitProductProductionModal } from "./modals/LimitProductProductionModal";
@@ -163,8 +163,7 @@ export function ProductElem(props: IProductProps): React.ReactElement {
           <Box display="flex">
             <Tooltip title={<Typography>An estimate of the material cost it takes to create this Product.</Typography>}>
               <Typography>
-                Est. Production Cost:{" "}
-                {numeralWrapper.formatMoney(product.pCost / CorporationConstants.ProductProductionCostRatio)}
+                Est. Production Cost: {numeralWrapper.formatMoney(product.pCost / corpConstants.baseProductProfitMult)}
               </Typography>
             </Tooltip>
           </Box>
diff --git a/src/Corporation/ui/modals/BribeFactionModal.tsx b/src/Corporation/ui/modals/BribeFactionModal.tsx
index 526c4b72d..8eccd2032 100644
--- a/src/Corporation/ui/modals/BribeFactionModal.tsx
+++ b/src/Corporation/ui/modals/BribeFactionModal.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Factions } from "../../../Faction/Factions";
-import { CorporationConstants } from "../../data/Constants";
+import * as corpConstants from "../../data/Constants";
 import { numeralWrapper } from "../../../ui/numeralFormat";
 import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 import { Modal } from "../../../ui/React/Modal";
@@ -35,7 +35,7 @@ export function BribeFactionModal(props: IProps): React.ReactElement {
   }
 
   function repGain(money: number): number {
-    return money / CorporationConstants.BribeToRepRatio;
+    return money / corpConstants.bribeAmountPerReputation;
   }
 
   function getRepText(money: number): string {
diff --git a/src/Corporation/ui/modals/ExportModal.tsx b/src/Corporation/ui/modals/ExportModal.tsx
index 2212c33ea..7ea4428ef 100644
--- a/src/Corporation/ui/modals/ExportModal.tsx
+++ b/src/Corporation/ui/modals/ExportModal.tsx
@@ -13,7 +13,7 @@ import Button from "@mui/material/Button";
 import Box from "@mui/material/Box";
 import MenuItem from "@mui/material/MenuItem";
 import Select, { SelectChangeEvent } from "@mui/material/Select";
-import { CityName } from "../../../Locations/data/CityNames";
+import { CityName } from "../../../Enums";
 
 interface IProps {
   open: boolean;
diff --git a/src/Corporation/ui/modals/FindInvestorsModal.tsx b/src/Corporation/ui/modals/FindInvestorsModal.tsx
index 454bba47b..8a2eb34d0 100644
--- a/src/Corporation/ui/modals/FindInvestorsModal.tsx
+++ b/src/Corporation/ui/modals/FindInvestorsModal.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { numeralWrapper } from "../../../ui/numeralFormat";
-import { CorporationConstants } from "../../data/Constants";
+import * as corpConstants from "../../data/Constants";
 import { Modal } from "../../../ui/React/Modal";
 import { useCorporation } from "../Context";
 
@@ -18,14 +18,14 @@ export function FindInvestorsModal(props: IProps): React.ReactElement {
   const corporation = useCorporation();
   const val = corporation.valuation;
   if (
-    corporation.fundingRound >= CorporationConstants.FundingRoundShares.length ||
-    corporation.fundingRound >= CorporationConstants.FundingRoundMultiplier.length
+    corporation.fundingRound >= corpConstants.fundingRoundShares.length ||
+    corporation.fundingRound >= corpConstants.fundingRoundMultiplier.length
   )
     return <></>;
-  const percShares = CorporationConstants.FundingRoundShares[corporation.fundingRound];
-  const roundMultiplier = CorporationConstants.FundingRoundMultiplier[corporation.fundingRound];
+  const percShares = corpConstants.fundingRoundShares[corporation.fundingRound];
+  const roundMultiplier = corpConstants.fundingRoundMultiplier[corporation.fundingRound];
   const funding = val * percShares * roundMultiplier;
-  const investShares = Math.floor(CorporationConstants.INITIALSHARES * percShares);
+  const investShares = Math.floor(corpConstants.initialShares * percShares);
 
   function findInvestors(): void {
     corporation.fundingRound++;
diff --git a/src/Corporation/ui/modals/IssueDividendsModal.tsx b/src/Corporation/ui/modals/IssueDividendsModal.tsx
index 110e21cc5..43e1dd616 100644
--- a/src/Corporation/ui/modals/IssueDividendsModal.tsx
+++ b/src/Corporation/ui/modals/IssueDividendsModal.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 import { Modal } from "../../../ui/React/Modal";
-import { CorporationConstants } from "../../data/Constants";
+import * as corpConstants from "../../data/Constants";
 import { IssueDividends } from "../../Actions";
 import { useCorporation } from "../Context";
 import Typography from "@mui/material/Typography";
@@ -19,7 +19,7 @@ export function IssueDividendsModal(props: IProps): React.ReactElement {
   const corp = useCorporation();
   const [percent, setPercent] = useState(0);
 
-  const canIssue = !isNaN(percent) && percent >= 0 && percent <= CorporationConstants.DividendMaxRate * 100;
+  const canIssue = !isNaN(percent) && percent >= 0 && percent <= corpConstants.dividendMaxRate * 100;
   function issueDividends(): void {
     if (!canIssue) return;
     if (percent === null) return;
diff --git a/src/Corporation/ui/modals/MakeProductModal.tsx b/src/Corporation/ui/modals/MakeProductModal.tsx
index dbdcc9987..bc5fec9cf 100644
--- a/src/Corporation/ui/modals/MakeProductModal.tsx
+++ b/src/Corporation/ui/modals/MakeProductModal.tsx
@@ -1,7 +1,8 @@
 import React, { useState } from "react";
 import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 import { Modal } from "../../../ui/React/Modal";
-import { IndustriesData, IndustryType } from "../../IndustryData";
+import { IndustriesData } from "../../IndustryData";
+import { IndustryType } from "../../data/Enums";
 import { MakeProduct } from "../../Actions";
 import { useCorporation, useDivision } from "../Context";
 import Typography from "@mui/material/Typography";
@@ -11,7 +12,7 @@ import MenuItem from "@mui/material/MenuItem";
 import Select, { SelectChangeEvent } from "@mui/material/Select";
 import { KEY } from "../../../utils/helpers/keyCodes";
 import { NumberInput } from "../../../ui/React/NumberInput";
-import { CityName } from "../../../Locations/data/CityNames";
+import { CityName } from "../../../Enums";
 
 interface IProps {
   open: boolean;
diff --git a/src/Corporation/ui/modals/PurchaseMaterialModal.tsx b/src/Corporation/ui/modals/PurchaseMaterialModal.tsx
index 654c12b99..901e4abea 100644
--- a/src/Corporation/ui/modals/PurchaseMaterialModal.tsx
+++ b/src/Corporation/ui/modals/PurchaseMaterialModal.tsx
@@ -33,7 +33,7 @@ function BulkPurchaseSection(props: IBPProps): React.ReactElement {
     const parsedAmt = parseFloat(props.amount);
     const cost = parsedAmt * props.mat.bCost;
 
-    const matSize = MaterialInfo[props.mat.name][1];
+    const matSize = MaterialInfo[props.mat.name].size;
     const maxAmount = (props.warehouse.size - props.warehouse.sizeUsed) / matSize;
 
     if (parsedAmt > maxAmount) {
diff --git a/src/Corporation/ui/modals/ResearchModal.tsx b/src/Corporation/ui/modals/ResearchModal.tsx
index 58a77ca31..87d64fd67 100644
--- a/src/Corporation/ui/modals/ResearchModal.tsx
+++ b/src/Corporation/ui/modals/ResearchModal.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { Modal } from "../../../ui/React/Modal";
 import { IndustryResearchTrees } from "../../IndustryData";
-import { CorporationConstants } from "../../data/Constants";
+import * as corpConstants from "../../data/Constants";
 import { Industry } from "../../Industry";
 import { Research } from "../../Actions";
 import { Node } from "../../ResearchTree";
@@ -26,7 +26,7 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
   const [open, setOpen] = useState(false);
   if (n === null) return <></>;
   const r = ResearchMap[n.text];
-  let disabled = division.sciResearch.qty < r.cost || n.researched;
+  let disabled = division.sciResearch < r.cost || n.researched;
   const parent = n.parent;
   if (parent !== null) {
     disabled = disabled || !parent.researched;
@@ -42,7 +42,7 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
     }
 
     dialogBoxCreate(
-      `Researched ${n.text}. It may take a market cycle (~${CorporationConstants.SecsPerMarketCycle} seconds) before the effects of the Research apply.`,
+      `Researched ${n.text}. It may take a market cycle (~${corpConstants.secondsPerMarketCycle} seconds) before the effects of the Research apply.`,
     );
   }
 
@@ -141,7 +141,7 @@ export function ResearchModal(props: IProps): React.ReactElement {
     <Modal open={props.open} onClose={props.onClose}>
       <Upgrade division={props.industry} n={researchTree.root} />
       <Typography sx={{ mt: 1 }}>
-        Research points: {props.industry.sciResearch.qty.toFixed(3)}
+        Research points: {props.industry.sciResearch.toFixed(3)}
         <br />
         Multipliers from research:
         <br />* Advertising Multiplier: x{researchTree.getAdvertisingMultiplier()}
diff --git a/src/Corporation/ui/modals/SmartSupplyModal.tsx b/src/Corporation/ui/modals/SmartSupplyModal.tsx
index 4533119e5..455ec6634 100644
--- a/src/Corporation/ui/modals/SmartSupplyModal.tsx
+++ b/src/Corporation/ui/modals/SmartSupplyModal.tsx
@@ -8,18 +8,20 @@ import { useDivision } from "../Context";
 import Typography from "@mui/material/Typography";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Switch from "@mui/material/Switch";
+import { CorpMaterialName } from "@nsdefs";
+import { materialNames } from "../../data/Constants";
 
 interface ILeftoverProps {
-  matName: string;
+  matName: CorpMaterialName;
   warehouse: Warehouse;
 }
 
 function Leftover(props: ILeftoverProps): React.ReactElement {
-  const [checked, setChecked] = useState(!!props.warehouse.smartSupplyUseLeftovers[props.matName.replace(/ /g, "")]);
+  const [checked, setChecked] = useState(!!props.warehouse.smartSupplyUseLeftovers[props.matName]);
 
   function onChange(event: React.ChangeEvent<HTMLInputElement>): void {
     try {
-      const matName = props.matName.replace(/ /g, "");
+      const matName = props.matName;
       const material = props.warehouse.materials[matName];
       SetSmartSupplyUseLeftovers(props.warehouse, material, event.target.checked);
     } catch (err) {
@@ -32,7 +34,7 @@ function Leftover(props: ILeftoverProps): React.ReactElement {
     <>
       <FormControlLabel
         control={<Switch checked={checked} onChange={onChange} />}
-        label={<Typography>{props.warehouse.materials[props.matName.replace(/ /g, "")].name}</Typography>}
+        label={<Typography>{props.warehouse.materials[props.matName].name}</Typography>}
       />
       <br />
     </>
@@ -60,7 +62,7 @@ export function SmartSupplyModal(props: IProps): React.ReactElement {
 
   // Create React components for materials
   const mats = [];
-  for (const matName of Object.keys(props.warehouse.materials)) {
+  for (const matName of Object.values(materialNames)) {
     if (!props.warehouse.materials[matName]) continue;
     if (!Object.keys(division.reqMats).includes(matName)) continue;
     mats.push(<Leftover key={matName} warehouse={props.warehouse} matName={matName} />);
diff --git a/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx b/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
index 3a49dc68b..080d59de9 100644
--- a/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
+++ b/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { numeralWrapper } from "../../../ui/numeralFormat";
-import { CorporationConstants } from "../../data/Constants";
+import * as corpConstants from "../../data/Constants";
 import { OfficeSpace } from "../../OfficeSpace";
 import { Corporation } from "../../Corporation";
 import { UpgradeOfficeSize } from "../../Actions";
@@ -51,19 +51,19 @@ interface IProps {
 
 export function UpgradeOfficeSizeModal(props: IProps): React.ReactElement {
   const corp = useCorporation();
-  const initialPriceMult = Math.round(props.office.size / CorporationConstants.OfficeInitialSize);
+  const initialPriceMult = Math.round(props.office.size / corpConstants.officeInitialSize);
   const costMultiplier = 1.09;
-  const upgradeCost = CorporationConstants.OfficeInitialCost * Math.pow(costMultiplier, initialPriceMult);
+  const upgradeCost = corpConstants.officeInitialCost * Math.pow(costMultiplier, initialPriceMult);
 
   // Calculate cost to upgrade size by 15 employees
   let mult = 0;
   for (let i = 0; i < 5; ++i) {
     mult += Math.pow(costMultiplier, initialPriceMult + i);
   }
-  const upgradeCost15 = CorporationConstants.OfficeInitialCost * mult;
+  const upgradeCost15 = corpConstants.officeInitialCost * mult;
 
   //Calculate max upgrade size and cost
-  const maxMult = corp.funds / CorporationConstants.OfficeInitialCost;
+  const maxMult = corp.funds / corpConstants.officeInitialCost;
   let maxNum = 1;
   mult = Math.pow(costMultiplier, initialPriceMult);
   while (maxNum < 50) {
@@ -77,7 +77,7 @@ export function UpgradeOfficeSizeModal(props: IProps): React.ReactElement {
     }
     ++maxNum;
   }
-  const upgradeCostMax = CorporationConstants.OfficeInitialCost * mult;
+  const upgradeCostMax = corpConstants.officeInitialCost * mult;
 
   return (
     <Modal open={props.open} onClose={props.onClose}>
@@ -90,7 +90,7 @@ export function UpgradeOfficeSizeModal(props: IProps): React.ReactElement {
           office={props.office}
           corp={corp}
           cost={upgradeCost}
-          size={CorporationConstants.OfficeInitialSize}
+          size={corpConstants.officeInitialSize}
         />
         <UpgradeSizeButton
           onClose={props.onClose}
@@ -98,7 +98,7 @@ export function UpgradeOfficeSizeModal(props: IProps): React.ReactElement {
           office={props.office}
           corp={corp}
           cost={upgradeCost15}
-          size={CorporationConstants.OfficeInitialSize * 5}
+          size={corpConstants.officeInitialSize * 5}
         />
         {maxNum !== 1 && maxNum !== 5 && (
           <UpgradeSizeButton
@@ -107,7 +107,7 @@ export function UpgradeOfficeSizeModal(props: IProps): React.ReactElement {
             office={props.office}
             corp={corp}
             cost={upgradeCostMax}
-            size={maxNum * CorporationConstants.OfficeInitialSize}
+            size={maxNum * corpConstants.officeInitialSize}
           />
         )}
       </Box>
diff --git a/src/CotMG/ui/Grid.tsx b/src/CotMG/ui/Grid.tsx
index 82efcdf09..25138c6c9 100644
--- a/src/CotMG/ui/Grid.tsx
+++ b/src/CotMG/ui/Grid.tsx
@@ -15,7 +15,7 @@ interface IProps {
 }
 
 function randomColor(fragment: ActiveFragment): string {
-  // Can't set Math.random seed so copy casino. TODO refactor both RNG later.
+  // Can't set Math.random seed so copy casino. TODO unplanned refactor both RNG later.
   let s1 = Math.pow((fragment.x + 1) * (fragment.y + 1), 10);
   let s2 = s1;
   let s3 = s1;
diff --git a/src/Crime/Crime.ts b/src/Crime/Crime.ts
index 0e5841cb9..18ceb9647 100644
--- a/src/Crime/Crime.ts
+++ b/src/Crime/Crime.ts
@@ -1,8 +1,8 @@
 import { CONSTANTS } from "../Constants";
 import { Player } from "@player";
-import { Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { WorkerScript } from "../Netscript/WorkerScript";
-import { CrimeType } from "../utils/enums";
+import { CrimeType } from "../Enums";
 import { CrimeWork } from "../Work/CrimeWork";
 import { calculateIntelligenceBonus } from "../PersonObjects/formulas/intelligence";
 
diff --git a/src/Crime/CrimeHelpers.ts b/src/Crime/CrimeHelpers.ts
index b89f6a23f..adcb71572 100644
--- a/src/Crime/CrimeHelpers.ts
+++ b/src/Crime/CrimeHelpers.ts
@@ -4,7 +4,7 @@ import { Player } from "@player";
 
 import { dialogBoxCreate } from "../ui/React/DialogBox";
 import { checkEnum } from "../utils/helpers/enum";
-import { CrimeType } from "../utils/enums";
+import { CrimeType } from "../Enums";
 
 //This is only used for the player
 export function determineCrimeSuccess(type: string): boolean {
diff --git a/src/Crime/Crimes.ts b/src/Crime/Crimes.ts
index bbfba4c9c..e1d474519 100644
--- a/src/Crime/Crimes.ts
+++ b/src/Crime/Crimes.ts
@@ -1,6 +1,6 @@
 import { Crime } from "./Crime";
 import { CONSTANTS } from "../Constants";
-import { CrimeType } from "../utils/enums";
+import { CrimeType } from "../Enums";
 
 export const Crimes: Record<CrimeType, Crime> = {
   [CrimeType.shoplift]: new Crime(
diff --git a/src/DevMenu/ui/Corporation.tsx b/src/DevMenu/ui/Corporation.tsx
index 02649b427..4b230c678 100644
--- a/src/DevMenu/ui/Corporation.tsx
+++ b/src/DevMenu/ui/Corporation.tsx
@@ -67,7 +67,7 @@ export function Corporation(): React.ReactElement {
   function addCorporationResearch(): void {
     if (!Player.corporation) return;
     Player.corporation.divisions.forEach((div) => {
-      div.sciResearch.qty += 1e10;
+      div.sciResearch += 1e10;
     });
   }
 
diff --git a/src/DevMenu/ui/SaveFile.tsx b/src/DevMenu/ui/SaveFile.tsx
index 8f7d9003b..a54ddce18 100644
--- a/src/DevMenu/ui/SaveFile.tsx
+++ b/src/DevMenu/ui/SaveFile.tsx
@@ -38,7 +38,7 @@ export function SaveFile(): React.ReactElement {
 
   function doRestore(): void {
     const save = JSON.parse(saveFile);
-    // TODO: Continue here.
+    // TODO unplanned: "Continue here". Unknown what this todo is for.
     console.error(save);
   }
 
diff --git a/src/utils/enums.ts b/src/Enums.ts
similarity index 77%
rename from src/utils/enums.ts
rename to src/Enums.ts
index 1dbc14ecb..f305cfafe 100644
--- a/src/utils/enums.ts
+++ b/src/Enums.ts
@@ -1,44 +1,46 @@
-export enum CompanyPosName {
-  sw0 = "Software Engineering Intern",
-  sw1 = "Junior Software Engineer",
-  sw2 = "Senior Software Engineer",
-  sw3 = "Lead Software Developer",
-  sw4 = "Head of Software",
-  sw5 = "Head of Engineering",
-  sw6 = "Vice President of Technology",
-  sw7 = "Chief Technology Officer",
+/** Job for company work */
+export enum JobName {
+  software0 = "Software Engineering Intern",
+  software1 = "Junior Software Engineer",
+  software2 = "Senior Software Engineer",
+  software3 = "Lead Software Developer",
+  software4 = "Head of Software",
+  software5 = "Head of Engineering",
+  software6 = "Vice President of Technology",
+  software7 = "Chief Technology Officer",
   IT0 = "IT Intern",
   IT1 = "IT Analyst",
   IT2 = "IT Manager",
   IT3 = "Systems Administrator",
-  secEng = "Security Engineer",
-  netEng0 = "Network Engineer",
-  netEng1 = "Network Administrator",
-  bus0 = "Business Intern",
-  bus1 = "Business Analyst",
-  bus2 = "Business Manager",
-  bus3 = "Operations Manager",
-  bus4 = "Chief Financial Officer",
-  bus5 = "Chief Executive Officer",
-  sec0 = "Police Officer",
-  sec1 = "Police Chief",
-  sec2 = "Security Guard",
-  sec3 = "Security Officer",
-  sec4 = "Security Supervisor",
-  sec5 = "Head of Security",
+  securityEng = "Security Engineer",
+  networkEng0 = "Network Engineer",
+  networkEng1 = "Network Administrator",
+  business0 = "Business Intern",
+  business1 = "Business Analyst",
+  business2 = "Business Manager",
+  business3 = "Operations Manager",
+  business4 = "Chief Financial Officer",
+  business5 = "Chief Executive Officer",
+  security0 = "Police Officer",
+  security1 = "Police Chief",
+  security2 = "Security Guard",
+  security3 = "Security Officer",
+  security4 = "Security Supervisor",
+  security5 = "Head of Security",
   agent0 = "Field Agent",
   agent1 = "Secret Agent",
   agent2 = "Special Operative",
   waiter = "Waiter",
   employee = "Employee",
-  softCons0 = "Software Consultant",
-  softCons1 = "Senior Software Consultant",
-  busCons0 = "Business Consultant",
-  busCons1 = "Senior Business Consultant",
+  softwareConsult0 = "Software Consultant",
+  softwareConsult1 = "Senior Software Consultant",
+  businessConsult0 = "Business Consultant",
+  businessConsult1 = "Senior Business Consultant",
   waiterPT = "Part-time Waiter",
   employeePT = "Part-time Employee",
 }
 
+/** Crime names */
 export enum CrimeType {
   shoplift = "Shoplift",
   robStore = "Rob Store",
diff --git a/src/Faction/formulas/donation.ts b/src/Faction/formulas/donation.ts
index 936d76d51..57c3e5c87 100644
--- a/src/Faction/formulas/donation.ts
+++ b/src/Faction/formulas/donation.ts
@@ -1,6 +1,6 @@
 import { CONSTANTS } from "../../Constants";
 import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
-import { Person as IPerson } from "../../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 
 export function repFromDonation(amt: number, person: IPerson): number {
   return (amt / CONSTANTS.DonateMoneyToRepDivisor) * person.mults.faction_rep * BitNodeMultipliers.FactionWorkRepGain;
diff --git a/src/Faction/ui/FactionRoot.tsx b/src/Faction/ui/FactionRoot.tsx
index 50ee446b6..d774625a6 100644
--- a/src/Faction/ui/FactionRoot.tsx
+++ b/src/Faction/ui/FactionRoot.tsx
@@ -24,7 +24,7 @@ import { CovenantPurchasesRoot } from "../../PersonObjects/Sleeve/ui/CovenantPur
 import { FactionNames } from "../data/FactionNames";
 import { GangButton } from "./GangButton";
 import { FactionWork } from "../../Work/FactionWork";
-import { FactionWorkType } from "../../utils/enums";
+import { FactionWorkType } from "../../Enums";
 
 type IProps = {
   faction: Faction;
diff --git a/src/Gang/Gang.ts b/src/Gang/Gang.ts
index f998732c9..9a09c068b 100644
--- a/src/Gang/Gang.ts
+++ b/src/Gang/Gang.ts
@@ -1,5 +1,5 @@
 /**
- * TODO
+ * TODO unplanned
  * Add police clashes
  * balance point to keep them from running out of control
  */
diff --git a/src/Gang/GangMember.ts b/src/Gang/GangMember.ts
index cefefed9c..bd36ea5f4 100644
--- a/src/Gang/GangMember.ts
+++ b/src/Gang/GangMember.ts
@@ -99,7 +99,7 @@ export class GangMember {
   }
 
   getTask(): GangMemberTask {
-    // TODO(hydroflame): transfer that to a save file migration function
+    // TODO unplanned: transfer that to a save file migration function
     // Backwards compatibility
     if ((this.task as any) instanceof GangMemberTask) {
       this.task = (this.task as any).name;
diff --git a/src/Hacking.ts b/src/Hacking.ts
index a1026d679..0770754bb 100644
--- a/src/Hacking.ts
+++ b/src/Hacking.ts
@@ -1,5 +1,5 @@
 import { BitNodeMultipliers } from "./BitNode/BitNodeMultipliers";
-import { Person as IPerson } from "./ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { calculateIntelligenceBonus } from "./PersonObjects/formulas/intelligence";
 import { Server } from "./Server/Server";
 
diff --git a/src/Hacknet/HacknetHelpers.tsx b/src/Hacknet/HacknetHelpers.tsx
index 1285f6e42..fe9a58cf7 100644
--- a/src/Hacknet/HacknetHelpers.tsx
+++ b/src/Hacknet/HacknetHelpers.tsx
@@ -6,7 +6,7 @@
  *  - Updating Hash Manager capacity
  *  - Purchasing hash upgrades
  *
- * TODO Should probably split the different types of functions into their own modules
+ * TODO unplanned Should probably split the different types of functions into their own modules
  */
 import { HacknetNode } from "./HacknetNode";
 import { calculateNodeCost } from "./formulas/HacknetNodes";
@@ -531,7 +531,7 @@ export function purchaseHashUpgrade(upgName: string, upgTarget: string, count =
           return false;
         }
         for (const division of corp.divisions) {
-          division.sciResearch.qty += upg.value * count;
+          division.sciResearch += upg.value * count;
         }
         break;
       }
diff --git a/src/Literature/Literatures.ts b/src/Literature/Literatures.ts
index b0869968f..24b316ea6 100644
--- a/src/Literature/Literatures.ts
+++ b/src/Literature/Literatures.ts
@@ -1,4 +1,4 @@
-import { CityName } from "./../Locations/data/CityNames";
+import { CityName } from "./../Enums";
 import { Literature } from "./Literature";
 import { LiteratureNames } from "./data/LiteratureNames";
 import { FactionNames } from "../Faction/data/FactionNames";
diff --git a/src/Locations/Cities.ts b/src/Locations/Cities.ts
index 058108950..7b6c1149e 100644
--- a/src/Locations/Cities.ts
+++ b/src/Locations/Cities.ts
@@ -1,7 +1,11 @@
-/**
- * Map of all Cities in the game
- * Key = City Name, Value = City object
- */
 import { City } from "./City";
+import { CityName } from "../Enums";
 
-export const Cities: Record<string, City> = {};
+export const Cities: Record<CityName, City> = {
+  [CityName.Aevum]: new City(CityName.Aevum),
+  [CityName.Chongqing]: new City(CityName.Chongqing),
+  [CityName.Ishima]: new City(CityName.Ishima),
+  [CityName.NewTokyo]: new City(CityName.NewTokyo),
+  [CityName.Sector12]: new City(CityName.Sector12),
+  [CityName.Volhaven]: new City(CityName.Volhaven),
+};
diff --git a/src/Locations/City.ts b/src/Locations/City.ts
index 84009f1aa..8bd486cdb 100644
--- a/src/Locations/City.ts
+++ b/src/Locations/City.ts
@@ -1,5 +1,4 @@
-import { CityName } from "./data/CityNames";
-import { LocationName } from "../utils/enums";
+import { LocationName, CityName } from "../Enums";
 
 /** Class representing a City in the game */
 export class City {
diff --git a/src/Locations/Location.ts b/src/Locations/Location.ts
index 189610487..591fa75bd 100644
--- a/src/Locations/Location.ts
+++ b/src/Locations/Location.ts
@@ -1,5 +1,4 @@
-import { CityName } from "./data/CityNames";
-import { LocationName } from "../utils/enums";
+import { CityName, LocationName } from "../Enums";
 import { LocationType } from "./LocationTypeEnum";
 
 interface IInfiltrationMetadata {
diff --git a/src/Locations/Locations.ts b/src/Locations/Locations.ts
index 9171f893f..3c95c1a73 100644
--- a/src/Locations/Locations.ts
+++ b/src/Locations/Locations.ts
@@ -2,10 +2,9 @@
  * Map of all Locations in the game
  * Key = Location name, value = Location object
  */
-import { City } from "./City";
 import { Cities } from "./Cities";
 import { Location, IConstructorParams } from "./Location";
-import { CityName } from "./data/CityNames";
+import { CityName } from "../Enums";
 import { LocationsMetadata } from "./data/LocationsMetadata";
 
 export const Locations: Record<string, Location> = {};
@@ -29,13 +28,6 @@ function constructLocation(p: IConstructorParams): Location {
 }
 
 // First construct all cities
-Cities[CityName.Aevum] = new City(CityName.Aevum);
-Cities[CityName.Chongqing] = new City(CityName.Chongqing);
-Cities[CityName.Ishima] = new City(CityName.Ishima);
-Cities[CityName.NewTokyo] = new City(CityName.NewTokyo);
-Cities[CityName.Sector12] = new City(CityName.Sector12);
-Cities[CityName.Volhaven] = new City(CityName.Volhaven);
-
 Cities[CityName.Aevum].asciiArt = `
    [aevum police headquarters]       26                                         
                                    o                                            
@@ -218,7 +210,7 @@ for (const metadata of LocationsMetadata) {
   const cityName = loc.city;
   if (cityName === null) {
     // Generic location, add to all cities
-    for (const city of Object.keys(Cities)) {
+    for (const city of Object.values(CityName)) {
       Cities[city].addLocation(loc.name);
     }
   } else {
diff --git a/src/Locations/data/CityNames.ts b/src/Locations/data/CityNames.ts
deleted file mode 100644
index 59df78673..000000000
--- a/src/Locations/data/CityNames.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * All possible Cities in the game. Names only, not actual "City" object
- * Implemented as an enum for typing purposes
- */
-export enum CityName {
-  Aevum = "Aevum",
-  Chongqing = "Chongqing",
-  Ishima = "Ishima",
-  NewTokyo = "New Tokyo",
-  Sector12 = "Sector-12",
-  Volhaven = "Volhaven",
-}
diff --git a/src/Locations/data/LocationsMetadata.ts b/src/Locations/data/LocationsMetadata.ts
index bea354fca..6de114bc2 100644
--- a/src/Locations/data/LocationsMetadata.ts
+++ b/src/Locations/data/LocationsMetadata.ts
@@ -2,8 +2,7 @@
  * Metadata for constructing Location objects for all Locations
  * in the game
  */
-import { CityName } from "./CityNames";
-import { LocationName } from "../../utils/enums";
+import { CityName, LocationName } from "../../Enums";
 import { IConstructorParams } from "../Location";
 import { LocationType } from "../LocationTypeEnum";
 
diff --git a/src/Locations/ui/City.tsx b/src/Locations/ui/City.tsx
index d09c35f90..7d78ce566 100644
--- a/src/Locations/ui/City.tsx
+++ b/src/Locations/ui/City.tsx
@@ -7,7 +7,7 @@ import * as React from "react";
 
 import { City } from "../City";
 import { Cities } from "../Cities";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { Locations } from "../Locations";
 import { Location } from "../Location";
 import { Settings } from "../../Settings/Settings";
diff --git a/src/Locations/ui/CompanyLocation.tsx b/src/Locations/ui/CompanyLocation.tsx
index 35b102d82..9c6aa90b1 100644
--- a/src/Locations/ui/CompanyLocation.tsx
+++ b/src/Locations/ui/CompanyLocation.tsx
@@ -12,11 +12,11 @@ import Box from "@mui/material/Box";
 import { ApplyToJobButton } from "./ApplyToJobButton";
 
 import { Locations } from "../Locations";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 
 import { Companies } from "../../Company/Companies";
 import { CompanyPositions } from "../../Company/CompanyPositions";
-import * as posNames from "../../Company/data/companypositionnames";
+import * as posNames from "../../Company/data/JobTracks";
 
 import { Reputation } from "../../ui/React/Reputation";
 import { Favor } from "../../ui/React/Favor";
diff --git a/src/Locations/ui/GymLocation.tsx b/src/Locations/ui/GymLocation.tsx
index 52318ae17..8eaf1684b 100644
--- a/src/Locations/ui/GymLocation.tsx
+++ b/src/Locations/ui/GymLocation.tsx
@@ -16,7 +16,7 @@ import { Page } from "../../ui/Router";
 import { Box } from "@mui/material";
 import { ClassWork, Classes } from "../../Work/ClassWork";
 import { calculateCost } from "../../Work/Formulas";
-import { GymType } from "../../utils/enums";
+import { GymType } from "../../Enums";
 
 type IProps = {
   loc: Location;
diff --git a/src/Locations/ui/SpecialLocation.tsx b/src/Locations/ui/SpecialLocation.tsx
index 75abf9787..dd358e2e8 100644
--- a/src/Locations/ui/SpecialLocation.tsx
+++ b/src/Locations/ui/SpecialLocation.tsx
@@ -16,7 +16,7 @@ import Button from "@mui/material/Button";
 
 import { Location } from "../Location";
 import { CreateCorporationModal } from "../../Corporation/ui/modals/CreateCorporationModal";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 import { Factions } from "../../Faction/Factions";
 import { joinFaction } from "../../Faction/FactionHelpers";
diff --git a/src/Locations/ui/TravelAgencyRoot.tsx b/src/Locations/ui/TravelAgencyRoot.tsx
index e2295aa7d..f4d963736 100644
--- a/src/Locations/ui/TravelAgencyRoot.tsx
+++ b/src/Locations/ui/TravelAgencyRoot.tsx
@@ -5,7 +5,7 @@
  */
 import React, { useState, useEffect } from "react";
 
-import { CityName } from "../data/CityNames";
+import { CityName } from "../../Enums";
 import { TravelConfirmationModal } from "./TravelConfirmationModal";
 
 import { CONSTANTS } from "../../Constants";
diff --git a/src/Locations/ui/UniversityLocation.tsx b/src/Locations/ui/UniversityLocation.tsx
index 45552e0dd..436f2ea81 100644
--- a/src/Locations/ui/UniversityLocation.tsx
+++ b/src/Locations/ui/UniversityLocation.tsx
@@ -17,7 +17,7 @@ import { Box } from "@mui/material";
 
 import { ClassWork, Classes } from "../../Work/ClassWork";
 import { calculateCost } from "../../Work/Formulas";
-import { UniversityClassType } from "../../utils/enums";
+import { UniversityClassType } from "../../Enums";
 
 type IProps = {
   loc: Location;
diff --git a/src/Netscript/APIWrapper.ts b/src/Netscript/APIWrapper.ts
index a64713547..8962cc1aa 100644
--- a/src/Netscript/APIWrapper.ts
+++ b/src/Netscript/APIWrapper.ts
@@ -42,7 +42,7 @@ export class StampedLayer {
     this.#workerScript = ws;
     Object.setPrototypeOf(this, obj);
   }
-  static wrapFunction<API>(eLayer: ExternalAPI<API>, func: InternalFn<APIFn>, tree: string[], key: Key<API>) {
+  static wrapFunction<API>(eLayer: ExternalAPI<API>, internalFunc: InternalFn<APIFn>, tree: string[], key: Key<API>) {
     const arrayPath = [...tree, key];
     const functionPath = arrayPath.join(".");
     function wrappedFunction(this: StampedLayer, ...args: unknown[]): unknown {
@@ -55,9 +55,10 @@ variable. e.g.
 const ${key} = ns.${functionPath}.bind(ns);
 ${key}(${JSON.stringify(args).replace(/^\[|\]$/g, "")});\n\n`);
       const ctx = { workerScript: this.#workerScript, function: key, functionPath };
+      const func = internalFunc(ctx); //Allows throwing before ram chack
       helpers.checkEnvFlags(ctx);
       helpers.updateDynamicRam(ctx, getRamCost(...tree, key));
-      return func(ctx)(...args);
+      return func(...args);
     }
     Object.defineProperty(eLayer, key, { value: wrappedFunction, enumerable: true, writable: false });
   }
@@ -98,3 +99,13 @@ export function wrapAPILayer<API>(
   }
   return eLayer;
 }
+
+/** Specify when a function was removed from the game, and its replacement function. */
+export function removedFunction(version: string, replacement: string, replaceMsg?: boolean) {
+  return (ctx: NetscriptContext) => {
+    throw helpers.makeRuntimeErrorMsg(
+      ctx,
+      `Function removed in ${version}. ` + replaceMsg ? replacement : `Please use ${replacement} instead.`,
+    );
+  };
+}
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 69f31fc20..b629eae78 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -5,8 +5,8 @@ import { Player } from "@player";
 import { ScriptDeath } from "./ScriptDeath";
 import { numeralWrapper } from "../ui/numeralFormat";
 import { ScriptArg } from "./ScriptArg";
-import { CityName } from "../Locations/data/CityNames";
-import { BasicHGWOptions } from "src/ScriptEditor/NetscriptDefinitions";
+import { CityName } from "../Enums";
+import { BasicHGWOptions, RunningScript as IRunningScript, Person as IPerson } from "@nsdefs";
 import { Server } from "../Server/Server";
 import {
   calculateHackingChance,
@@ -28,12 +28,12 @@ import { RunningScript } from "../Script/RunningScript";
 import { toNative } from "../NetscriptFunctions/toNative";
 import { ScriptIdentifier } from "./ScriptIdentifier";
 import { findRunningScript, findRunningScriptByPid } from "../Script/ScriptHelpers";
-import { RunningScript as IRunningScript, Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
 import { arrayToString } from "../utils/helpers/arrayToString";
 import { HacknetServer } from "../Hacknet/HacknetServer";
 import { BaseServer } from "../Server/BaseServer";
 import { dialogBoxCreate } from "../ui/React/DialogBox";
 import { checkEnum } from "../utils/helpers/enum";
+import { RamCostConstants } from "./RamCostGenerator";
 
 export const helpers = {
   string,
@@ -65,15 +65,15 @@ export const helpers = {
   failOnHacknetServer,
 };
 
-export function assertEnumMember<T extends string>(
+export function assertMember<T extends string>(
   ctx: NetscriptContext,
-  obj: Record<string, T>,
-  enumName: string,
+  obj: Record<string, T> | T[],
+  typeName: string,
   argName: string,
   v: unknown,
 ): asserts v is T {
   assertString(ctx, argName, v);
-  if (!checkEnum(obj, v)) throw makeRuntimeErrorMsg(ctx, `${argName}: ${v} is not a valid ${enumName}.`, "TYPE");
+  if (!checkEnum(obj, v)) throw makeRuntimeErrorMsg(ctx, `${argName}: ${v} is not a valid ${typeName}.`, "TYPE");
 }
 
 export function assertString(ctx: NetscriptContext, argName: string, v: unknown): asserts v is string {
@@ -344,7 +344,7 @@ function updateDynamicRam(ctx: NetscriptContext, ramCost: number): void {
     console.warn(`WorkerScript detected NaN for thread count for ${ws.name} on ${ws.hostname}`);
     threads = 1;
   }
-  ws.dynamicRamUsage += ramCost;
+  ws.dynamicRamUsage = Math.min(ws.dynamicRamUsage + ramCost, RamCostConstants.Max);
   if (ws.dynamicRamUsage > 1.01 * ws.ramUsage) {
     log(ctx, () => "Insufficient static ram available.");
     ws.env.stopFlag = true;
@@ -372,8 +372,8 @@ function updateDynamicRam(ctx: NetscriptContext, ramCost: number): void {
 
 /** Validates the input v as being a CityName. Throws an error if it is not. */
 function city(ctx: NetscriptContext, argName: string, v: unknown): CityName {
-  if (typeof v !== "string") throw makeRuntimeErrorMsg(ctx, `${argName} should be a city name.`);
-  if (!checkEnum(CityName, v)) throw makeRuntimeErrorMsg(ctx, `${argName} should be a city name.`);
+  if (typeof v !== "string" || !checkEnum(CityName, v))
+    throw makeRuntimeErrorMsg(ctx, `${argName} should be a city name.`);
   return v;
 }
 
diff --git a/src/Netscript/RamCostGenerator.ts b/src/Netscript/RamCostGenerator.ts
index ed631a5f7..bf42674b2 100644
--- a/src/Netscript/RamCostGenerator.ts
+++ b/src/Netscript/RamCostGenerator.ts
@@ -10,78 +10,78 @@ type RamCostTree<API> = Omit<
 >;
 
 /** Constants for assigning costs to ns functions */
-export const RamCostConstants: Record<string, number> = {
-  ScriptBaseRamCost: 1.6,
-  ScriptDomRamCost: 25,
-  ScriptCorporationRamCost: 1024 - 1.6,
-  ScriptHackRamCost: 0.1,
-  ScriptHackAnalyzeRamCost: 1,
-  ScriptGrowRamCost: 0.15,
-  ScriptGrowthAnalyzeRamCost: 1,
-  ScriptWeakenRamCost: 0.15,
-  ScriptWeakenAnalyzeRamCost: 1,
-  ScriptScanRamCost: 0.2,
-  ScriptRecentScriptsRamCost: 0.2,
-  ScriptPortProgramRamCost: 0.05,
-  ScriptRunRamCost: 1.0,
-  ScriptExecRamCost: 1.3,
-  ScriptSpawnRamCost: 2.0,
-  ScriptScpRamCost: 0.6,
-  ScriptKillRamCost: 0.5,
-  ScriptHasRootAccessRamCost: 0.05,
-  ScriptGetHostnameRamCost: 0.05,
-  ScriptGetHackingLevelRamCost: 0.05,
-  ScriptGetMultipliersRamCost: 4.0,
-  ScriptGetServerRamCost: 0.1,
-  ScriptGetServerMaxRam: 0.05,
-  ScriptGetServerUsedRam: 0.05,
-  ScriptFileExistsRamCost: 0.1,
-  ScriptIsRunningRamCost: 0.1,
-  ScriptHacknetNodesRamCost: 4.0,
-  ScriptHNUpgLevelRamCost: 0.4,
-  ScriptHNUpgRamRamCost: 0.6,
-  ScriptHNUpgCoreRamCost: 0.8,
-  ScriptGetStockRamCost: 2.0,
-  ScriptBuySellStockRamCost: 2.5,
-  ScriptGetPurchaseServerRamCost: 0.25,
-  ScriptPurchaseServerRamCost: 2.25,
-  ScriptGetPurchasedServerLimit: 0.05,
-  ScriptGetPurchasedServerMaxRam: 0.05,
-  ScriptRoundRamCost: 0.05,
-  ScriptReadWriteRamCost: 1.0,
-  ScriptArbScriptRamCost: 1.0,
-  ScriptGetScriptRamCost: 0.1,
-  ScriptGetRunningScriptRamCost: 0.3,
-  ScriptGetHackTimeRamCost: 0.05,
-  ScriptGetFavorToDonate: 0.1,
-  ScriptCodingContractBaseRamCost: 10,
-  ScriptSleeveBaseRamCost: 4,
-  ScriptClearTerminalCost: 0.2,
-  ScriptGetMoneySourcesCost: 1.0,
+export const RamCostConstants = {
+  Base: 1.6,
+  Dom: 25,
+  Corporation: 1024,
+  Max: 1024,
+  Hack: 0.1,
+  HackAnalyze: 1,
+  Grow: 0.15,
+  GrowthAnalyze: 1,
+  Weaken: 0.15,
+  WeakenAnalyze: 1,
+  Scan: 0.2,
+  RecentScripts: 0.2,
+  PortProgram: 0.05,
+  Run: 1.0,
+  Exec: 1.3,
+  Spawn: 2.0,
+  Scp: 0.6,
+  Kill: 0.5,
+  HasRootAccess: 0.05,
+  GetHostname: 0.05,
+  GetHackingLevel: 0.05,
+  GetServer: 0.1,
+  GetServerMaxRam: 0.05,
+  GetServerUsedRam: 0.05,
+  FileExists: 0.1,
+  IsRunning: 0.1,
+  HacknetNodes: 4.0,
+  HNUpgLevel: 0.4,
+  HNUpgRam: 0.6,
+  HNUpgCore: 0.8,
+  GetStock: 2.0,
+  BuySellStock: 2.5,
+  GetPurchaseServer: 0.25,
+  PurchaseServer: 2.25,
+  GetPurchasedServerLimit: 0.05,
+  GetPurchasedServerMaxRam: 0.05,
+  Round: 0.05,
+  ReadWrite: 1.0,
+  ArbScript: 1.0,
+  GetScript: 0.1,
+  GetRunningScript: 0.3,
+  GetHackTime: 0.05,
+  GetFavorToDonate: 0.1,
+  CodingContractBase: 10,
+  SleeveBase: 4,
+  ClearTerminalCost: 0.2,
+  GetMoneySourcesCost: 1.0,
 
-  ScriptSingularityFn1RamCost: 2,
-  ScriptSingularityFn2RamCost: 3,
-  ScriptSingularityFn3RamCost: 5,
+  SingularityFn1: 2,
+  SingularityFn2: 3,
+  SingularityFn3: 5,
 
-  ScriptGangApiBaseRamCost: 4,
+  GangApiBase: 4,
 
-  ScriptBladeburnerApiBaseRamCost: 4,
+  BladeburnerApiBase: 4,
 
-  ScriptStanekWidth: 0.4,
-  ScriptStanekHeight: 0.4,
-  ScriptStanekCharge: 0.4,
-  ScriptStanekFragmentDefinitions: 0,
-  ScriptStanekPlacedFragments: 5,
-  ScriptStanekClear: 0,
-  ScriptStanekCanPlace: 0.5,
-  ScriptStanekPlace: 5,
-  ScriptStanekFragmentAt: 2,
-  ScriptStanekDeleteAt: 0.15,
-  ScriptInfiltrationCalculateDifficulty: 2.5,
-  ScriptInfiltrationCalculateRewards: 2.5,
-  ScriptInfiltrationGetLocations: 5,
-  ScriptInfiltrationGetInfiltrations: 15,
-  ScriptStanekAcceptGift: 2,
+  StanekWidth: 0.4,
+  StanekHeight: 0.4,
+  StanekCharge: 0.4,
+  StanekFragmentDefinitions: 0,
+  StanekPlacedFragments: 5,
+  StanekClear: 0,
+  StanekCanPlace: 0.5,
+  StanekPlace: 5,
+  StanekFragmentAt: 2,
+  StanekDeleteAt: 0.15,
+  InfiltrationCalculateDifficulty: 2.5,
+  InfiltrationCalculateRewards: 2.5,
+  InfiltrationGetLocations: 5,
+  InfiltrationGetInfiltrations: 15,
+  StanekAcceptGift: 2,
 };
 
 function SF4Cost(cost: number): () => number {
@@ -125,84 +125,84 @@ const stock = {
   hasTIXAPIAccess: 0.05,
   has4SData: 0.05,
   has4SDataTIXAPI: 0.05,
-  getSymbols: RamCostConstants.ScriptGetStockRamCost,
-  getPrice: RamCostConstants.ScriptGetStockRamCost,
-  getOrganization: RamCostConstants.ScriptGetStockRamCost,
-  getAskPrice: RamCostConstants.ScriptGetStockRamCost,
-  getBidPrice: RamCostConstants.ScriptGetStockRamCost,
-  getPosition: RamCostConstants.ScriptGetStockRamCost,
-  getMaxShares: RamCostConstants.ScriptGetStockRamCost,
-  getPurchaseCost: RamCostConstants.ScriptGetStockRamCost,
-  getSaleGain: RamCostConstants.ScriptGetStockRamCost,
-  buyStock: RamCostConstants.ScriptBuySellStockRamCost,
-  sellStock: RamCostConstants.ScriptBuySellStockRamCost,
-  buyShort: RamCostConstants.ScriptBuySellStockRamCost,
-  sellShort: RamCostConstants.ScriptBuySellStockRamCost,
-  placeOrder: RamCostConstants.ScriptBuySellStockRamCost,
-  cancelOrder: RamCostConstants.ScriptBuySellStockRamCost,
-  getOrders: RamCostConstants.ScriptBuySellStockRamCost,
-  getVolatility: RamCostConstants.ScriptBuySellStockRamCost,
-  getForecast: RamCostConstants.ScriptBuySellStockRamCost,
-  purchase4SMarketData: RamCostConstants.ScriptBuySellStockRamCost,
-  purchase4SMarketDataTixApi: RamCostConstants.ScriptBuySellStockRamCost,
-  purchaseWseAccount: RamCostConstants.ScriptBuySellStockRamCost,
-  purchaseTixApi: RamCostConstants.ScriptBuySellStockRamCost,
+  getSymbols: RamCostConstants.GetStock,
+  getPrice: RamCostConstants.GetStock,
+  getOrganization: RamCostConstants.GetStock,
+  getAskPrice: RamCostConstants.GetStock,
+  getBidPrice: RamCostConstants.GetStock,
+  getPosition: RamCostConstants.GetStock,
+  getMaxShares: RamCostConstants.GetStock,
+  getPurchaseCost: RamCostConstants.GetStock,
+  getSaleGain: RamCostConstants.GetStock,
+  buyStock: RamCostConstants.BuySellStock,
+  sellStock: RamCostConstants.BuySellStock,
+  buyShort: RamCostConstants.BuySellStock,
+  sellShort: RamCostConstants.BuySellStock,
+  placeOrder: RamCostConstants.BuySellStock,
+  cancelOrder: RamCostConstants.BuySellStock,
+  getOrders: RamCostConstants.BuySellStock,
+  getVolatility: RamCostConstants.BuySellStock,
+  getForecast: RamCostConstants.BuySellStock,
+  purchase4SMarketData: RamCostConstants.BuySellStock,
+  purchase4SMarketDataTixApi: RamCostConstants.BuySellStock,
+  purchaseWseAccount: RamCostConstants.BuySellStock,
+  purchaseTixApi: RamCostConstants.BuySellStock,
 } as const;
 
 // Singularity API
 const singularity = {
-  universityCourse: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  gymWorkout: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  travelToCity: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  goToLocation: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  purchaseTor: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  purchaseProgram: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  getCurrentServer: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  connect: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  manualHack: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  installBackdoor: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  getDarkwebProgramCost: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 4),
-  getDarkwebPrograms: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 4),
-  hospitalize: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 4),
-  isBusy: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 4),
-  stopAction: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 2),
-  upgradeHomeRam: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  upgradeHomeCores: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  getUpgradeHomeRamCost: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 2),
-  getUpgradeHomeCoresCost: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 2),
-  workForCompany: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  applyToCompany: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  quitJob: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  getCompanyRep: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 3),
-  getCompanyFavor: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 3),
-  getCompanyFavorGain: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 4),
-  checkFactionInvitations: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  joinFaction: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  workForFaction: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost),
-  getFactionRep: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 3),
-  getFactionFavor: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 3),
-  getFactionFavorGain: SF4Cost(RamCostConstants.ScriptSingularityFn2RamCost / 4),
-  donateToFaction: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  createProgram: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  commitCrime: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getCrimeChance: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getCrimeStats: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getOwnedAugmentations: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getOwnedSourceFiles: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getAugmentationsFromFaction: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getAugmentationCost: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getAugmentationPrereq: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  getAugmentationPrice: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost / 2),
-  getAugmentationBasePrice: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost / 2),
-  getAugmentationRepReq: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost / 2),
-  getAugmentationStats: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  purchaseAugmentation: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  softReset: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
-  installAugmentations: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
+  universityCourse: SF4Cost(RamCostConstants.SingularityFn1),
+  gymWorkout: SF4Cost(RamCostConstants.SingularityFn1),
+  travelToCity: SF4Cost(RamCostConstants.SingularityFn1),
+  goToLocation: SF4Cost(RamCostConstants.SingularityFn3),
+  purchaseTor: SF4Cost(RamCostConstants.SingularityFn1),
+  purchaseProgram: SF4Cost(RamCostConstants.SingularityFn1),
+  getCurrentServer: SF4Cost(RamCostConstants.SingularityFn1),
+  connect: SF4Cost(RamCostConstants.SingularityFn1),
+  manualHack: SF4Cost(RamCostConstants.SingularityFn1),
+  installBackdoor: SF4Cost(RamCostConstants.SingularityFn1),
+  getDarkwebProgramCost: SF4Cost(RamCostConstants.SingularityFn1 / 4),
+  getDarkwebPrograms: SF4Cost(RamCostConstants.SingularityFn1 / 4),
+  hospitalize: SF4Cost(RamCostConstants.SingularityFn1 / 4),
+  isBusy: SF4Cost(RamCostConstants.SingularityFn1 / 4),
+  stopAction: SF4Cost(RamCostConstants.SingularityFn1 / 2),
+  upgradeHomeRam: SF4Cost(RamCostConstants.SingularityFn2),
+  upgradeHomeCores: SF4Cost(RamCostConstants.SingularityFn2),
+  getUpgradeHomeRamCost: SF4Cost(RamCostConstants.SingularityFn2 / 2),
+  getUpgradeHomeCoresCost: SF4Cost(RamCostConstants.SingularityFn2 / 2),
+  workForCompany: SF4Cost(RamCostConstants.SingularityFn2),
+  applyToCompany: SF4Cost(RamCostConstants.SingularityFn2),
+  quitJob: SF4Cost(RamCostConstants.SingularityFn2),
+  getCompanyRep: SF4Cost(RamCostConstants.SingularityFn2 / 3),
+  getCompanyFavor: SF4Cost(RamCostConstants.SingularityFn2 / 3),
+  getCompanyFavorGain: SF4Cost(RamCostConstants.SingularityFn2 / 4),
+  checkFactionInvitations: SF4Cost(RamCostConstants.SingularityFn2),
+  joinFaction: SF4Cost(RamCostConstants.SingularityFn2),
+  workForFaction: SF4Cost(RamCostConstants.SingularityFn2),
+  getFactionRep: SF4Cost(RamCostConstants.SingularityFn2 / 3),
+  getFactionFavor: SF4Cost(RamCostConstants.SingularityFn2 / 3),
+  getFactionFavorGain: SF4Cost(RamCostConstants.SingularityFn2 / 4),
+  donateToFaction: SF4Cost(RamCostConstants.SingularityFn3),
+  createProgram: SF4Cost(RamCostConstants.SingularityFn3),
+  commitCrime: SF4Cost(RamCostConstants.SingularityFn3),
+  getCrimeChance: SF4Cost(RamCostConstants.SingularityFn3),
+  getCrimeStats: SF4Cost(RamCostConstants.SingularityFn3),
+  getOwnedAugmentations: SF4Cost(RamCostConstants.SingularityFn3),
+  getOwnedSourceFiles: SF4Cost(RamCostConstants.SingularityFn3),
+  getAugmentationsFromFaction: SF4Cost(RamCostConstants.SingularityFn3),
+  getAugmentationCost: SF4Cost(RamCostConstants.SingularityFn3),
+  getAugmentationPrereq: SF4Cost(RamCostConstants.SingularityFn3),
+  getAugmentationPrice: SF4Cost(RamCostConstants.SingularityFn3 / 2),
+  getAugmentationBasePrice: SF4Cost(RamCostConstants.SingularityFn3 / 2),
+  getAugmentationRepReq: SF4Cost(RamCostConstants.SingularityFn3 / 2),
+  getAugmentationStats: SF4Cost(RamCostConstants.SingularityFn3),
+  purchaseAugmentation: SF4Cost(RamCostConstants.SingularityFn3),
+  softReset: SF4Cost(RamCostConstants.SingularityFn3),
+  installAugmentations: SF4Cost(RamCostConstants.SingularityFn3),
   isFocused: SF4Cost(0.1),
   setFocus: SF4Cost(0.1),
-  exportGame: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 2),
-  exportGameBonus: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost / 4),
+  exportGame: SF4Cost(RamCostConstants.SingularityFn1 / 2),
+  exportGameBonus: SF4Cost(RamCostConstants.SingularityFn1 / 4),
   b1tflum3: SF4Cost(16),
   destroyW0r1dD43m0n: SF4Cost(32),
   getCurrentWork: SF4Cost(0.5),
@@ -210,119 +210,119 @@ const singularity = {
 
 // Gang API
 const gang = {
-  createGang: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  inGang: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  getMemberNames: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  getGangInformation: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getOtherGangInformation: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getMemberInformation: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  canRecruitMember: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  recruitMember: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getTaskNames: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  getTaskStats: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  setMemberTask: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getEquipmentNames: RamCostConstants.ScriptGangApiBaseRamCost / 4,
-  getEquipmentCost: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getEquipmentType: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getEquipmentStats: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  purchaseEquipment: RamCostConstants.ScriptGangApiBaseRamCost,
-  ascendMember: RamCostConstants.ScriptGangApiBaseRamCost,
-  getAscensionResult: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  setTerritoryWarfare: RamCostConstants.ScriptGangApiBaseRamCost / 2,
-  getChanceToWinClash: RamCostConstants.ScriptGangApiBaseRamCost,
+  createGang: RamCostConstants.GangApiBase / 4,
+  inGang: RamCostConstants.GangApiBase / 4,
+  getMemberNames: RamCostConstants.GangApiBase / 4,
+  getGangInformation: RamCostConstants.GangApiBase / 2,
+  getOtherGangInformation: RamCostConstants.GangApiBase / 2,
+  getMemberInformation: RamCostConstants.GangApiBase / 2,
+  canRecruitMember: RamCostConstants.GangApiBase / 4,
+  recruitMember: RamCostConstants.GangApiBase / 2,
+  getTaskNames: RamCostConstants.GangApiBase / 4,
+  getTaskStats: RamCostConstants.GangApiBase / 4,
+  setMemberTask: RamCostConstants.GangApiBase / 2,
+  getEquipmentNames: RamCostConstants.GangApiBase / 4,
+  getEquipmentCost: RamCostConstants.GangApiBase / 2,
+  getEquipmentType: RamCostConstants.GangApiBase / 2,
+  getEquipmentStats: RamCostConstants.GangApiBase / 2,
+  purchaseEquipment: RamCostConstants.GangApiBase,
+  ascendMember: RamCostConstants.GangApiBase,
+  getAscensionResult: RamCostConstants.GangApiBase / 2,
+  setTerritoryWarfare: RamCostConstants.GangApiBase / 2,
+  getChanceToWinClash: RamCostConstants.GangApiBase,
   getBonusTime: 0,
 } as const;
 
 // Bladeburner API
 const bladeburner = {
-  inBladeburner: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 4,
-  getContractNames: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 10,
-  getOperationNames: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 10,
-  getBlackOpNames: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 10,
-  getBlackOpRank: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 2,
-  getGeneralActionNames: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 10,
-  getSkillNames: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 10,
-  startAction: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  stopBladeburnerAction: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 2,
-  getCurrentAction: RamCostConstants.ScriptBladeburnerApiBaseRamCost / 4,
-  getActionTime: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionCurrentTime: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionEstimatedSuccessChance: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionRepGain: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionCountRemaining: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionMaxLevel: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionCurrentLevel: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getActionAutolevel: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  setActionAutolevel: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  setActionLevel: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getRank: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getSkillPoints: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getSkillLevel: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getSkillUpgradeCost: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  upgradeSkill: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getTeamSize: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  setTeamSize: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getCityEstimatedPopulation: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getCityCommunities: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getCityChaos: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getCity: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  switchCity: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  getStamina: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  joinBladeburnerFaction: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
-  joinBladeburnerDivision: RamCostConstants.ScriptBladeburnerApiBaseRamCost,
+  inBladeburner: RamCostConstants.BladeburnerApiBase / 4,
+  getContractNames: RamCostConstants.BladeburnerApiBase / 10,
+  getOperationNames: RamCostConstants.BladeburnerApiBase / 10,
+  getBlackOpNames: RamCostConstants.BladeburnerApiBase / 10,
+  getBlackOpRank: RamCostConstants.BladeburnerApiBase / 2,
+  getGeneralActionNames: RamCostConstants.BladeburnerApiBase / 10,
+  getSkillNames: RamCostConstants.BladeburnerApiBase / 10,
+  startAction: RamCostConstants.BladeburnerApiBase,
+  stopBladeburnerAction: RamCostConstants.BladeburnerApiBase / 2,
+  getCurrentAction: RamCostConstants.BladeburnerApiBase / 4,
+  getActionTime: RamCostConstants.BladeburnerApiBase,
+  getActionCurrentTime: RamCostConstants.BladeburnerApiBase,
+  getActionEstimatedSuccessChance: RamCostConstants.BladeburnerApiBase,
+  getActionRepGain: RamCostConstants.BladeburnerApiBase,
+  getActionCountRemaining: RamCostConstants.BladeburnerApiBase,
+  getActionMaxLevel: RamCostConstants.BladeburnerApiBase,
+  getActionCurrentLevel: RamCostConstants.BladeburnerApiBase,
+  getActionAutolevel: RamCostConstants.BladeburnerApiBase,
+  setActionAutolevel: RamCostConstants.BladeburnerApiBase,
+  setActionLevel: RamCostConstants.BladeburnerApiBase,
+  getRank: RamCostConstants.BladeburnerApiBase,
+  getSkillPoints: RamCostConstants.BladeburnerApiBase,
+  getSkillLevel: RamCostConstants.BladeburnerApiBase,
+  getSkillUpgradeCost: RamCostConstants.BladeburnerApiBase,
+  upgradeSkill: RamCostConstants.BladeburnerApiBase,
+  getTeamSize: RamCostConstants.BladeburnerApiBase,
+  setTeamSize: RamCostConstants.BladeburnerApiBase,
+  getCityEstimatedPopulation: RamCostConstants.BladeburnerApiBase,
+  getCityCommunities: RamCostConstants.BladeburnerApiBase,
+  getCityChaos: RamCostConstants.BladeburnerApiBase,
+  getCity: RamCostConstants.BladeburnerApiBase,
+  switchCity: RamCostConstants.BladeburnerApiBase,
+  getStamina: RamCostConstants.BladeburnerApiBase,
+  joinBladeburnerFaction: RamCostConstants.BladeburnerApiBase,
+  joinBladeburnerDivision: RamCostConstants.BladeburnerApiBase,
   getBonusTime: 0,
 } as const;
 
 const infiltration = {
-  getPossibleLocations: RamCostConstants.ScriptInfiltrationGetLocations,
-  getInfiltration: RamCostConstants.ScriptInfiltrationGetInfiltrations,
+  getPossibleLocations: RamCostConstants.InfiltrationGetLocations,
+  getInfiltration: RamCostConstants.InfiltrationGetInfiltrations,
 } as const;
 
 // Coding Contract API
 const codingcontract = {
-  attempt: RamCostConstants.ScriptCodingContractBaseRamCost,
-  getContractType: RamCostConstants.ScriptCodingContractBaseRamCost / 2,
-  getData: RamCostConstants.ScriptCodingContractBaseRamCost / 2,
-  getDescription: RamCostConstants.ScriptCodingContractBaseRamCost / 2,
-  getNumTriesRemaining: RamCostConstants.ScriptCodingContractBaseRamCost / 5,
-  createDummyContract: RamCostConstants.ScriptCodingContractBaseRamCost / 5,
-  getContractTypes: RamCostConstants.ScriptCodingContractBaseRamCost / 5,
+  attempt: RamCostConstants.CodingContractBase,
+  getContractType: RamCostConstants.CodingContractBase / 2,
+  getData: RamCostConstants.CodingContractBase / 2,
+  getDescription: RamCostConstants.CodingContractBase / 2,
+  getNumTriesRemaining: RamCostConstants.CodingContractBase / 5,
+  createDummyContract: RamCostConstants.CodingContractBase / 5,
+  getContractTypes: RamCostConstants.CodingContractBase / 5,
 } as const;
 
 // Duplicate Sleeve API
 const sleeve = {
-  getNumSleeves: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToShockRecovery: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToSynchronize: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToCommitCrime: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToUniversityCourse: RamCostConstants.ScriptSleeveBaseRamCost,
-  travel: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToCompanyWork: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToFactionWork: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToGymWorkout: RamCostConstants.ScriptSleeveBaseRamCost,
-  getTask: RamCostConstants.ScriptSleeveBaseRamCost,
-  getSleeve: RamCostConstants.ScriptSleeveBaseRamCost,
-  getSleeveAugmentations: RamCostConstants.ScriptSleeveBaseRamCost,
-  getSleevePurchasableAugs: RamCostConstants.ScriptSleeveBaseRamCost,
-  purchaseSleeveAug: RamCostConstants.ScriptSleeveBaseRamCost,
-  setToBladeburnerAction: RamCostConstants.ScriptSleeveBaseRamCost,
-  getSleeveAugmentationPrice: RamCostConstants.ScriptSleeveBaseRamCost,
-  getSleeveAugmentationRepReq: RamCostConstants.ScriptSleeveBaseRamCost,
+  getNumSleeves: RamCostConstants.SleeveBase,
+  setToShockRecovery: RamCostConstants.SleeveBase,
+  setToSynchronize: RamCostConstants.SleeveBase,
+  setToCommitCrime: RamCostConstants.SleeveBase,
+  setToUniversityCourse: RamCostConstants.SleeveBase,
+  travel: RamCostConstants.SleeveBase,
+  setToCompanyWork: RamCostConstants.SleeveBase,
+  setToFactionWork: RamCostConstants.SleeveBase,
+  setToGymWorkout: RamCostConstants.SleeveBase,
+  getTask: RamCostConstants.SleeveBase,
+  getSleeve: RamCostConstants.SleeveBase,
+  getSleeveAugmentations: RamCostConstants.SleeveBase,
+  getSleevePurchasableAugs: RamCostConstants.SleeveBase,
+  purchaseSleeveAug: RamCostConstants.SleeveBase,
+  setToBladeburnerAction: RamCostConstants.SleeveBase,
+  getSleeveAugmentationPrice: RamCostConstants.SleeveBase,
+  getSleeveAugmentationRepReq: RamCostConstants.SleeveBase,
 } as const;
 
 // Stanek API
 const stanek = {
-  giftWidth: RamCostConstants.ScriptStanekWidth,
-  giftHeight: RamCostConstants.ScriptStanekHeight,
-  chargeFragment: RamCostConstants.ScriptStanekCharge,
-  fragmentDefinitions: RamCostConstants.ScriptStanekFragmentDefinitions,
-  activeFragments: RamCostConstants.ScriptStanekPlacedFragments,
-  clearGift: RamCostConstants.ScriptStanekClear,
-  canPlaceFragment: RamCostConstants.ScriptStanekCanPlace,
-  placeFragment: RamCostConstants.ScriptStanekPlace,
-  getFragment: RamCostConstants.ScriptStanekFragmentAt,
-  removeFragment: RamCostConstants.ScriptStanekDeleteAt,
-  acceptGift: RamCostConstants.ScriptStanekAcceptGift,
+  giftWidth: RamCostConstants.StanekWidth,
+  giftHeight: RamCostConstants.StanekHeight,
+  chargeFragment: RamCostConstants.StanekCharge,
+  fragmentDefinitions: RamCostConstants.StanekFragmentDefinitions,
+  activeFragments: RamCostConstants.StanekPlacedFragments,
+  clearGift: RamCostConstants.StanekClear,
+  canPlaceFragment: RamCostConstants.StanekCanPlace,
+  placeFragment: RamCostConstants.StanekPlace,
+  getFragment: RamCostConstants.StanekFragmentAt,
+  removeFragment: RamCostConstants.StanekDeleteAt,
+  acceptGift: RamCostConstants.StanekAcceptGift,
 } as const;
 
 // UI API
@@ -347,73 +347,66 @@ const grafting = {
 } as const;
 
 const corporation = {
-  hasCorporation: 0,
-  getMaterialNames: 0,
-  getConstants: 0,
-  getIndustryTypes: 0,
-  getEmployeePositions: 0,
-  getUnlockables: 0,
-  getUpgradeNames: 0,
-  getResearchNames: 0,
-  createCorporation: 0,
-  hasUnlockUpgrade: 0,
-  getUnlockUpgradeCost: 0,
-  getUpgradeLevel: 0,
-  getUpgradeLevelCost: 0,
-  getExpandIndustryCost: 0,
-  getExpandCityCost: 0,
-  getInvestmentOffer: 0,
-  acceptInvestmentOffer: 0,
-  goPublic: 0,
-  bribe: 0,
-  getCorporation: 0,
-  getDivision: 0,
-  expandIndustry: 0,
-  expandCity: 0,
-  unlockUpgrade: 0,
-  levelUpgrade: 0,
-  issueDividends: 0,
-  issueNewShares: 0,
-  buyBackShares: 0,
-  sellShares: 0,
-  getBonusTime: 0,
-  sellMaterial: 0,
-  sellProduct: 0,
-  discontinueProduct: 0,
-  setSmartSupply: 0,
-  setSmartSupplyUseLeftovers: 0,
-  buyMaterial: 0,
-  bulkPurchase: 0,
-  getWarehouse: 0,
-  getProduct: 0,
-  getMaterial: 0,
-  setMaterialMarketTA1: 0,
-  setMaterialMarketTA2: 0,
-  setProductMarketTA1: 0,
-  setProductMarketTA2: 0,
-  exportMaterial: 0,
-  cancelExportMaterial: 0,
-  purchaseWarehouse: 0,
-  upgradeWarehouse: 0,
-  makeProduct: 0,
-  limitMaterialProduction: 0,
-  limitProductProduction: 0,
-  getPurchaseWarehouseCost: 0,
-  getUpgradeWarehouseCost: 0,
-  hasWarehouse: 0,
-  hireEmployee: 0,
-  upgradeOfficeSize: 0,
-  throwParty: 0,
-  buyCoffee: 0,
-  hireAdVert: 0,
-  research: 0,
-  getOffice: 0,
-  getHireAdVertCost: 0,
-  getHireAdVertCount: 0,
-  getResearchCost: 0,
-  hasResearched: 0,
-  setAutoJobAssignment: 0,
-  getOfficeSizeUpgradeCost: 0,
+  hasCorporation: 0, // This one is free
+  getConstants: RamCostConstants.Corporation,
+  getIndustryData: RamCostConstants.Corporation,
+  getMaterialData: RamCostConstants.Corporation,
+  issueNewShares: RamCostConstants.Corporation,
+  createCorporation: RamCostConstants.Corporation,
+  hasUnlockUpgrade: RamCostConstants.Corporation,
+  getUnlockUpgradeCost: RamCostConstants.Corporation,
+  getUpgradeLevel: RamCostConstants.Corporation,
+  getUpgradeLevelCost: RamCostConstants.Corporation,
+  getInvestmentOffer: RamCostConstants.Corporation,
+  acceptInvestmentOffer: RamCostConstants.Corporation,
+  goPublic: RamCostConstants.Corporation,
+  bribe: RamCostConstants.Corporation,
+  getCorporation: RamCostConstants.Corporation,
+  getDivision: RamCostConstants.Corporation,
+  expandIndustry: RamCostConstants.Corporation,
+  expandCity: RamCostConstants.Corporation,
+  unlockUpgrade: RamCostConstants.Corporation,
+  levelUpgrade: RamCostConstants.Corporation,
+  issueDividends: RamCostConstants.Corporation,
+  buyBackShares: RamCostConstants.Corporation,
+  sellShares: RamCostConstants.Corporation,
+  getBonusTime: RamCostConstants.Corporation,
+  sellMaterial: RamCostConstants.Corporation,
+  sellProduct: RamCostConstants.Corporation,
+  discontinueProduct: RamCostConstants.Corporation,
+  setSmartSupply: RamCostConstants.Corporation,
+  setSmartSupplyUseLeftovers: RamCostConstants.Corporation,
+  buyMaterial: RamCostConstants.Corporation,
+  bulkPurchase: RamCostConstants.Corporation,
+  getWarehouse: RamCostConstants.Corporation,
+  getProduct: RamCostConstants.Corporation,
+  getMaterial: RamCostConstants.Corporation,
+  setMaterialMarketTA1: RamCostConstants.Corporation,
+  setMaterialMarketTA2: RamCostConstants.Corporation,
+  setProductMarketTA1: RamCostConstants.Corporation,
+  setProductMarketTA2: RamCostConstants.Corporation,
+  exportMaterial: RamCostConstants.Corporation,
+  cancelExportMaterial: RamCostConstants.Corporation,
+  purchaseWarehouse: RamCostConstants.Corporation,
+  upgradeWarehouse: RamCostConstants.Corporation,
+  makeProduct: RamCostConstants.Corporation,
+  limitMaterialProduction: RamCostConstants.Corporation,
+  limitProductProduction: RamCostConstants.Corporation,
+  getUpgradeWarehouseCost: RamCostConstants.Corporation,
+  hasWarehouse: RamCostConstants.Corporation,
+  hireEmployee: RamCostConstants.Corporation,
+  upgradeOfficeSize: RamCostConstants.Corporation,
+  throwParty: RamCostConstants.Corporation,
+  buyCoffee: RamCostConstants.Corporation,
+  hireAdVert: RamCostConstants.Corporation,
+  research: RamCostConstants.Corporation,
+  getOffice: RamCostConstants.Corporation,
+  getHireAdVertCost: RamCostConstants.Corporation,
+  getHireAdVertCount: RamCostConstants.Corporation,
+  getResearchCost: RamCostConstants.Corporation,
+  hasResearched: RamCostConstants.Corporation,
+  setAutoJobAssignment: RamCostConstants.Corporation,
+  getOfficeSizeUpgradeCost: RamCostConstants.Corporation,
 } as const;
 
 /** RamCosts guaranteed to match ns structure 1:1 (aside from args and enums).
@@ -436,21 +429,21 @@ export const RamCosts: RamCostTree<NSFull> = {
 
   sprintf: 0,
   vsprintf: 0,
-  scan: RamCostConstants.ScriptScanRamCost,
-  hack: RamCostConstants.ScriptHackRamCost,
-  hackAnalyzeThreads: RamCostConstants.ScriptHackAnalyzeRamCost,
-  hackAnalyze: RamCostConstants.ScriptHackAnalyzeRamCost,
-  hackAnalyzeSecurity: RamCostConstants.ScriptHackAnalyzeRamCost,
-  hackAnalyzeChance: RamCostConstants.ScriptHackAnalyzeRamCost,
+  scan: RamCostConstants.Scan,
+  hack: RamCostConstants.Hack,
+  hackAnalyzeThreads: RamCostConstants.HackAnalyze,
+  hackAnalyze: RamCostConstants.HackAnalyze,
+  hackAnalyzeSecurity: RamCostConstants.HackAnalyze,
+  hackAnalyzeChance: RamCostConstants.HackAnalyze,
   sleep: 0,
   asleep: 0,
   share: 2.4,
   getSharePower: 0.2,
-  grow: RamCostConstants.ScriptGrowRamCost,
-  growthAnalyze: RamCostConstants.ScriptGrowthAnalyzeRamCost,
-  growthAnalyzeSecurity: RamCostConstants.ScriptGrowthAnalyzeRamCost,
-  weaken: RamCostConstants.ScriptWeakenRamCost,
-  weakenAnalyze: RamCostConstants.ScriptWeakenAnalyzeRamCost,
+  grow: RamCostConstants.Grow,
+  growthAnalyze: RamCostConstants.GrowthAnalyze,
+  growthAnalyzeSecurity: RamCostConstants.GrowthAnalyze,
+  weaken: RamCostConstants.Weaken,
+  weakenAnalyze: RamCostConstants.WeakenAnalyze,
   print: 0,
   printf: 0,
   tprint: 0,
@@ -461,53 +454,53 @@ export const RamCosts: RamCostTree<NSFull> = {
   isLogEnabled: 0,
   getScriptLogs: 0,
   hasTorRouter: 0.05,
-  nuke: RamCostConstants.ScriptPortProgramRamCost,
-  brutessh: RamCostConstants.ScriptPortProgramRamCost,
-  ftpcrack: RamCostConstants.ScriptPortProgramRamCost,
-  relaysmtp: RamCostConstants.ScriptPortProgramRamCost,
-  httpworm: RamCostConstants.ScriptPortProgramRamCost,
-  sqlinject: RamCostConstants.ScriptPortProgramRamCost,
-  run: RamCostConstants.ScriptRunRamCost,
-  exec: RamCostConstants.ScriptExecRamCost,
-  spawn: RamCostConstants.ScriptSpawnRamCost,
-  kill: RamCostConstants.ScriptKillRamCost,
-  killall: RamCostConstants.ScriptKillRamCost,
+  nuke: RamCostConstants.PortProgram,
+  brutessh: RamCostConstants.PortProgram,
+  ftpcrack: RamCostConstants.PortProgram,
+  relaysmtp: RamCostConstants.PortProgram,
+  httpworm: RamCostConstants.PortProgram,
+  sqlinject: RamCostConstants.PortProgram,
+  run: RamCostConstants.Run,
+  exec: RamCostConstants.Exec,
+  spawn: RamCostConstants.Spawn,
+  kill: RamCostConstants.Kill,
+  killall: RamCostConstants.Kill,
   exit: 0,
   atExit: 0,
-  scp: RamCostConstants.ScriptScpRamCost,
-  ls: RamCostConstants.ScriptScanRamCost,
-  ps: RamCostConstants.ScriptScanRamCost,
-  getRecentScripts: RamCostConstants.ScriptRecentScriptsRamCost,
-  hasRootAccess: RamCostConstants.ScriptHasRootAccessRamCost,
-  getHostname: RamCostConstants.ScriptGetHostnameRamCost,
-  getHackingLevel: RamCostConstants.ScriptGetHackingLevelRamCost,
-  getHackingMultipliers: 0.1,
-  getHacknetMultipliers: 0.1,
-  getBitNodeMultipliers: RamCostConstants.ScriptGetMultipliersRamCost,
-  getServer: RamCostConstants.ScriptGetMultipliersRamCost / 2,
-  getServerMoneyAvailable: RamCostConstants.ScriptGetServerRamCost,
-  getServerSecurityLevel: RamCostConstants.ScriptGetServerRamCost,
-  getServerBaseSecurityLevel: RamCostConstants.ScriptGetServerRamCost,
-  getServerMinSecurityLevel: RamCostConstants.ScriptGetServerRamCost,
-  getServerRequiredHackingLevel: RamCostConstants.ScriptGetServerRamCost,
-  getServerMaxMoney: RamCostConstants.ScriptGetServerRamCost,
-  getServerGrowth: RamCostConstants.ScriptGetServerRamCost,
-  getServerNumPortsRequired: RamCostConstants.ScriptGetServerRamCost,
-  getServerRam: RamCostConstants.ScriptGetServerRamCost,
-  getServerMaxRam: RamCostConstants.ScriptGetServerMaxRam,
-  getServerUsedRam: RamCostConstants.ScriptGetServerUsedRam,
-  serverExists: RamCostConstants.ScriptGetServerRamCost,
-  fileExists: RamCostConstants.ScriptFileExistsRamCost,
-  isRunning: RamCostConstants.ScriptIsRunningRamCost,
-  getPurchasedServerLimit: RamCostConstants.ScriptGetPurchasedServerLimit,
-  getPurchasedServerMaxRam: RamCostConstants.ScriptGetPurchasedServerMaxRam,
-  getPurchasedServerCost: RamCostConstants.ScriptGetPurchaseServerRamCost,
+  scp: RamCostConstants.Scp,
+  ls: RamCostConstants.Scan,
+  ps: RamCostConstants.Scan,
+  getRecentScripts: RamCostConstants.RecentScripts,
+  hasRootAccess: RamCostConstants.HasRootAccess,
+  getHostname: RamCostConstants.GetHostname,
+  getHackingLevel: RamCostConstants.GetHackingLevel,
+  getHackingMultipliers: 0.25,
+  getHacknetMultipliers: 0.25,
+  getBitNodeMultipliers: 4,
+  getServer: 2,
+  getServerMoneyAvailable: RamCostConstants.GetServer,
+  getServerSecurityLevel: RamCostConstants.GetServer,
+  getServerBaseSecurityLevel: RamCostConstants.GetServer,
+  getServerMinSecurityLevel: RamCostConstants.GetServer,
+  getServerRequiredHackingLevel: RamCostConstants.GetServer,
+  getServerMaxMoney: RamCostConstants.GetServer,
+  getServerGrowth: RamCostConstants.GetServer,
+  getServerNumPortsRequired: RamCostConstants.GetServer,
+  getServerRam: RamCostConstants.GetServer,
+  getServerMaxRam: RamCostConstants.GetServerMaxRam,
+  getServerUsedRam: RamCostConstants.GetServerUsedRam,
+  serverExists: RamCostConstants.GetServer,
+  fileExists: RamCostConstants.FileExists,
+  isRunning: RamCostConstants.IsRunning,
+  getPurchasedServerLimit: RamCostConstants.GetPurchasedServerLimit,
+  getPurchasedServerMaxRam: RamCostConstants.GetPurchasedServerMaxRam,
+  getPurchasedServerCost: RamCostConstants.GetPurchaseServer,
   getPurchasedServerUpgradeCost: 0.1,
   upgradePurchasedServer: 0.25,
   renamePurchasedServer: 2,
-  purchaseServer: RamCostConstants.ScriptPurchaseServerRamCost,
-  deleteServer: RamCostConstants.ScriptPurchaseServerRamCost,
-  getPurchasedServers: RamCostConstants.ScriptPurchaseServerRamCost,
+  purchaseServer: RamCostConstants.PurchaseServer,
+  deleteServer: RamCostConstants.PurchaseServer,
+  getPurchasedServers: RamCostConstants.PurchaseServer,
   write: 0,
   tryWritePort: 0,
   read: 0,
@@ -516,27 +509,27 @@ export const RamCosts: RamCostTree<NSFull> = {
   writePort: 0,
   readPort: 0,
   getPortHandle: 0,
-  rm: RamCostConstants.ScriptReadWriteRamCost,
-  scriptRunning: RamCostConstants.ScriptArbScriptRamCost,
-  scriptKill: RamCostConstants.ScriptArbScriptRamCost,
+  rm: RamCostConstants.ReadWrite,
+  scriptRunning: RamCostConstants.ArbScript,
+  scriptKill: RamCostConstants.ArbScript,
   getScriptName: 0,
-  getScriptRam: RamCostConstants.ScriptGetScriptRamCost,
-  getHackTime: RamCostConstants.ScriptGetHackTimeRamCost,
-  getGrowTime: RamCostConstants.ScriptGetHackTimeRamCost,
-  getWeakenTime: RamCostConstants.ScriptGetHackTimeRamCost,
-  getTotalScriptIncome: RamCostConstants.ScriptGetScriptRamCost,
-  getScriptIncome: RamCostConstants.ScriptGetScriptRamCost,
-  getTotalScriptExpGain: RamCostConstants.ScriptGetScriptRamCost,
-  getScriptExpGain: RamCostConstants.ScriptGetScriptRamCost,
-  getRunningScript: RamCostConstants.ScriptGetRunningScriptRamCost,
+  getScriptRam: RamCostConstants.GetScript,
+  getHackTime: RamCostConstants.GetHackTime,
+  getGrowTime: RamCostConstants.GetHackTime,
+  getWeakenTime: RamCostConstants.GetHackTime,
+  getTotalScriptIncome: RamCostConstants.GetScript,
+  getScriptIncome: RamCostConstants.GetScript,
+  getTotalScriptExpGain: RamCostConstants.GetScript,
+  getScriptExpGain: RamCostConstants.GetScript,
+  getRunningScript: RamCostConstants.GetRunningScript,
   nFormat: 0,
   tFormat: 0,
-  getTimeSinceLastAug: RamCostConstants.ScriptGetHackTimeRamCost,
+  getTimeSinceLastAug: RamCostConstants.GetHackTime,
   prompt: 0,
   wget: 0,
-  getFavorToDonate: RamCostConstants.ScriptGetFavorToDonate,
-  getPlayer: RamCostConstants.ScriptSingularityFn1RamCost / 4,
-  getMoneySources: RamCostConstants.ScriptGetMoneySourcesCost,
+  getFavorToDonate: RamCostConstants.GetFavorToDonate,
+  getPlayer: RamCostConstants.SingularityFn1 / 4,
+  getMoneySources: RamCostConstants.GetMoneySourcesCost,
   mv: 0,
   tail: 0,
   toast: 0,
diff --git a/src/Netscript/WorkerScript.ts b/src/Netscript/WorkerScript.ts
index de2d18d74..734a9f592 100644
--- a/src/Netscript/WorkerScript.ts
+++ b/src/Netscript/WorkerScript.ts
@@ -45,7 +45,7 @@ export class WorkerScript {
   dynamicLoadedFns: Record<string, boolean> = {};
 
   /** Tracks dynamic RAM usage */
-  dynamicRamUsage: number = RamCostConstants.ScriptBaseRamCost;
+  dynamicRamUsage: number = RamCostConstants.Base;
 
   /** Netscript Environment for this script */
   env: Environment;
diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts
index f714beee1..9eb997a74 100644
--- a/src/NetscriptFunctions.ts
+++ b/src/NetscriptFunctions.ts
@@ -61,7 +61,7 @@ import { NetscriptCorporation } from "./NetscriptFunctions/Corporation";
 import { NetscriptFormulas } from "./NetscriptFunctions/Formulas";
 import { NetscriptStockMarket } from "./NetscriptFunctions/StockMarket";
 import { NetscriptGrafting } from "./NetscriptFunctions/Grafting";
-import { NS, RecentScript, BasicHGWOptions, ProcessInfo, NSEnums } from "./ScriptEditor/NetscriptDefinitions";
+import { NS, RecentScript, BasicHGWOptions, ProcessInfo, NSEnums } from "@nsdefs";
 import { NetscriptSingularity } from "./NetscriptFunctions/Singularity";
 
 import { dialogBoxCreate } from "./ui/React/DialogBox";
@@ -77,18 +77,19 @@ import { INetscriptExtra } from "./NetscriptFunctions/Extra";
 import { ScriptDeath } from "./Netscript/ScriptDeath";
 import { getBitNodeMultipliers } from "./BitNode/BitNode";
 import { assert, arrayAssert, stringAssert, objectAssert } from "./utils/helpers/typeAssertion";
-import { CompanyPosName, CrimeType, GymType, LocationName, UniversityClassType } from "./utils/enums";
+import { CityName, JobName, CrimeType, GymType, LocationName, UniversityClassType } from "./Enums";
 import { cloneDeep } from "lodash";
-import { FactionWorkType } from "./utils/enums";
+import { FactionWorkType } from "./Enums";
 
 export const enums: NSEnums = {
-  toast: ToastVariant,
+  CityName,
   CrimeType,
   FactionWorkType,
   GymType,
-  UniversityClassType,
-  CompanyPosName,
   LocationName,
+  JobName,
+  ToastVariant,
+  UniversityClassType,
 };
 
 export type NSFull = Readonly<Omit<NS & INetscriptExtra, "pid" | "args">>;
@@ -129,7 +130,7 @@ export const ns: InternalAPI<NSFull> = {
     (ctx) =>
     (_hostname, opts = {}) => {
       const hostname = helpers.string(ctx, "hostname", _hostname);
-      // Todo: better type safety rework for functions using assertObjectType, then remove function.
+      // TODO 2.2: better type safety rework for functions using assertObjectType, then remove function.
       const optsValidator: BasicHGWOptions = {};
       assertObjectType(ctx, "opts", opts, optsValidator);
       return helpers.hack(ctx, hostname, false, { threads: opts.threads, stock: opts.stock });
@@ -1917,7 +1918,7 @@ function populateLayers(nsLayer: ExternalAPI<unknown>, currentLayers: string[] =
 populateLayers(wrappedNS);
 
 export function NetscriptFunctions(ws: WorkerScript): ExternalAPI<NSFull> {
-  //todo: better typing instead of relying on an any
+  //TODO unplanned: better typing instead of relying on an any
   const instance = new StampedLayer(ws, wrappedNS) as any;
   for (const layerLocation of layerLocations) {
     const key = layerLocation.pop() as string;
diff --git a/src/NetscriptFunctions/Bladeburner.ts b/src/NetscriptFunctions/Bladeburner.ts
index 6d251d55d..a99f8b9aa 100644
--- a/src/NetscriptFunctions/Bladeburner.ts
+++ b/src/NetscriptFunctions/Bladeburner.ts
@@ -1,11 +1,13 @@
 import { Player } from "@player";
 import { Bladeburner } from "../Bladeburner/Bladeburner";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
-import { Bladeburner as INetscriptBladeburner } from "../ScriptEditor/NetscriptDefinitions";
+import { Bladeburner as INetscriptBladeburner } from "@nsdefs";
 import { Action } from "src/Bladeburner/Action";
 import { InternalAPI, NetscriptContext } from "src/Netscript/APIWrapper";
 import { BlackOperation } from "../Bladeburner/BlackOperation";
 import { helpers } from "../Netscript/NetscriptHelpers";
+import { checkEnum } from "../utils/helpers/enum";
+import { CityName } from "../Enums";
 
 export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
   const checkBladeburnerAccess = function (ctx: NetscriptContext): void {
@@ -23,14 +25,6 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
     return bladeburner;
   };
 
-  const checkBladeburnerCity = function (ctx: NetscriptContext, city: string): void {
-    const bladeburner = Player.bladeburner;
-    if (bladeburner === null) throw new Error("Must have joined bladeburner");
-    if (!bladeburner.cities.hasOwnProperty(city)) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Invalid city: ${city}`);
-    }
-  };
-
   const getBladeburnerActionObject = function (ctx: NetscriptContext, type: string, name: string): Action {
     const bladeburner = Player.bladeburner;
     if (bladeburner === null) throw new Error("Must have joined bladeburner");
@@ -227,9 +221,9 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
     getSkillUpgradeCost:
       (ctx) =>
       (_skillName, _count = 1) => {
+        const bladeburner = getBladeburner(ctx);
         const skillName = helpers.string(ctx, "skillName", _skillName);
         const count = helpers.number(ctx, "count", _count);
-        const bladeburner = getBladeburner(ctx);
         try {
           return bladeburner.getSkillUpgradeCostNetscriptFn(skillName, count, ctx.workerScript);
         } catch (e: unknown) {
@@ -239,9 +233,9 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
     upgradeSkill:
       (ctx) =>
       (_skillName, _count = 1) => {
+        const bladeburner = getBladeburner(ctx);
         const skillName = helpers.string(ctx, "skillName", _skillName);
         const count = helpers.number(ctx, "count", _count);
-        const bladeburner = getBladeburner(ctx);
         try {
           return bladeburner.upgradeSkillNetscriptFn(skillName, count, ctx.workerScript);
         } catch (e: unknown) {
@@ -249,9 +243,9 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
         }
       },
     getTeamSize: (ctx) => (_type, _name) => {
+      const bladeburner = getBladeburner(ctx);
       const type = helpers.string(ctx, "type", _type);
       const name = helpers.string(ctx, "name", _name);
-      const bladeburner = getBladeburner(ctx);
       try {
         return bladeburner.getTeamSizeNetscriptFn(type, name, ctx.workerScript);
       } catch (e: unknown) {
@@ -259,10 +253,10 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       }
     },
     setTeamSize: (ctx) => (_type, _name, _size) => {
+      const bladeburner = getBladeburner(ctx);
       const type = helpers.string(ctx, "type", _type);
       const name = helpers.string(ctx, "name", _name);
       const size = helpers.number(ctx, "size", _size);
-      const bladeburner = getBladeburner(ctx);
       try {
         return bladeburner.setTeamSizeNetscriptFn(type, name, size, ctx.workerScript);
       } catch (e: unknown) {
@@ -270,27 +264,21 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       }
     },
     getCityEstimatedPopulation: (ctx) => (_cityName) => {
+      const bladeburner = getBladeburner(ctx);
       const cityName = helpers.string(ctx, "cityName", _cityName);
-      checkBladeburnerAccess(ctx);
-      checkBladeburnerCity(ctx, cityName);
-      const bladeburner = Player.bladeburner;
-      if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+      if (!checkEnum(CityName, cityName)) throw new Error(`Invalid city: ${cityName}`);
       return bladeburner.cities[cityName].popEst;
     },
     getCityCommunities: (ctx) => (_cityName) => {
+      const bladeburner = getBladeburner(ctx);
       const cityName = helpers.string(ctx, "cityName", _cityName);
-      checkBladeburnerAccess(ctx);
-      checkBladeburnerCity(ctx, cityName);
-      const bladeburner = Player.bladeburner;
-      if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+      if (!checkEnum(CityName, cityName)) throw new Error(`Invalid city: ${cityName}`);
       return bladeburner.cities[cityName].comms;
     },
     getCityChaos: (ctx) => (_cityName) => {
+      const bladeburner = getBladeburner(ctx);
       const cityName = helpers.string(ctx, "cityName", _cityName);
-      checkBladeburnerAccess(ctx);
-      checkBladeburnerCity(ctx, cityName);
-      const bladeburner = Player.bladeburner;
-      if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+      if (!checkEnum(CityName, cityName)) throw new Error(`Invalid city: ${cityName}`);
       return bladeburner.cities[cityName].chaos;
     },
     getCity: (ctx) => () => {
@@ -298,11 +286,9 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       return bladeburner.city;
     },
     switchCity: (ctx) => (_cityName) => {
+      const bladeburner = getBladeburner(ctx);
       const cityName = helpers.string(ctx, "cityName", _cityName);
-      checkBladeburnerAccess(ctx);
-      checkBladeburnerCity(ctx, cityName);
-      const bladeburner = Player.bladeburner;
-      if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+      if (!checkEnum(CityName, cityName)) throw new Error(`Invalid city: ${cityName}`);
       bladeburner.city = cityName;
       return true;
     },
diff --git a/src/NetscriptFunctions/CodingContract.ts b/src/NetscriptFunctions/CodingContract.ts
index cbd91a712..3a9790424 100644
--- a/src/NetscriptFunctions/CodingContract.ts
+++ b/src/NetscriptFunctions/CodingContract.ts
@@ -1,6 +1,6 @@
-import { Player as player } from "../Player";
+import { Player } from "@player";
 import { CodingContract } from "../CodingContracts";
-import { CodingContract as ICodingContract } from "../ScriptEditor/NetscriptDefinitions";
+import { CodingContract as ICodingContract } from "@nsdefs";
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 import { helpers } from "../Netscript/NetscriptHelpers";
 import { codingContractTypesMetadata } from "../data/codingcontracttypes";
@@ -33,7 +33,7 @@ export function NetscriptCodingContract(): InternalAPI<ICodingContract> {
 
       const serv = helpers.getServer(ctx, hostname);
       if (contract.isSolution(answerStr)) {
-        const reward = player.gainCodingContractReward(creward, contract.getDifficulty());
+        const reward = Player.gainCodingContractReward(creward, contract.getDifficulty());
         helpers.log(ctx, () => `Successfully completed Coding Contract '${filename}'. Reward: ${reward}`);
         serv.removeContract(filename);
         return reward;
diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts
index 684165f7f..c587d173c 100644
--- a/src/NetscriptFunctions/Corporation.ts
+++ b/src/NetscriptFunctions/Corporation.ts
@@ -6,17 +6,17 @@ import { Material } from "../Corporation/Material";
 import { Warehouse } from "../Corporation/Warehouse";
 import { Industry } from "../Corporation/Industry";
 import { Corporation } from "../Corporation/Corporation";
+import { cloneDeep, omit } from "lodash";
 
 import {
-  productInfo as NSProduct,
-  materialInfo as NSMaterial,
-  divisionInfo as NSDivisionInfo,
   Corporation as NSCorporation,
   Division as NSDivision,
   WarehouseAPI,
   OfficeAPI,
   InvestmentOffer,
-} from "../ScriptEditor/NetscriptDefinitions";
+  CorpResearchName,
+  CorpMaterialName,
+} from "@nsdefs";
 
 import {
   NewIndustry,
@@ -54,16 +54,16 @@ import {
 } from "../Corporation/Actions";
 import { CorporationUnlockUpgrades } from "../Corporation/data/CorporationUnlockUpgrades";
 import { CorporationUpgrades } from "../Corporation/data/CorporationUpgrades";
-import { EmployeePositions } from "../Corporation/EmployeePositions";
-import { IndustriesData, IndustryResearchTrees, IndustryType } from "../Corporation/IndustryData";
-import { CorporationConstants } from "../Corporation/data/Constants";
+import { EmployeePositions, IndustryType } from "../Corporation/data/Enums";
+import { IndustriesData, IndustryResearchTrees } from "../Corporation/IndustryData";
+import * as corpConstants from "../Corporation/data/Constants";
 import { ResearchMap } from "../Corporation/ResearchMap";
 import { Factions } from "../Faction/Factions";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
-import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
-import { assertEnumMember, helpers } from "../Netscript/NetscriptHelpers";
+import { InternalAPI, NetscriptContext, removedFunction } from "../Netscript/APIWrapper";
+import { assertMember, helpers } from "../Netscript/NetscriptHelpers";
 import { checkEnum } from "../utils/helpers/enum";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { MaterialInfo } from "../Corporation/MaterialInfo";
 
 export function NetscriptCorporation(): InternalAPI<NSCorporation> {
@@ -123,8 +123,8 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
   function getInvestmentOffer(): InvestmentOffer {
     const corporation = getCorporation();
     if (
-      corporation.fundingRound >= CorporationConstants.FundingRoundShares.length ||
-      corporation.fundingRound >= CorporationConstants.FundingRoundMultiplier.length ||
+      corporation.fundingRound >= corpConstants.fundingRoundShares.length ||
+      corporation.fundingRound >= corpConstants.fundingRoundMultiplier.length ||
       corporation.public
     )
       return {
@@ -133,10 +133,10 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         round: corporation.fundingRound + 1, // Make more readable
       }; // Don't throw an error here, no reason to have a second function to check if you can get investment.
     const val = corporation.valuation;
-    const percShares = CorporationConstants.FundingRoundShares[corporation.fundingRound];
-    const roundMultiplier = CorporationConstants.FundingRoundMultiplier[corporation.fundingRound];
+    const percShares = corpConstants.fundingRoundShares[corporation.fundingRound];
+    const roundMultiplier = corpConstants.fundingRoundMultiplier[corporation.fundingRound];
     const funding = val * percShares * roundMultiplier;
-    const investShares = Math.floor(CorporationConstants.INITIALSHARES * percShares);
+    const investShares = Math.floor(corpConstants.initialShares * percShares);
     return {
       funds: funding,
       shares: investShares,
@@ -147,16 +147,16 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
   function acceptInvestmentOffer(): boolean {
     const corporation = getCorporation();
     if (
-      corporation.fundingRound >= CorporationConstants.FundingRoundShares.length ||
-      corporation.fundingRound >= CorporationConstants.FundingRoundMultiplier.length ||
+      corporation.fundingRound >= corpConstants.fundingRoundShares.length ||
+      corporation.fundingRound >= corpConstants.fundingRoundMultiplier.length ||
       corporation.public
     )
       return false;
     const val = corporation.valuation;
-    const percShares = CorporationConstants.FundingRoundShares[corporation.fundingRound];
-    const roundMultiplier = CorporationConstants.FundingRoundMultiplier[corporation.fundingRound];
+    const percShares = corpConstants.fundingRoundShares[corporation.fundingRound];
+    const roundMultiplier = corpConstants.fundingRoundMultiplier[corporation.fundingRound];
     const funding = val * percShares * roundMultiplier;
-    const investShares = Math.floor(CorporationConstants.INITIALSHARES * percShares);
+    const investShares = Math.floor(corpConstants.initialShares * percShares);
     corporation.fundingRound++;
     corporation.addFunds(funding);
     corporation.numShares -= investShares;
@@ -177,7 +177,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     return true;
   }
 
-  function getResearchCost(division: Industry, researchName: string): number {
+  function getResearchCost(division: Industry, researchName: CorpResearchName): number {
     const researchTree = IndustryResearchTrees[division.type];
     if (researchTree === undefined) throw new Error(`No research tree for industry '${division.type}'`);
     const allResearch = researchTree.getAllNodes();
@@ -186,7 +186,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     return research.cost;
   }
 
-  function hasResearched(division: Industry, researchName: string): boolean {
+  function hasResearched(division: Industry, researchName: CorpResearchName): boolean {
     return division.researched[researchName] === undefined ? false : (division.researched[researchName] as boolean);
   }
 
@@ -202,7 +202,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     if (!info.offersWork()) return false;
     if (player.hasGangWith(factionName)) return false;
 
-    const repGain = amountCash / CorporationConstants.BribeToRepRatio;
+    const repGain = amountCash / corpConstants.bribeAmountPerReputation;
     faction.playerReputation += repGain;
     corporation.funds = corporation.funds - amountCash;
 
@@ -238,11 +238,9 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     return warehouse;
   }
 
-  function getMaterial(divisionName: string, cityName: string, materialName: string): Material {
+  function getMaterial(divisionName: string, cityName: CityName, materialName: CorpMaterialName): Material {
     const warehouse = getWarehouse(divisionName, cityName);
-    const matName = materialName.replace(/ /g, "");
-    const material = warehouse.materials[matName];
-    if (material === undefined) throw new Error(`Invalid material name: '${materialName}'`);
+    const material = warehouse.materials[materialName];
     return material;
   }
 
@@ -262,9 +260,9 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
   }
 
   function getSafeDivision(division: Industry): NSDivision {
-    const cities: string[] = [];
+    const cities: CityName[] = [];
     for (const office of Object.values(division.offices)) {
-      if (office === 0) continue;
+      if (!office) continue;
       cities.push(office.loc);
     }
 
@@ -274,7 +272,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       awareness: division.awareness,
       popularity: division.popularity,
       prodMult: division.prodMult,
-      research: division.sciResearch.qty,
+      research: division.sciResearch,
       lastCycleRevenue: division.lastCycleRevenue,
       lastCycleExpenses: division.lastCycleExpenses,
       thisCycleRevenue: division.thisCycleRevenue,
@@ -286,58 +284,6 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     };
   }
 
-  function getDivisionConstants(): Record<string, NSDivisionInfo> {
-    const divObject: Record<string, NSDivisionInfo> = {};
-    for (const [ind, type] of Object.entries(IndustryType)) {
-      divObject[ind] = {
-        type: type,
-        cost: IndustriesData[type].startingCost,
-        requiredMaterials: IndustriesData[type].reqMats,
-        makesMaterials: IndustriesData[type].prodMats ? true : false,
-        makesProducts: IndustriesData[type].product ? true : false,
-      };
-      if (divObject[ind].makesProducts) {
-        divObject[ind].productType = IndustriesData[type].product?.name;
-      }
-      if (divObject[ind].makesMaterials) {
-        divObject[ind].producedMaterials = IndustriesData[type].prodMats;
-      }
-    }
-    return divObject;
-  }
-
-  function getProductInfo(): Record<string, NSProduct> {
-    const prodsObject: Record<string, NSProduct> = {};
-    for (const [ind, type] of Object.entries(IndustryType)) {
-      if (typeof IndustriesData[type].product !== "undefined") {
-        prodsObject[ind] = {
-          requiredMaterials: Object.keys(IndustriesData[type].reqMats),
-          size: 0,
-          division: type,
-        };
-        prodsObject[ind].type = IndustriesData[type].product?.name;
-        let totSize = 0;
-        for (const mat of prodsObject[ind].requiredMaterials) {
-          totSize += MaterialInfo[mat][1];
-        }
-        prodsObject[ind].size = totSize;
-      }
-    }
-    return prodsObject;
-  }
-
-  function getMaterialInfo(): Record<string, NSMaterial> {
-    const matsObject: Record<string, NSMaterial> = {};
-    for (const [mat, info] of Object.entries(MaterialInfo)) {
-      matsObject[mat] = {
-        name: info[0],
-        size: info[1],
-        prodMult: info[2],
-      };
-    }
-    return matsObject;
-  }
-
   const warehouseAPI: InternalAPI<WarehouseAPI> = {
     getUpgradeWarehouseCost:
       (ctx) =>
@@ -357,7 +303,6 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const cityName = helpers.city(ctx, "cityName", _cityName);
       const division = getDivision(divisionName);
-      if (!(cityName in division.warehouses)) throw new Error(`Invalid city name '${cityName}'`);
       const warehouse = division.warehouses[cityName];
       return warehouse !== 0;
     },
@@ -374,11 +319,11 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         smartSupplyEnabled: warehouse.smartSupplyEnabled,
       };
     },
-    getMaterial: (ctx) => (_divisionName, _cityName, _materialName) => {
+    getMaterial: (ctx) => (_divisionName, _cityName, materialName) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const material = getMaterial(divisionName, cityName, materialName);
       const corporation = getCorporation();
       const exports = material.exp.map((e) => {
@@ -442,11 +387,11 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         }
         UpgradeWarehouse(corporation, getDivision(divisionName), getWarehouse(divisionName, cityName), amt);
       },
-    sellMaterial: (ctx) => (_divisionName, _cityName, _materialName, _amt, _price) => {
+    sellMaterial: (ctx) => (_divisionName, _cityName, materialName, _amt, _price) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const amt = helpers.string(ctx, "amt", _amt);
       const price = helpers.string(ctx, "price", _price);
       const material = getMaterial(divisionName, cityName, materialName);
@@ -481,11 +426,11 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         throw helpers.makeRuntimeErrorMsg(ctx, `You have not purchased the Smart Supply upgrade!`);
       SetSmartSupply(warehouse, enabled);
     },
-    setSmartSupplyUseLeftovers: (ctx) => (_divisionName, _cityName, _materialName, _enabled) => {
+    setSmartSupplyUseLeftovers: (ctx) => (_divisionName, _cityName, materialName, _enabled) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const enabled = !!_enabled;
       const warehouse = getWarehouse(divisionName, cityName);
       const material = getMaterial(divisionName, cityName, materialName);
@@ -493,25 +438,25 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         throw helpers.makeRuntimeErrorMsg(ctx, `You have not purchased the Smart Supply upgrade!`);
       SetSmartSupplyUseLeftovers(warehouse, material, enabled);
     },
-    buyMaterial: (ctx) => (_divisionName, _cityName, _materialName, _amt) => {
+    buyMaterial: (ctx) => (_divisionName, _cityName, materialName, _amt) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const amt = helpers.number(ctx, "amt", _amt);
       if (amt < 0 || !Number.isFinite(amt))
         throw new Error("Invalid value for amount field! Must be numeric and greater than 0");
       const material = getMaterial(divisionName, cityName, materialName);
       BuyMaterial(material, amt);
     },
-    bulkPurchase: (ctx) => (_divisionName, _cityName, _materialName, _amt) => {
+    bulkPurchase: (ctx) => (_divisionName, _cityName, materialName, _amt) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       if (!hasResearched(getDivision(divisionName), "Bulk Purchasing"))
         throw new Error(`You have not researched Bulk Purchasing in ${divisionName}`);
       const corporation = getCorporation();
       const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const amt = helpers.number(ctx, "amt", _amt);
       const warehouse = getWarehouse(divisionName, cityName);
       const material = getMaterial(divisionName, cityName, materialName);
@@ -539,13 +484,13 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     },
     exportMaterial:
       (ctx) =>
-      (_sourceDivision, sourceCity, _targetDivision, targetCity, _materialName, _amt): void => {
+      (_sourceDivision, sourceCity, _targetDivision, targetCity, materialName, _amt): void => {
         checkAccess(ctx, 7);
         const sourceDivision = helpers.string(ctx, "sourceDivision", _sourceDivision);
-        assertEnumMember(ctx, CityName, "City", "sourceCity", sourceCity);
+        assertMember(ctx, CityName, "City", "sourceCity", sourceCity);
         const targetDivision = helpers.string(ctx, "targetDivision", _targetDivision);
-        assertEnumMember(ctx, CityName, "City", "targetCity", targetCity);
-        const materialName = helpers.string(ctx, "materialName", _materialName);
+        assertMember(ctx, CityName, "City", "targetCity", targetCity);
+        assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
         const amt = helpers.string(ctx, "amt", _amt);
         ExportMaterial(
           targetDivision,
@@ -557,44 +502,39 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       },
     cancelExportMaterial:
       (ctx) =>
-      (_sourceDivision, sourceCity, _targetDivision, targetCity, _materialName, _amt): void => {
+      (_sourceDivision, sourceCity, _targetDivision, targetCity, materialName, _amt): void => {
         checkAccess(ctx, 7);
         const sourceDivision = helpers.string(ctx, "sourceDivision", _sourceDivision);
-        assertEnumMember(ctx, CityName, "City", "sourceCity", sourceCity);
+        assertMember(ctx, CityName, "City Name", "sourceCity", sourceCity);
         const targetDivision = helpers.string(ctx, "targetDivision", _targetDivision);
-        assertEnumMember(ctx, CityName, "City", "targetCity", targetCity);
-        const materialName = helpers.string(ctx, "materialName", _materialName);
+        assertMember(ctx, CityName, "City Name", "targetCity", targetCity);
+        assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
         const amt = helpers.string(ctx, "amt", _amt);
-        CancelExportMaterial(
-          targetDivision,
-          targetCity,
-          getMaterial(sourceDivision, sourceCity, materialName),
-          amt + "",
-        );
+        CancelExportMaterial(targetDivision, targetCity, getMaterial(sourceDivision, sourceCity, materialName), amt);
       },
-    limitMaterialProduction: (ctx) => (_divisionName, _cityName, _materialName, _qty) => {
+    limitMaterialProduction: (ctx) => (_divisionName, cityName, materialName, _qty) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
-      const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, CityName, "City Name", "cityName", cityName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const qty = helpers.number(ctx, "qty", _qty);
       LimitMaterialProduction(getMaterial(divisionName, cityName, materialName), qty);
     },
-    setMaterialMarketTA1: (ctx) => (_divisionName, _cityName, _materialName, _on) => {
+    setMaterialMarketTA1: (ctx) => (_divisionName, cityName, materialName, _on) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
-      const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, CityName, "City Name", "cityName", cityName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const on = !!_on;
       if (!getDivision(divisionName).hasResearch("Market-TA.I"))
         throw helpers.makeRuntimeErrorMsg(ctx, `You have not researched MarketTA.I for division: ${divisionName}`);
       SetMaterialMarketTA1(getMaterial(divisionName, cityName, materialName), on);
     },
-    setMaterialMarketTA2: (ctx) => (_divisionName, _cityName, _materialName, _on) => {
+    setMaterialMarketTA2: (ctx) => (_divisionName, cityName, materialName, _on) => {
       checkAccess(ctx, 7);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
-      const cityName = helpers.city(ctx, "cityName", _cityName);
-      const materialName = helpers.string(ctx, "materialName", _materialName);
+      assertMember(ctx, CityName, "City Name", "cityName", cityName);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
       const on = !!_on;
       if (!getDivision(divisionName).hasResearch("Market-TA.II"))
         throw helpers.makeRuntimeErrorMsg(ctx, `You have not researched MarketTA.II for division: ${divisionName}`);
@@ -633,16 +573,16 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const division = getDivision(divisionName);
       return division.numAdVerts;
     },
-    getResearchCost: (ctx) => (_divisionName, _researchName) => {
+    getResearchCost: (ctx) => (_divisionName, researchName) => {
       checkAccess(ctx, 8);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
-      const researchName = helpers.string(ctx, "researchName", _researchName);
+      assertMember(ctx, corpConstants.researchNames, "Research Name", "researchName", researchName);
       return getResearchCost(getDivision(divisionName), researchName);
     },
-    hasResearched: (ctx) => (_divisionName, _researchName) => {
+    hasResearched: (ctx) => (_divisionName, researchName) => {
       checkAccess(ctx, 8);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
-      const researchName = helpers.string(ctx, "researchName", _researchName);
+      assertMember(ctx, corpConstants.researchNames, "Research Name", "researchName", researchName);
       return hasResearched(getDivision(divisionName), researchName);
     },
     getOfficeSizeUpgradeCost: (ctx) => (_divisionName, _cityName, _size) => {
@@ -652,13 +592,13 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const size = helpers.number(ctx, "size", _size);
       if (size < 0) throw new Error("Invalid value for size field! Must be numeric and greater than 0");
       const office = getOffice(divisionName, cityName);
-      const initialPriceMult = Math.round(office.size / CorporationConstants.OfficeInitialSize);
+      const initialPriceMult = Math.round(office.size / corpConstants.officeInitialSize);
       const costMultiplier = 1.09;
       let mult = 0;
-      for (let i = 0; i < size / CorporationConstants.OfficeInitialSize; ++i) {
+      for (let i = 0; i < size / corpConstants.officeInitialSize; ++i) {
         mult += Math.pow(costMultiplier, initialPriceMult + i);
       }
-      return CorporationConstants.OfficeInitialCost * mult;
+      return corpConstants.officeInitialCost * mult;
     },
     setAutoJobAssignment: (ctx) => (_divisionName, _cityName, _job, _amount) => {
       checkAccess(ctx, 8);
@@ -721,10 +661,10 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const corporation = getCorporation();
       HireAdVert(corporation, getDivision(divisionName));
     },
-    research: (ctx) => (_divisionName, _researchName) => {
+    research: (ctx) => (_divisionName, researchName) => {
       checkAccess(ctx, 8);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
-      const researchName = helpers.string(ctx, "researchName", _researchName);
+      assertMember(ctx, corpConstants.researchNames, "Research Name", "reseatchName", researchName);
       Research(getDivision(divisionName), researchName);
     },
     getOffice: (ctx) => (_divisionName, _cityName) => {
@@ -751,30 +691,31 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     },
   };
 
-  return {
-    enums: {
-      EmployeePositions,
-      IndustryType,
-    },
+  // TODO 2.2: Add removed function error dialogs for all the functions removed/replaced by getConstants.
+  const corpFunctions: InternalAPI<NSCorporation> = {
     ...warehouseAPI,
     ...officeAPI,
     hasCorporation: () => () => !!Player.corporation,
     getConstants: (ctx) => () => {
       checkAccess(ctx);
-      return {
-        coffeeCost: 5e8,
-        states: [...CorporationConstants.AllCorporationStates],
-        bribeToRepRatio: CorporationConstants.BribeToRepRatio,
-        cityExpandCost: CorporationConstants.OfficeInitialCost,
-        warehousePurchaseCost: CorporationConstants.WarehouseInitialCost,
-        baseMaxProducts: CorporationConstants.BaseMaxProducts,
-        products: getProductInfo(),
-        materials: getMaterialInfo(),
-        unlocks: [...CorporationConstants.AllUnlocks],
-        upgrades: [...CorporationConstants.AllUpgrades],
-        researches: { base: [...CorporationConstants.BaseResearch], product: [...CorporationConstants.ProdResearch] },
-        divisions: getDivisionConstants(),
-      };
+      /* TODO 2.2: possibly just rework the whole corp constants structure to be more readable, and just use cloneDeep
+       *           to provide it directly to player.
+       * TODO 2.2: Roll product information into industriesData, there's no reason to look up a product separately */
+      return cloneDeep(omit(corpConstants, "fundingRoundShares", "fundingRoundMultiplier", "valuationLength"));
+      // TODO: add functions for getting materialInfo and research info
+    },
+    getIndustryData: (ctx) => (_industryName) => {
+      checkAccess(ctx);
+      const industryName = helpers.string(ctx, "industryName", _industryName);
+      if (!checkEnum(IndustryType, industryName)) {
+        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid industry: ${industryName}`);
+      }
+      return cloneDeep(IndustriesData[industryName]);
+    },
+    getMaterialData: (ctx) => (materialName) => {
+      checkAccess(ctx);
+      assertMember(ctx, corpConstants.materialNames, "Material Name", "materialName", materialName);
+      return cloneDeep(MaterialInfo[materialName]);
     },
     expandIndustry: (ctx) => (_industryName, _divisionName) => {
       checkAccess(ctx);
@@ -790,7 +731,6 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       checkAccess(ctx);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const cityName = helpers.city(ctx, "cityName", _cityName);
-      if (!CorporationConstants.Cities.includes(cityName)) throw new Error("Invalid city name");
       const corporation = getCorporation();
       const division = getDivision(divisionName);
       NewCity(corporation, division, cityName);
@@ -814,7 +754,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     issueDividends: (ctx) => (_rate) => {
       checkAccess(ctx);
       const rate = helpers.number(ctx, "rate", _rate);
-      const max = CorporationConstants.DividendMaxRate;
+      const max = corpConstants.dividendMaxRate;
       if (rate < 0 || rate > max)
         throw new Error(`Invalid value for rate field! Must be numeric, greater than 0, and less than ${max}`);
       const corporation = getCorporation();
@@ -858,9 +798,9 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         sharePrice: corporation.sharePrice,
         dividendRate: corporation.dividendRate,
         dividendTax: corporation.dividendTax,
-        dividendEarnings: corporation.getCycleDividends() / CorporationConstants.SecsPerMarketCycle,
+        dividendEarnings: corporation.getCycleDividends() / corpConstants.secondsPerMarketCycle,
         state: corporation.state.getState(),
-        divisions: corporation.divisions.map((division): string => division.name),
+        divisions: corporation.divisions.map((division) => division.name),
       };
     },
     createCorporation:
@@ -926,4 +866,19 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       return Math.round(getCorporation().storedCycles / 5) * 1000;
     },
   };
+  // TODO: More removedFunctions entries for old getter functions replaced by getConstants
+  Object.assign(corpFunctions, {
+    assignJob: removedFunction(
+      "v2.2.0",
+      "Corporation employees no longer exist as separate objects.\nUse corporation.setAutoJobAssignment instead to assign employees to jobs.",
+      true,
+    ),
+    getEmployee: removedFunction(
+      "v2.2.0",
+      "Corporation employees no longer exist as separate objects and this function no longer has a use.",
+      true,
+    ),
+    getDivisionConstants: removedFunction("v2.2.0", "ns.corporation.getIndustryData"),
+  });
+  return corpFunctions;
 }
diff --git a/src/NetscriptFunctions/Formulas.ts b/src/NetscriptFunctions/Formulas.ts
index 6699286bd..75a283745 100644
--- a/src/NetscriptFunctions/Formulas.ts
+++ b/src/NetscriptFunctions/Formulas.ts
@@ -26,7 +26,7 @@ import {
   calculateWeakenTime,
 } from "../Hacking";
 import { Programs } from "../Programs/Programs";
-import { Formulas as IFormulas, Player as IPlayer, Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
+import { Formulas as IFormulas, Player as IPlayer, Person as IPerson } from "@nsdefs";
 import {
   calculateRespectGain,
   calculateWantedLevelGain,
@@ -37,18 +37,18 @@ import {
 } from "../Gang/formulas/formulas";
 import { favorToRep as calculateFavorToRep, repToFavor as calculateRepToFavor } from "../Faction/formulas/favor";
 import { repFromDonation } from "../Faction/formulas/donation";
-import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
+import { InternalAPI, NetscriptContext, removedFunction } from "../Netscript/APIWrapper";
 import { helpers } from "../Netscript/NetscriptHelpers";
 import { calculateCrimeWorkStats } from "../Work/Formulas";
 import { calculateCompanyWorkStats } from "../Work/Formulas";
 import { Companies } from "../Company/Companies";
 import { calculateClassEarnings } from "../Work/Formulas";
 import { calculateFactionExp, calculateFactionRep } from "../Work/Formulas";
-import { FactionWorkType, GymType, UniversityClassType, LocationName } from "../utils/enums";
+import { FactionWorkType, GymType, UniversityClassType, LocationName, CityName } from "../Enums";
 
 import { defaultMultipliers } from "../PersonObjects/Multipliers";
 import { checkEnum, findEnumMember } from "../utils/helpers/enum";
-import { CompanyPosName } from "../utils/enums";
+import { JobName } from "../Enums";
 import { CompanyPositions } from "../Company/CompanyPositions";
 import { findCrime } from "../Crime/CrimeHelpers";
 
@@ -58,7 +58,7 @@ export function NetscriptFormulas(): InternalAPI<IFormulas> {
       throw helpers.makeRuntimeErrorMsg(ctx, `Requires Formulas.exe to run.`);
     }
   };
-  return {
+  const formulasFunctions: InternalAPI<IFormulas> = {
     mockServer: () => () => ({
       cpuCores: 0,
       ftpPortOpen: false,
@@ -92,7 +92,7 @@ export function NetscriptFormulas(): InternalAPI<IFormulas> {
       mults: defaultMultipliers(),
       numPeopleKilled: 0,
       money: 0,
-      city: "",
+      city: CityName.Sector12,
       location: "",
       bitNodeN: 0,
       totalPlaytime: 0,
@@ -107,7 +107,7 @@ export function NetscriptFormulas(): InternalAPI<IFormulas> {
       skills: { hacking: 0, strength: 0, defense: 0, dexterity: 0, agility: 0, charisma: 0, intelligence: 0 },
       exp: { hacking: 0, strength: 0, defense: 0, dexterity: 0, agility: 0, charisma: 0, intelligence: 0 },
       mults: defaultMultipliers(),
-      city: "",
+      city: CityName.Sector12,
     }),
     reputation: {
       calculateFavorToRep: (ctx) => (_favor) => {
@@ -397,7 +397,7 @@ export function NetscriptFormulas(): InternalAPI<IFormulas> {
       companyGains: (ctx) => (_person, _companyName, _positionName, _favor) => {
         checkFormulasAccess(ctx);
         const person = helpers.person(ctx, _person);
-        const positionName = findEnumMember(CompanyPosName, helpers.string(ctx, "_positionName", _positionName));
+        const positionName = findEnumMember(JobName, helpers.string(ctx, "_positionName", _positionName));
         if (!positionName) throw new Error(`Invalid company position: ${_positionName}`);
         const position = CompanyPositions[positionName];
         const companyName = helpers.string(ctx, "_companyName", _companyName);
@@ -408,4 +408,10 @@ export function NetscriptFormulas(): InternalAPI<IFormulas> {
       },
     },
   };
+  // Removed undocumented functions added using Object.assign because typescript.
+  // TODO: Remove these at 3.0
+  Object.assign(formulasFunctions.work, {
+    classGains: removedFunction("2.2.0", "formulas.work.universityGains or formulas.work.gymGains"),
+  });
+  return formulasFunctions;
 }
diff --git a/src/NetscriptFunctions/Gang.ts b/src/NetscriptFunctions/Gang.ts
index 5f36b1b75..9a68504f5 100644
--- a/src/NetscriptFunctions/Gang.ts
+++ b/src/NetscriptFunctions/Gang.ts
@@ -9,7 +9,7 @@ import { GangMember } from "../Gang/GangMember";
 import { GangMemberTask } from "../Gang/GangMemberTask";
 import { helpers } from "../Netscript/NetscriptHelpers";
 
-import { Gang as IGang, EquipmentStats, GangOtherInfoObject } from "../ScriptEditor/NetscriptDefinitions";
+import { Gang as IGang, EquipmentStats, GangOtherInfoObject } from "@nsdefs";
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 
 export function NetscriptGang(): InternalAPI<IGang> {
diff --git a/src/NetscriptFunctions/Grafting.ts b/src/NetscriptFunctions/Grafting.ts
index 7147141cc..2072a7e35 100644
--- a/src/NetscriptFunctions/Grafting.ts
+++ b/src/NetscriptFunctions/Grafting.ts
@@ -1,11 +1,11 @@
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 import { StaticAugmentations } from "../Augmentation/StaticAugmentations";
 import { hasAugmentationPrereqs } from "../Faction/FactionHelpers";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { GraftableAugmentation } from "../PersonObjects/Grafting/GraftableAugmentation";
 import { getGraftingAvailableAugs, calculateGraftingTimeWithBonus } from "../PersonObjects/Grafting/GraftingHelpers";
 import { Player as player } from "../Player";
-import { Grafting as IGrafting } from "../ScriptEditor/NetscriptDefinitions";
+import { Grafting as IGrafting } from "@nsdefs";
 import { Router } from "../ui/GameRoot";
 import { Page } from "../ui/Router";
 import { GraftingWork } from "../Work/GraftingWork";
diff --git a/src/NetscriptFunctions/Hacknet.ts b/src/NetscriptFunctions/Hacknet.ts
index 7f7d5d12f..119cca283 100644
--- a/src/NetscriptFunctions/Hacknet.ts
+++ b/src/NetscriptFunctions/Hacknet.ts
@@ -18,7 +18,7 @@ import { HashUpgrades } from "../Hacknet/HashUpgrades";
 import { HashUpgrade } from "../Hacknet/HashUpgrade";
 import { GetServer } from "../Server/AllServers";
 
-import { Hacknet as IHacknet, NodeStats } from "../ScriptEditor/NetscriptDefinitions";
+import { Hacknet as IHacknet, NodeStats } from "@nsdefs";
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 import { helpers } from "../Netscript/NetscriptHelpers";
 
diff --git a/src/NetscriptFunctions/Infiltration.ts b/src/NetscriptFunctions/Infiltration.ts
index 09bec5849..a6deecc34 100644
--- a/src/NetscriptFunctions/Infiltration.ts
+++ b/src/NetscriptFunctions/Infiltration.ts
@@ -1,4 +1,4 @@
-import { Infiltration as IInfiltration, InfiltrationLocation } from "../ScriptEditor/NetscriptDefinitions";
+import { Infiltration as IInfiltration, InfiltrationLocation } from "@nsdefs";
 import { Location } from "../Locations/Location";
 import { Locations } from "../Locations/Locations";
 import { calculateDifficulty, calculateReward } from "../Infiltration/formulas/game";
@@ -11,7 +11,7 @@ import { FactionNames } from "../Faction/data/FactionNames";
 import { Factions } from "../Faction/Factions";
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 import { checkEnum } from "../utils/helpers/enum";
-import { LocationName } from "../utils/enums";
+import { CityName, LocationName } from "../Enums";
 import { helpers } from "../Netscript/NetscriptHelpers";
 
 export function NetscriptInfiltration(): InternalAPI<IInfiltration> {
@@ -41,10 +41,12 @@ export function NetscriptInfiltration(): InternalAPI<IInfiltration> {
   };
   return {
     getPossibleLocations: () => () => {
-      return getLocationsWithInfiltrations.map((l) => ({
-        city: l.city ?? "",
-        name: String(l.name),
-      }));
+      return getLocationsWithInfiltrations
+        .filter((l) => l.city) //Guarantees no locations with a "null" entry, which should not be infiltratable anyway.
+        .map((l) => ({
+          city: l.city as CityName,
+          name: l.name,
+        }));
     },
     getInfiltration: (ctx) => (_location) => {
       const location = helpers.string(ctx, "location", _location);
diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts
index 1768dd82f..20e57953d 100644
--- a/src/NetscriptFunctions/Singularity.ts
+++ b/src/NetscriptFunctions/Singularity.ts
@@ -10,13 +10,12 @@ import { isString } from "../utils/helpers/isString";
 import { RunningScript } from "../Script/RunningScript";
 import { calculateAchievements } from "../Achievements/Achievements";
 
-import { Singularity as ISingularity } from "../ScriptEditor/NetscriptDefinitions";
+import { Singularity as ISingularity } from "@nsdefs";
 
 import { findCrime } from "../Crime/CrimeHelpers";
 import { CompanyPositions } from "../Company/CompanyPositions";
 import { DarkWebItems } from "../DarkWeb/DarkWebItems";
-import { CityName } from "../Locations/data/CityNames";
-import { LocationName } from "../utils/enums";
+import { CityName, LocationName } from "../Enums";
 import { Router } from "../ui/GameRoot";
 import { SpecialServers } from "../Server/data/SpecialServers";
 import { Page } from "../ui/Router";
@@ -44,7 +43,7 @@ import { FactionNames } from "../Faction/data/FactionNames";
 import { ClassWork } from "../Work/ClassWork";
 import { CreateProgramWork, isCreateProgramWork } from "../Work/CreateProgramWork";
 import { FactionWork } from "../Work/FactionWork";
-import { FactionWorkType, GymType, UniversityClassType } from "../utils/enums";
+import { FactionWorkType, GymType, UniversityClassType } from "../Enums";
 import { CompanyWork } from "../Work/CompanyWork";
 import { canGetBonus, onExport } from "../ExportBonus";
 import { saveObject } from "../SaveObject";
@@ -1178,6 +1177,9 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       (_nextBN, _callbackScript = "") => {
         helpers.checkSingularityAccess(ctx);
         const nextBN = helpers.number(ctx, "nextBN", _nextBN);
+        if (nextBN > 13 || nextBN < 1 || !Number.isInteger(nextBN)) {
+          throw new Error(`Invalid bitnode specified: ${_nextBN}`);
+        }
         const callbackScript = helpers.string(ctx, "callbackScript", _callbackScript);
 
         const wd = GetServer(SpecialServers.WorldDaemon);
diff --git a/src/NetscriptFunctions/Sleeve.ts b/src/NetscriptFunctions/Sleeve.ts
index 3e4b87678..f469e1129 100644
--- a/src/NetscriptFunctions/Sleeve.ts
+++ b/src/NetscriptFunctions/Sleeve.ts
@@ -1,12 +1,12 @@
 import { Player } from "@player";
 import { StaticAugmentations } from "../Augmentation/StaticAugmentations";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { findCrime } from "../Crime/CrimeHelpers";
 import { Augmentation } from "../Augmentation/Augmentation";
 
-import { Sleeve } from "../ScriptEditor/NetscriptDefinitions";
+import { Sleeve } from "@nsdefs";
 import { checkEnum } from "../utils/helpers/enum";
-import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
+import { InternalAPI, NetscriptContext, removedFunction } from "../Netscript/APIWrapper";
 import { isSleeveBladeburnerWork } from "../PersonObjects/Sleeve/Work/SleeveBladeburnerWork";
 import { isSleeveFactionWork } from "../PersonObjects/Sleeve/Work/SleeveFactionWork";
 import { isSleeveCompanyWork } from "../PersonObjects/Sleeve/Work/SleeveCompanyWork";
@@ -31,7 +31,7 @@ export function NetscriptSleeve(): InternalAPI<Sleeve> {
     }
   };
 
-  return {
+  const sleeveFunctions: InternalAPI<Sleeve> = {
     getNumSleeves: (ctx) => () => {
       checkSleeveAPIAccess(ctx);
       return Player.sleeves.length;
@@ -254,4 +254,11 @@ export function NetscriptSleeve(): InternalAPI<Sleeve> {
       return Player.sleeves[sleeveNumber].bladeburner(action, contract);
     },
   };
+  // Removed undocumented functions added using Object.assign because typescript.
+  // TODO: Remove these at 3.0
+  Object.assign(sleeveFunctions, {
+    getSleeveStats: removedFunction("2.2.0", "sleeve.getSleeve"),
+    getSleeveInformation: removedFunction("2.2.0", "sleeve.getSleeve"),
+  });
+  return sleeveFunctions;
 }
diff --git a/src/NetscriptFunctions/Stanek.ts b/src/NetscriptFunctions/Stanek.ts
index 459594559..dd8d41e30 100644
--- a/src/NetscriptFunctions/Stanek.ts
+++ b/src/NetscriptFunctions/Stanek.ts
@@ -4,7 +4,7 @@ import { staneksGift } from "../CotMG/Helper";
 import { Fragments, FragmentById } from "../CotMG/Fragment";
 import { FragmentType } from "../CotMG/FragmentType";
 
-import { Stanek as IStanek } from "../ScriptEditor/NetscriptDefinitions";
+import { Stanek as IStanek } from "@nsdefs";
 import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
 import { NetscriptContext, InternalAPI } from "../Netscript/APIWrapper";
 import { applyAugmentation } from "../Augmentation/AugmentationHelpers";
diff --git a/src/NetscriptFunctions/StockMarket.ts b/src/NetscriptFunctions/StockMarket.ts
index 5db8b948a..4de4d3a8d 100644
--- a/src/NetscriptFunctions/StockMarket.ts
+++ b/src/NetscriptFunctions/StockMarket.ts
@@ -12,7 +12,7 @@ import {
   getStockMarketTixApiCost,
 } from "../StockMarket/StockMarketCosts";
 import { Stock } from "../StockMarket/Stock";
-import { StockOrder, TIX } from "../ScriptEditor/NetscriptDefinitions";
+import { StockOrder, TIX } from "@nsdefs";
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 import { helpers } from "../Netscript/NetscriptHelpers";
 
diff --git a/src/NetscriptFunctions/UserInterface.ts b/src/NetscriptFunctions/UserInterface.ts
index cf7306030..1fa7e635f 100644
--- a/src/NetscriptFunctions/UserInterface.ts
+++ b/src/NetscriptFunctions/UserInterface.ts
@@ -1,4 +1,4 @@
-import { UserInterface as IUserInterface } from "../ScriptEditor/NetscriptDefinitions";
+import { UserInterface as IUserInterface } from "@nsdefs";
 import { Settings } from "../Settings/Settings";
 import { ThemeEvents } from "../Themes/ui/Theme";
 import { defaultTheme } from "../Themes/Themes";
diff --git a/src/NetscriptJSEvaluator.ts b/src/NetscriptJSEvaluator.ts
index 6fbae4fb7..dc43556d3 100644
--- a/src/NetscriptJSEvaluator.ts
+++ b/src/NetscriptJSEvaluator.ts
@@ -78,10 +78,8 @@ function shouldCompile(script: Script, scripts: Script[]): boolean {
 // - scripts -- all the scripts available on this server
 // - seen -- The modules above this one -- to prevent mutual dependency.
 //
-// TODO We don't make any effort to cache a given module when it is imported at
-// different parts of the tree. That hasn't presented any problem with during
-// testing, but it might be an idea for the future. Would require a topo-sort
-// then url-izing from leaf-most to root-most.
+// TODO 2.3 consider: Possibly reusing modules when imported in different locations. Per previous notes, this may
+// require a topo-sort then url-izing from leaf-most to root-most.
 /**
  * @param {Script} script
  * @param {Script[]} scripts
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index a9844ff6c..09d5de014 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -58,7 +58,7 @@ async function startNetscript2Script(workerScript: WorkerScript): Promise<void>
   const ns = workerScript.env.vars;
 
   if (!loadedModule) throw `${script.filename} cannot be run because the script module won't load`;
-  // TODO: Better error for "unexpected reserved word" when using await in non-async function?
+  // TODO unplanned: Better error for "unexpected reserved word" when using await in non-async function?
   if (typeof loadedModule.main !== "function")
     throw `${script.filename} cannot be run because it does not have a main function.`;
   if (!ns) throw `${script.filename} cannot be run because the NS object hasn't been constructed properly.`;
@@ -79,7 +79,7 @@ async function startNetscript1Script(workerScript: WorkerScript): Promise<void>
     throw `Error processing Imports in ${workerScript.name}@${workerScript.hostname}:\n\n${e}`;
   }
 
-  //TODO: Make NS1 wrapping type safe instead of using BasicObject
+  //TODO unplanned: Make NS1 wrapping type safe instead of using BasicObject.
   type BasicObject = Record<string, any>;
   function wrapNS1Layer(int: Interpreter, intLayer: unknown, nsLayer = wrappedNS as BasicObject) {
     for (const [name, entry] of Object.entries(nsLayer)) {
diff --git a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
index d9358ff19..fb800d44a 100644
--- a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
+++ b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
@@ -7,7 +7,7 @@ import { AugmentationNames } from "../../../Augmentation/data/AugmentationNames"
 import { StaticAugmentations } from "../../../Augmentation/StaticAugmentations";
 import { CONSTANTS } from "../../../Constants";
 import { hasAugmentationPrereqs } from "../../../Faction/FactionHelpers";
-import { LocationName } from "../../../utils/enums";
+import { LocationName } from "../../../Enums";
 import { Locations } from "../../../Locations/Locations";
 import { PurchaseAugmentationsOrderSetting } from "../../../Settings/SettingEnums";
 import { Settings } from "../../../Settings/Settings";
diff --git a/src/PersonObjects/Person.ts b/src/PersonObjects/Person.ts
index c398d574d..e8a0f7d2e 100644
--- a/src/PersonObjects/Person.ts
+++ b/src/PersonObjects/Person.ts
@@ -1,11 +1,11 @@
 import * as personMethods from "./PersonMethods";
 import { PlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { calculateSkill } from "./formulas/skill";
 import { defaultMultipliers } from "./Multipliers";
 import { Skills } from "./Skills";
 import { HP } from "./HP";
-import { Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { IReviverValue } from "../utils/JSONReviver";
 
 // Base class representing a person-like object
diff --git a/src/PersonObjects/PersonMethods.ts b/src/PersonObjects/PersonMethods.ts
index 94bd5e8d3..e19d0bb27 100644
--- a/src/PersonObjects/PersonMethods.ts
+++ b/src/PersonObjects/PersonMethods.ts
@@ -2,7 +2,7 @@ import { Person } from "./Person";
 import { calculateSkill } from "./formulas/skill";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { Player } from "@player";
-import { WorkStats } from "../ScriptEditor/NetscriptDefinitions";
+import { WorkStats } from "@nsdefs";
 
 export function gainHackingExp(this: Person, exp: number): void {
   if (isNaN(exp)) {
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index d7b7d0c03..3c0a19e34 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -10,7 +10,7 @@ import { Sleeve } from "../Sleeve/Sleeve";
 import { PlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
 import { Exploit } from "../../Exploits/Exploit";
 
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { Corporation } from "../../Corporation/Corporation";
 import { Gang } from "../../Gang/Gang";
 import { Bladeburner } from "../../Bladeburner/Bladeburner";
@@ -26,7 +26,7 @@ import { getRandomInt } from "../../utils/helpers/getRandomInt";
 import { CONSTANTS } from "../../Constants";
 import { Work } from "src/Work/Work";
 import { Person } from "../Person";
-import { Player as IPlayer } from "../../ScriptEditor/NetscriptDefinitions";
+import { Player as IPlayer } from "@nsdefs";
 
 export class PlayerObject extends Person implements IPlayer {
   // Player-specific properties
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
index 400e58331..b3da61ad3 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
@@ -10,7 +10,7 @@ import { getNextCompanyPositionHelper } from "../../Company/GetNextCompanyPositi
 import { getJobRequirementText } from "../../Company/GetJobRequirementText";
 import { CompanyPositions } from "../../Company/CompanyPositions";
 import { CompanyPosition } from "../../Company/CompanyPosition";
-import * as posNames from "../../Company/data/companypositionnames";
+import * as posNames from "../../Company/data/JobTracks";
 import { CONSTANTS } from "../../Constants";
 import { Programs } from "../../Programs/Programs";
 import { Exploit } from "../../Exploits/Exploit";
@@ -19,8 +19,7 @@ import { Factions } from "../../Faction/Factions";
 import { resetGangs } from "../../Gang/AllGangs";
 import { Cities } from "../../Locations/Cities";
 import { Locations } from "../../Locations/Locations";
-import { CityName } from "../../Locations/data/CityNames";
-import { LocationName } from "../../utils/enums";
+import { CityName, LocationName } from "../../Enums";
 import { Sleeve } from "../Sleeve/Sleeve";
 import { isSleeveCompanyWork } from "../Sleeve/Work/SleeveCompanyWork";
 import { calculateSkillProgress as calculateSkillProgressF, ISkillProgress } from "../formulas/skill";
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 583911d07..36a0a185e 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -18,16 +18,13 @@ import { CompanyPosition } from "../../Company/CompanyPosition";
 import { CompanyPositions } from "../../Company/CompanyPositions";
 import { Contracts } from "../../Bladeburner/data/Contracts";
 import { CONSTANTS } from "../../Constants";
-import { CrimeType, GymType, UniversityClassType } from "../../utils/enums";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName, CrimeType, GymType, LocationName, UniversityClassType } from "../../Enums";
 
 import { Factions } from "../../Faction/Factions";
 
-import { LocationName } from "../../utils/enums";
-
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../utils/JSONReviver";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { FactionWorkType } from "../../utils/enums";
+import { FactionWorkType } from "../../Enums";
 import { Work } from "./Work/Work";
 import { SleeveClassWork } from "./Work/SleeveClassWork";
 import { ClassType } from "../../Work/ClassWork";
@@ -40,7 +37,7 @@ import { SleeveSupportWork } from "./Work/SleeveSupportWork";
 import { SleeveBladeburnerWork } from "./Work/SleeveBladeburnerWork";
 import { SleeveCrimeWork } from "./Work/SleeveCrimeWork";
 import * as sleeveMethods from "./SleeveMethods";
-import { SleevePerson } from "../../ScriptEditor/NetscriptDefinitions";
+import { SleevePerson } from "@nsdefs";
 
 export class Sleeve extends Person implements SleevePerson {
   currentWork: Work | null = null;
diff --git a/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts b/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
index 3674eb28f..398b4a4d2 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
@@ -1,11 +1,11 @@
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { applySleeveGains, Work, WorkType } from "./Work";
 import { ClassType } from "../../../Work/ClassWork";
-import { LocationName } from "../../../utils/enums";
+import { LocationName } from "../../../Enums";
 import { calculateClassEarnings } from "../../../Work/Formulas";
 import { Sleeve } from "../Sleeve";
 import { scaleWorkStats, WorkStats } from "../../../Work/WorkStats";
-import { GymType, UniversityClassType } from "../../../utils/enums";
+import { GymType, UniversityClassType } from "../../../Enums";
 import { checkEnum } from "../../../utils/helpers/enum";
 
 export const isSleeveClassWork = (w: Work | null): w is SleeveClassWork => w !== null && w.type === WorkType.CLASS;
diff --git a/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
index d2af314a9..5df7fd808 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
@@ -1,7 +1,7 @@
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applySleeveGains, Work, WorkType } from "./Work";
-import { LocationName } from "../../../utils/enums";
+import { LocationName } from "../../../Enums";
 import { Companies } from "../../../Company/Companies";
 import { Company } from "../../../Company/Company";
 import { calculateCompanyWorkStats } from "../../../Work/Formulas";
diff --git a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts
index 87446656f..4886291c8 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts
@@ -2,7 +2,7 @@ import { Player } from "@player";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applySleeveGains, Work, WorkType } from "./Work";
-import { CrimeType } from "../../../utils/enums";
+import { CrimeType } from "../../../Enums";
 import { Crimes } from "../../../Crime/Crimes";
 import { Crime } from "../../../Crime/Crime";
 import { scaleWorkStats, WorkStats } from "../../../Work/WorkStats";
diff --git a/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts b/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts
index 413d4bc37..26c547687 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts
@@ -2,7 +2,7 @@ import { Player } from "@player";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applySleeveGains, Work, WorkType } from "./Work";
-import { FactionWorkType } from "../../../utils/enums";
+import { FactionWorkType } from "../../../Enums";
 import { FactionNames } from "../../../Faction/data/FactionNames";
 import { Factions } from "../../../Faction/Factions";
 import { calculateFactionExp, calculateFactionRep } from "../../../Work/Formulas";
diff --git a/src/PersonObjects/Sleeve/Work/Work.ts b/src/PersonObjects/Sleeve/Work/Work.ts
index 8e3e3e7db..3e31c35a5 100644
--- a/src/PersonObjects/Sleeve/Work/Work.ts
+++ b/src/PersonObjects/Sleeve/Work/Work.ts
@@ -2,7 +2,7 @@ import { Player } from "@player";
 import { IReviverValue } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applyWorkStatsExp, WorkStats } from "../../../Work/WorkStats";
-import { SleeveTask } from "src/ScriptEditor/NetscriptDefinitions";
+import { SleeveTask } from "@nsdefs";
 
 export const applySleeveGains = (sleeve: Sleeve, shockedStats: WorkStats, mult = 1): void => {
   applyWorkStatsExp(sleeve, shockedStats, mult);
diff --git a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
index 11e5879b9..94ebbbaca 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
@@ -1,6 +1,6 @@
 import { Box, Button, Paper, Tooltip, Typography } from "@mui/material";
 import React, { useState } from "react";
-import { FactionWorkType } from "../../../utils/enums";
+import { FactionWorkType } from "../../../Enums";
 import { CONSTANTS } from "../../../Constants";
 import { Player } from "@player";
 import { numeralWrapper } from "../../../ui/numeralFormat";
@@ -21,7 +21,7 @@ import { isSleeveSupportWork } from "../Work/SleeveSupportWork";
 import { isSleeveBladeburnerWork } from "../Work/SleeveBladeburnerWork";
 import { isSleeveCrimeWork } from "../Work/SleeveCrimeWork";
 import { findCrime } from "../../../Crime/CrimeHelpers";
-import { CrimeType } from "../../../utils/enums";
+import { CrimeType } from "../../../Enums";
 
 interface IProps {
   sleeve: Sleeve;
diff --git a/src/PersonObjects/Sleeve/ui/TaskSelector.tsx b/src/PersonObjects/Sleeve/ui/TaskSelector.tsx
index c4c9f01c7..50baa6c73 100644
--- a/src/PersonObjects/Sleeve/ui/TaskSelector.tsx
+++ b/src/PersonObjects/Sleeve/ui/TaskSelector.tsx
@@ -2,8 +2,7 @@ import React, { useState } from "react";
 import { Sleeve } from "../Sleeve";
 import { Player } from "@player";
 import { Crimes } from "../../../Crime/Crimes";
-import { LocationName } from "../../../utils/enums";
-import { CityName } from "../../../Locations/data/CityNames";
+import { CityName, LocationName } from "../../../Enums";
 import { Factions } from "../../../Faction/Factions";
 import Select, { SelectChangeEvent } from "@mui/material/Select";
 import MenuItem from "@mui/material/MenuItem";
@@ -17,7 +16,7 @@ import { isSleeveClassWork } from "../Work/SleeveClassWork";
 import { isSleeveInfiltrateWork } from "../Work/SleeveInfiltrateWork";
 import { isSleeveSupportWork } from "../Work/SleeveSupportWork";
 import { isSleeveCrimeWork } from "../Work/SleeveCrimeWork";
-import { CrimeType, FactionWorkType, GymType, UniversityClassType } from "../../../utils/enums";
+import { CrimeType, FactionWorkType, GymType, UniversityClassType } from "../../../Enums";
 import { checkEnum } from "../../../utils/helpers/enum";
 
 const universitySelectorOptions: string[] = [
diff --git a/src/PersonObjects/Sleeve/ui/TravelModal.tsx b/src/PersonObjects/Sleeve/ui/TravelModal.tsx
index 8881e66db..f8765eba0 100644
--- a/src/PersonObjects/Sleeve/ui/TravelModal.tsx
+++ b/src/PersonObjects/Sleeve/ui/TravelModal.tsx
@@ -3,7 +3,7 @@ import { Sleeve } from "../Sleeve";
 import { CONSTANTS } from "../../../Constants";
 import { Money } from "../../../ui/React/Money";
 import { WorldMap } from "../../../ui/React/WorldMap";
-import { CityName } from "../../../Locations/data/CityNames";
+import { CityName } from "../../../Enums";
 import { Settings } from "../../../Settings/Settings";
 import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 import { Player } from "@player";
diff --git a/src/PersonObjects/formulas/reputation.ts b/src/PersonObjects/formulas/reputation.ts
index 21a2e579d..21f4bc3f5 100644
--- a/src/PersonObjects/formulas/reputation.ts
+++ b/src/PersonObjects/formulas/reputation.ts
@@ -1,7 +1,7 @@
 import { CONSTANTS } from "../../Constants";
 import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
 import { CalculateShareMult } from "../../NetworkShare/Share";
-import { Person as IPerson } from "../../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { calculateIntelligenceBonus } from "./intelligence";
 
 function mult(favor: number): number {
diff --git a/src/Prestige.ts b/src/Prestige.ts
index 504859d3c..b0d669aec 100755
--- a/src/Prestige.ts
+++ b/src/Prestige.ts
@@ -1,5 +1,5 @@
 import { FactionNames } from "./Faction/data/FactionNames";
-import { CityName } from "./Locations/data/CityNames";
+import { CityName } from "./Enums";
 import { StaticAugmentations } from "./Augmentation/StaticAugmentations";
 import { augmentationExists, initAugmentations } from "./Augmentation/AugmentationHelpers";
 import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
diff --git a/src/SaveObject.tsx b/src/SaveObject.tsx
index 8c7c0e776..7951d18e1 100755
--- a/src/SaveObject.tsx
+++ b/src/SaveObject.tsx
@@ -26,7 +26,7 @@ import { save } from "./db";
 import { AwardNFG, v1APIBreak } from "./utils/v1APIBreak";
 import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
 import { PlayerOwnedAugmentation } from "./Augmentation/PlayerOwnedAugmentation";
-import { LocationName } from "./utils/enums";
+import { LocationName } from "./Enums";
 import { PlayerObject } from "./PersonObjects/Player/PlayerObject";
 import { pushGameSaved } from "./Electron";
 import { defaultMonacoTheme } from "./ScriptEditor/ui/themes";
diff --git a/src/Script/RamCalculations.ts b/src/Script/RamCalculations.ts
index 58b2cdc17..214a27334 100644
--- a/src/Script/RamCalculations.ts
+++ b/src/Script/RamCalculations.ts
@@ -104,10 +104,8 @@ function parseOnlyRamCalculate(otherScripts: Script[], code: string): RamCalcula
 
     // Finally, walk the reference map and generate a ram cost. The initial set of keys to scan
     // are those that start with __SPECIAL_INITIAL_MODULE__.
-    let ram = RamCostConstants.ScriptBaseRamCost;
-    const detailedCosts: RamUsageEntry[] = [
-      { type: "misc", name: "baseCost", cost: RamCostConstants.ScriptBaseRamCost },
-    ];
+    let ram = RamCostConstants.Base;
+    const detailedCosts: RamUsageEntry[] = [{ type: "misc", name: "baseCost", cost: RamCostConstants.Base }];
     const unresolvedRefs = Object.keys(dependencyMap).filter((s) => s.startsWith(initialModule));
     const resolvedRefs = new Set();
     const loadedFns: Record<string, boolean> = {};
@@ -117,20 +115,16 @@ function parseOnlyRamCalculate(otherScripts: Script[], code: string): RamCalcula
 
       // Check if this is one of the special keys, and add the appropriate ram cost if so.
       if (ref === "hacknet" && !resolvedRefs.has("hacknet")) {
-        ram += RamCostConstants.ScriptHacknetNodesRamCost;
-        detailedCosts.push({ type: "ns", name: "hacknet", cost: RamCostConstants.ScriptHacknetNodesRamCost });
+        ram += RamCostConstants.HacknetNodes;
+        detailedCosts.push({ type: "ns", name: "hacknet", cost: RamCostConstants.HacknetNodes });
       }
       if (ref === "document" && !resolvedRefs.has("document")) {
-        ram += RamCostConstants.ScriptDomRamCost;
-        detailedCosts.push({ type: "dom", name: "document", cost: RamCostConstants.ScriptDomRamCost });
+        ram += RamCostConstants.Dom;
+        detailedCosts.push({ type: "dom", name: "document", cost: RamCostConstants.Dom });
       }
       if (ref === "window" && !resolvedRefs.has("window")) {
-        ram += RamCostConstants.ScriptDomRamCost;
-        detailedCosts.push({ type: "dom", name: "window", cost: RamCostConstants.ScriptDomRamCost });
-      }
-      if (ref === "corporation" && !resolvedRefs.has("corporation")) {
-        ram += RamCostConstants.ScriptCorporationRamCost;
-        detailedCosts.push({ type: "ns", name: "corporation", cost: RamCostConstants.ScriptCorporationRamCost });
+        ram += RamCostConstants.Dom;
+        detailedCosts.push({ type: "dom", name: "window", cost: RamCostConstants.Dom });
       }
 
       resolvedRefs.add(ref);
@@ -196,6 +190,10 @@ function parseOnlyRamCalculate(otherScripts: Script[], code: string): RamCalcula
         continue;
       }
     }
+    if (ram > RamCostConstants.Max) {
+      ram = RamCostConstants.Max;
+      detailedCosts.push({ type: "misc", name: "Max Ram Cap", cost: RamCostConstants.Max });
+    }
     return { cost: ram, entries: detailedCosts.filter((e) => e.cost > 0) };
   } catch (error) {
     // console.info("parse or eval error: ", error);
diff --git a/src/Script/ScriptModule.ts b/src/Script/ScriptModule.ts
index 825e73772..f10d9b06c 100644
--- a/src/Script/ScriptModule.ts
+++ b/src/Script/ScriptModule.ts
@@ -1,6 +1,6 @@
 import { NSFull } from "../NetscriptFunctions";
 import { ExternalAPI } from "../Netscript/APIWrapper";
-import { AutocompleteData } from "../ScriptEditor/NetscriptDefinitions";
+import { AutocompleteData } from "@nsdefs";
 
 export interface ScriptModule {
   main?: (ns: ExternalAPI<NSFull>) => unknown;
diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts
index 6b2f676bb..8c9521edf 100644
--- a/src/ScriptEditor/NetscriptDefinitions.d.ts
+++ b/src/ScriptEditor/NetscriptDefinitions.d.ts
@@ -1,3 +1,6 @@
+/* TODO: remove ns1-specific documentation for all functions, and just create a basic doc somewhere that says how to
+ *       convert examples for use in .script files (e.g. no async/await, var instead of let/const, etc). */
+
 /** @public */
 interface HP {
   current: number;
@@ -15,7 +18,7 @@ interface Skills {
   intelligence: number;
 }
 
-// TODO: provide same treatment to CodingContractData as for SleeveTask
+// TODO: provide same treatment to CodingContractData as for SleeveTask (actual types)
 /**
  * Coding contract data will differ depending on coding contract.
  * @public
@@ -37,7 +40,7 @@ interface Person {
   skills: Skills;
   exp: Skills;
   mults: Multipliers;
-  city: string;
+  city: CityName;
 }
 
 /** @public */
@@ -1035,20 +1038,8 @@ export interface TIX {
    * 1. TIX API Access
    *
    * @example
-   * ```ts
-   * // NS1
-   * stock.getPrice("FSIG");
-   *
-   * // Choose the first stock symbol from the array of stock symbols.  Get the price
-   * // of the corresponding stock.
-   * var sym = stock.getSymbols()[0];
-   * tprint("Stock symbol: " + sym);
-   * tprint("Stock price: " + stock.getPrice(sym));
-   * ```
-   * @example
-   * ```ts
-   * // NS2
-   * ns.stock.getPrice("FSIG");
+   * ```js
+   * const fourSigmaStockPrice = ns.stock.getPrice("FSIG");
    *
    * // Choose the first stock symbol from the array of stock symbols.  Get the price
    * // of the corresponding stock.
@@ -1531,7 +1522,7 @@ export interface Singularity {
    * @param city - City to travel to.
    * @returns True if action is successful, false otherwise.
    */
-  travelToCity(city: string): boolean;
+  travelToCity(city: CityName | `${CityName}`): boolean;
 
   /**
    * Purchase the TOR router.
@@ -1947,7 +1938,7 @@ export interface Singularity {
    *
    * This function returns the number of milliseconds it takes to attempt the
    * specified crime (e.g It takes 60 seconds to attempt the ‘Rob Store’ crime,
-   * so running `commitCrime('ROBSTORE')` will return 60,000).
+   * so running `commitCrime('Rob Store')` will return 60,000).
    *
    * @param crime - Name of crime to attempt.
    * @param focus - Acquire player focus on this crime. Optional. Defaults to true.
@@ -3039,10 +3030,10 @@ export interface Bladeburner {
    * Returns the estimated number of Synthoids in the specified city,
    * or -1 if an invalid city was specified.
    *
-   * @param cityName - Name of city. Case-sensitive
+   * @param city - Name of city. Case-sensitive
    * @returns Estimated number of Synthoids in the specified city.
    */
-  getCityEstimatedPopulation(name: string): number;
+  getCityEstimatedPopulation(city: CityName | `${CityName}`): number;
 
   /**
    * Get number of communities in a city.
@@ -3052,10 +3043,10 @@ export interface Bladeburner {
    * Returns the estimated number of Synthoid communities in the specified city,
    * or -1 if an invalid city was specified.
    *
-   * @param cityName - Name of city. Case-sensitive
+   * @param city - Name of city. Case-sensitive
    * @returns Number of Synthoids communities in the specified city.
    */
-  getCityCommunities(name: string): number;
+  getCityCommunities(city: CityName | `${CityName}`): number;
 
   /**
    * Get chaos of a city.
@@ -3065,10 +3056,10 @@ export interface Bladeburner {
    * Returns the chaos in the specified city,
    * or -1 if an invalid city was specified.
    *
-   * @param cityName - Name of city. Case-sensitive
+   * @param city - Name of city. Case-sensitive
    * @returns Chaos in the specified city.
    */
-  getCityChaos(name: string): number;
+  getCityChaos(city: CityName | `${CityName}`): number;
 
   /**
    * Get current city.
@@ -3079,7 +3070,7 @@ export interface Bladeburner {
    *
    * @returns City that the player is currently in (for Bladeburner).
    */
-  getCity(): string;
+  getCity(): CityName;
 
   /**
    * Travel to another city in bladeburner.
@@ -3089,10 +3080,10 @@ export interface Bladeburner {
    *
    * Returns true if successful, and false otherwise
    *
-   * @param cityName - Name of city. Case-sensitive
+   * @param city - Name of city. Case-sensitive
    * @returns true if successful, and false otherwise
    */
-  switchCity(name: string): boolean;
+  switchCity(city: CityName | `${CityName}`): boolean;
 
   /**
    * Get bladeburner stamina.
@@ -3628,23 +3619,12 @@ export interface Sleeve {
    *
    * @example
    * ```ts
-   * // NS1
-   * // Assign the first 3 sleeves to commit various crimes.
-   * var crime = ["MUG", "ROBSTORE", "SHOPLIFT"];
-   * for (var i = 0; i < crime.length; i++) {
-   *     tprintf("Sleeve %d commits crime: %s", i, crime[i]);
-   *     sleeve.setToCommitCrime(i, crime[i]);
-   * }
-   * ```
-   * @example
-   * ```ts
-   * // NS2
-   * // Assign the first 3 sleeves to commit various crimes.
-   * const crime = ["MUG", "ROBSTORE", "SHOPLIFT"];
-   * for (let i = 0; i < crime.length; i++) {
-   *     ns.tprintf("Sleeve %d commits crime: %s", i, crime[i]);
-   *     ns.sleeve.setToCommitCrime(i, crime[i]);
-   * }
+   * // Assigns the first sleeve to Homicide.
+   * ns.sleeve.setToCommitCrime(0, "Homicide");
+   *
+   * // Assigns the second sleeve to Grand Theft Auto, using enum
+   * const crimes = ns.enums.CrimeType;
+   * ns.sleeve.setToCommitCrime(1, crimes.grandTheftAuto)
    * ```
    *
    * @param sleeveNumber - Index of the sleeve to start committing crime. Sleeves are numbered starting from 0.
@@ -3720,10 +3700,10 @@ export interface Sleeve {
    * Return a boolean indicating whether or not the sleeve reached destination.
    *
    * @param sleeveNumber - Index of the sleeve to travel.
-   * @param cityName - Name of the destination city.
+   * @param city - Name of the destination city.
    * @returns True if the sleeve reached destination, false otherwise.
    */
-  travel(sleeveNumber: number, cityName: string): boolean;
+  travel(sleeveNumber: number, city: CityName | `${CityName}`): boolean;
 
   /**
    * Get augmentations installed on a sleeve.
@@ -3907,12 +3887,7 @@ interface WorkFormulas {
   /** @returns The WorkStats applied every game cycle (200ms) by performing the specified faction work. */
   factionGains(person: Person, workType: FactionWorkType | `${FactionWorkType}`, favor: number): WorkStats;
   /** @returns The WorkStats applied every game cycle (200ms) by performing the specified company work. */
-  companyGains(
-    person: Person,
-    companyName: string,
-    workType: CompanyPosName | `${CompanyPosName}`,
-    favor: number,
-  ): WorkStats;
+  companyGains(person: Person, companyName: string, workType: JobName | `${JobName}`, favor: number): WorkStats;
 }
 
 /**
@@ -4343,8 +4318,8 @@ interface InfiltrationReward {
 
 /** @public */
 interface ILocation {
-  city: string;
-  name: string;
+  city: CityName;
+  name: LocationName;
 }
 
 /** @public */
@@ -5775,7 +5750,7 @@ export interface NS {
   /**
    * Get hacking related multipliers.
    * @remarks
-   * RAM cost: 4 GB
+   * RAM cost: 0.25 GB
    *
    * Returns an object containing the Player’s hacking related multipliers.
    * These multipliers are returned in fractional forms, not percentages
@@ -5804,7 +5779,7 @@ export interface NS {
   /**
    * Get hacknet related multipliers.
    * @remarks
-   * RAM cost: 4 GB
+   * RAM cost: 0.25 GB
    *
    * Returns an object containing the Player’s hacknet related multipliers.
    * These multipliers are returned in fractional forms, not percentages
@@ -6968,76 +6943,74 @@ declare enum GymType {
 }
 
 /** @public */
-declare enum CompanyPosName {
-  sw0 = "Software Engineering Intern",
-  sw1 = "Junior Software Engineer",
-  sw2 = "Senior Software Engineer",
-  sw3 = "Lead Software Developer",
-  sw4 = "Head of Software",
-  sw5 = "Head of Engineering",
-  sw6 = "Vice President of Technology",
-  sw7 = "Chief Technology Officer",
+declare enum JobName {
+  software0 = "Software Engineering Intern",
+  software1 = "Junior Software Engineer",
+  software2 = "Senior Software Engineer",
+  software3 = "Lead Software Developer",
+  software4 = "Head of Software",
+  software5 = "Head of Engineering",
+  software6 = "Vice President of Technology",
+  software7 = "Chief Technology Officer",
   IT0 = "IT Intern",
   IT1 = "IT Analyst",
   IT2 = "IT Manager",
   IT3 = "Systems Administrator",
-  secEng = "Security Engineer",
-  netEng0 = "Network Engineer",
-  netEng1 = "Network Administrator",
-  bus0 = "Business Intern",
-  bus1 = "Business Analyst",
-  bus2 = "Business Manager",
-  bus3 = "Operations Manager",
-  bus4 = "Chief Financial Officer",
-  bus5 = "Chief Executive Officer",
-  sec0 = "Police Officer",
-  sec1 = "Police Chief",
-  sec2 = "Security Guard",
-  sec3 = "Security Officer",
-  sec4 = "Security Supervisor",
-  sec5 = "Head of Security",
+  securityEng = "Security Engineer",
+  networkEng0 = "Network Engineer",
+  networkEng1 = "Network Administrator",
+  business0 = "Business Intern",
+  business1 = "Business Analyst",
+  business2 = "Business Manager",
+  business3 = "Operations Manager",
+  business4 = "Chief Financial Officer",
+  business5 = "Chief Executive Officer",
+  security0 = "Police Officer",
+  security1 = "Police Chief",
+  security2 = "Security Guard",
+  security3 = "Security Officer",
+  security4 = "Security Supervisor",
+  security5 = "Head of Security",
   agent0 = "Field Agent",
   agent1 = "Secret Agent",
   agent2 = "Special Operative",
   waiter = "Waiter",
   employee = "Employee",
-  softCons0 = "Software Consultant",
-  softCons1 = "Senior Software Consultant",
-  busCons0 = "Business Consultant",
-  busCons1 = "Senior Business Consultant",
+  softwareConsult0 = "Software Consultant",
+  softwareConsult1 = "Senior Software Consultant",
+  businessConsult0 = "Business Consultant",
+  businessConsult1 = "Senior Business Consultant",
   waiterPT = "Part-time Waiter",
   employeePT = "Part-time Employee",
 }
 
-// CORP ENUMS
+// CORP ENUMS - Changed to types
 /** @public */
-declare enum EmployeePositions {
-  Operations = "Operations",
-  Engineer = "Engineer",
-  Business = "Business",
-  Management = "Management",
-  RandD = "Research & Development",
-  Training = "Training",
-  Unassigned = "Unassigned",
-}
+type CorpEmployeePosition =
+  | "Operations"
+  | "Engineer"
+  | "Business"
+  | "Management"
+  | "Research & Development"
+  | "Training"
+  | "Unassigned";
 
 /** @public */
-declare enum IndustryType {
-  Energy = "Energy",
-  Utilities = "Water Utilities",
-  Agriculture = "Agriculture",
-  Fishing = "Fishing",
-  Mining = "Mining",
-  Food = "Food",
-  Tobacco = "Tobacco",
-  Chemical = "Chemical",
-  Pharmaceutical = "Pharmaceutical",
-  Computers = "Computer Hardware",
-  Robotics = "Robotics",
-  Software = "Software",
-  Healthcare = "Healthcare",
-  RealEstate = "RealEstate",
-}
+type CorpIndustryName =
+  | "Energy"
+  | "Water Utilities"
+  | "Agriculture"
+  | "Fishing"
+  | "Mining"
+  | "Food"
+  | "Tobacco"
+  | "Chemical"
+  | "Pharmaceutical"
+  | "Computer Hardware"
+  | "Robotics"
+  | "Software"
+  | "Healthcare"
+  | "Real Estate";
 
 /** Names of all cities
  * @public */
@@ -7120,13 +7093,14 @@ declare enum LocationName {
 
 /** @public */
 export type NSEnums = {
-  toast: typeof ToastVariant;
+  CityName: typeof CityName;
   CrimeType: typeof CrimeType;
   FactionWorkType: typeof FactionWorkType;
   GymType: typeof GymType;
-  UniversityClassType: typeof UniversityClassType;
-  CompanyPosName: typeof CompanyPosName;
+  JobName: typeof JobName;
   LocationName: typeof LocationName;
+  ToastVariant: typeof ToastVariant;
+  UniversityClassType: typeof UniversityClassType;
 };
 
 /**
@@ -7140,37 +7114,33 @@ export interface OfficeAPI {
   /**
    * Hire an employee.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param employeePosition - Position to place into. Defaults to "Unassigned".
    * @returns True if an employee was hired, false otherwise
    */
-  hireEmployee(
-    divisionName: string,
-    cityName: string,
-    employeePosition?: EmployeePositions | `${EmployeePositions}`,
-  ): boolean;
+  hireEmployee(divisionName: string, city: CityName | `${CityName}`, employeePosition?: CorpEmployeePosition): boolean;
   /**
    * Upgrade office size.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param size - Amount of positions to open
    */
-  upgradeOfficeSize(divisionName: string, cityName: string, size: number): void;
+  upgradeOfficeSize(divisionName: string, city: CityName | `${CityName}`, size: number): void;
   /**
    * Throw a party for your employees
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param costPerEmployee - Amount to spend per employee.
    * @returns Multiplier for happiness and morale, or zero on failure
    */
-  throwParty(divisionName: string, cityName: string, costPerEmployee: number): number;
+  throwParty(divisionName: string, city: CityName | `${CityName}`, costPerEmployee: number): number;
   /**
    * Buy coffee for your employees
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @returns true if buying coffee was successful, false otherwise
    */
-  buyCoffee(divisionName: string, cityName: string): boolean;
+  buyCoffee(divisionName: string, city: CityName | `${CityName}`): boolean;
   /**
    * Hire AdVert.
    * @param divisionName - Name of the division
@@ -7185,10 +7155,10 @@ export interface OfficeAPI {
   /**
    * Get data about an office
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @returns Office data
    */
-  getOffice(divisionName: string, cityName: string): Office;
+  getOffice(divisionName: string, city: CityName | `${CityName}`): Office;
   /**
    * Get the cost to hire AdVert.
    * @param divisionName - Name of the division.
@@ -7218,20 +7188,20 @@ export interface OfficeAPI {
   /**
    * Set the auto job assignment for a job
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param job - Name of the job
    * @param amount - Number of employees to assign to that job
    * @returns true if the employee count reached the target amount, false if not
    */
-  setAutoJobAssignment(divisionName: string, cityName: string, job: string, amount: number): boolean;
+  setAutoJobAssignment(divisionName: string, city: CityName | `${CityName}`, job: string, amount: number): boolean;
   /**
    * Cost to Upgrade office size.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param size - Amount of positions to open
    * @returns Cost of upgrading the office
    */
-  getOfficeSizeUpgradeCost(divisionName: string, cityName: string, asize: number): number;
+  getOfficeSizeUpgradeCost(divisionName: string, city: CityName | `${CityName}`, asize: number): number;
 }
 
 /**
@@ -7244,16 +7214,22 @@ export interface WarehouseAPI {
   /**
    * Set material sell data.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @param amt - Amount to sell, can be "MAX"
    * @param price - Price to sell, can be "MP"
    */
-  sellMaterial(divisionName: string, cityName: string, materialName: string, amt: string, price: string): void;
+  sellMaterial(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    amt: string,
+    price: string,
+  ): void;
   /**
    * Set product sell data.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param productName - Name of the product
    * @param amt - Amount to sell, can be "MAX"
    * @param price - Price to sell, can be "MP"
@@ -7261,7 +7237,7 @@ export interface WarehouseAPI {
    */
   sellProduct(
     divisionName: string,
-    cityName: string,
+    city: CityName | `${CityName}`,
     productName: string,
     amt: string,
     price: string,
@@ -7276,41 +7252,46 @@ export interface WarehouseAPI {
   /**
    * Set smart supply
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param enabled - smart supply enabled
    */
-  setSmartSupply(divisionName: string, cityName: string, enabled: boolean): void;
+  setSmartSupply(divisionName: string, city: CityName | `${CityName}`, enabled: boolean): void;
   /**
    * Set whether smart supply uses leftovers before buying
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @param enabled - smart supply use leftovers enabled
    */
-  setSmartSupplyUseLeftovers(divisionName: string, cityName: string, materialName: string, enabled: boolean): void;
+  setSmartSupplyUseLeftovers(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    enabled: boolean,
+  ): void;
   /**
    * Set material buy data
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @param amt - Amount of material to buy
    */
-  buyMaterial(divisionName: string, cityName: string, materialName: string, amt: number): void;
+  buyMaterial(divisionName: string, city: CityName | `${CityName}`, materialName: string, amt: number): void;
   /**
    * Set material to bulk buy
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @param amt - Amount of material to buy
    */
-  bulkPurchase(divisionName: string, cityName: string, materialName: string, amt: number): void;
+  bulkPurchase(divisionName: string, city: CityName | `${CityName}`, materialName: string, amt: number): void;
   /**
    * Get warehouse data
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @returns warehouse data
    */
-  getWarehouse(divisionName: string, cityName: string): Warehouse;
+  getWarehouse(divisionName: string, city: CityName | `${CityName}`): Warehouse;
   /**
    * Get product data
    * @param divisionName - Name of the division
@@ -7321,26 +7302,27 @@ export interface WarehouseAPI {
   /**
    * Get material data
    * @param divisionName - Name of the division
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @returns material data
    */
-  getMaterial(divisionName: string, cityName: string, materialName: string): Material;
+  getMaterial(divisionName: string, city: CityName | `${CityName}`, materialName: string): Material;
   /**
    * Set market TA 1 for a material.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @param on - market ta enabled
    */
-  setMaterialMarketTA1(divisionName: string, cityName: string, materialName: string, on: boolean): void;
+  setMaterialMarketTA1(divisionName: string, city: CityName | `${CityName}`, materialName: string, on: boolean): void;
   /**
    * Set market TA 2 for a material.
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param materialName - Name of the material
    * @param on - market ta enabled
    */
-  setMaterialMarketTA2(divisionName: string, cityName: string, materialName: string, on: boolean): void;
+  setMaterialMarketTA2(divisionName: string, city: CityName | `${CityName}`, materialName: string, on: boolean): void;
   /**
    * Set market TA 1 for a product.
    * @param divisionName - Name of the division
@@ -7366,9 +7348,9 @@ export interface WarehouseAPI {
    */
   exportMaterial(
     sourceDivision: string,
-    sourceCity: string,
+    sourceCity: CityName | `${CityName}`,
     targetDivision: string,
-    targetCity: string,
+    targetCity: CityName | `${CityName}`,
     materialName: string,
     amt: number,
   ): void;
@@ -7383,36 +7365,36 @@ export interface WarehouseAPI {
    */
   cancelExportMaterial(
     sourceDivision: string,
-    sourceCity: string,
+    sourceCity: CityName | `${CityName}`,
     targetDivision: string,
-    targetCity: string,
+    targetCity: CityName | `${CityName}`,
     materialName: string,
     amt: number,
   ): void;
   /**
    * Purchase warehouse for a new city
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    */
-  purchaseWarehouse(divisionName: string, cityName: string): void;
+  purchaseWarehouse(divisionName: string, city: CityName | `${CityName}`): void;
   /**
    * Upgrade warehouse
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param amt - amount of upgrades defaults to 1
    */
-  upgradeWarehouse(divisionName: string, cityName: string, amt?: number): void;
+  upgradeWarehouse(divisionName: string, city: CityName | `${CityName}`, amt?: number): void;
   /**
    * Create a new product
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
+   * @param city - Name of the city
    * @param productName - Name of the product
    * @param designInvest - Amount to invest for the design of the product.
    * @param marketingInvest - Amount to invest for the marketing of the product.
    */
   makeProduct(
     divisionName: string,
-    cityName: string,
+    city: CityName | `${CityName}`,
     productName: string,
     designInvest: number,
     marketingInvest: number,
@@ -7420,32 +7402,37 @@ export interface WarehouseAPI {
   /**
    * Limit Material Production.
    * @param divisionName - Name of the division.
-   * @param cityName - Name of the city.
+   * @param city - Name of the city.
    * @param materialName - Name of the material.
    * @param qty - Amount to limit to. Pass a negative value to remove the limit instead.
    */
-  limitMaterialProduction(divisionName: string, cityName: string, materialName: string, qty: number): void;
+  limitMaterialProduction(
+    divisionName: string,
+    city: CityName | `${CityName}`,
+    materialName: string,
+    qty: number,
+  ): void;
   /**
    * Limit Product Production.
    * @param divisionName - Name of the division.
-   * @param cityName - Name of the city.
+   * @param city - Name of the city.
    * @param productName - Name of the product.
    * @param qty - Amount to limit to. Pass a negative value to remove the limit instead.
    */
-  limitProductProduction(divisionName: string, cityName: string, productName: string, qty: number): void;
+  limitProductProduction(divisionName: string, city: CityName | `${CityName}`, productName: string, qty: number): void;
   /**
    * Gets the cost to upgrade a warehouse to the next level
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city
-   * @param amt - amount of upgrades defaults to 1
+   * @param city - Name of the city
+   * @param amt - amount of upgrades. Optional, defaults to 1
    * @returns cost to upgrade
    */
-  getUpgradeWarehouseCost(adivisionName: string, acityName: string, amt?: number): number;
+  getUpgradeWarehouseCost(divisionName: string, city: CityName | `${CityName}`, amt?: number): number;
   /**
    * Check if you have a warehouse in city
    * @returns true if warehouse is present, false if not
    */
-  hasWarehouse(adivisionName: string, acityName: string): boolean;
+  hasWarehouse(divisionName: string, city: CityName | `${CityName}`): boolean;
 }
 
 /**
@@ -7453,12 +7440,6 @@ export interface WarehouseAPI {
  * @public
  */
 export interface Corporation extends WarehouseAPI, OfficeAPI {
-  /** Enums specific to the corporation game mechanic. */
-  enums: {
-    EmployeePositions: typeof EmployeePositions;
-    IndustryType: typeof IndustryType;
-  };
-
   /** Returns whether the player has a corporation. Does not require API access.
    * @returns whether the player has a corporation */
   hasCorporation(): boolean;
@@ -7497,6 +7478,12 @@ export interface Corporation extends WarehouseAPI, OfficeAPI {
    * @returns corporation related constants */
   getConstants(): CorpConstants;
 
+  /** Get constant industry definition data for a specific industry */
+  getIndustryData(industryName: CorpIndustryName): CorpIndustryData;
+
+  /** Get constant data for a specific material */
+  getMaterialData(materialName: CorpMaterialName): CorpMaterialConstantData;
+
   /** Accept investment based on you companies current valuation
    * @remarks
    * Is based on current valuation and will not honer a specific Offer
@@ -7526,12 +7513,12 @@ export interface Corporation extends WarehouseAPI, OfficeAPI {
   /** Expand to a new industry
    * @param industryType - Name of the industry
    * @param divisionName - Name of the division */
-  expandIndustry(industryType: IndustryType | `${IndustryType}`, divisionName: string): void;
+  expandIndustry(industryType: CorpIndustryName, divisionName: string): void;
 
   /** Expand to a new city
    * @param divisionName - Name of the division
-   * @param cityName - Name of the city */
-  expandCity(divisionName: string, cityName: string): void;
+   * @param city - Name of the city */
+  expandCity(divisionName: string, city: CityName | `${CityName}`): void;
 
   /** Unlock an upgrade
    * @param upgradeName - Name of the upgrade */
@@ -7565,6 +7552,49 @@ export interface Corporation extends WarehouseAPI, OfficeAPI {
   getBonusTime(): number;
 }
 
+/** Product rating information
+ *  @public */
+type CorpProductData = {
+  /** Name of the product */
+  name: string;
+  /** Verb used to describe creation of the product */
+  verb: string;
+  /** Description of product creation */
+  desc: string;
+  /** Weighting factors for product  */
+  ratingWeights: {
+    aesthetics?: number;
+    durability?: number;
+    features?: number;
+    quality?: number;
+    performance?: number;
+    reliability?: number;
+  };
+};
+
+/** Data for an individual industry
+ *  @public */
+interface CorpIndustryData {
+  startingCost: number;
+  description: string;
+  product?: CorpProductData;
+  recommendStarting: boolean;
+  requiredMaterials: Partial<Record<CorpMaterialName, number>>;
+  /** Real estate factor */
+  realEstateFactor?: number;
+  /** Scientific research factor (affects quality) */
+  scienceFactor?: number;
+  /** Hardware factor */
+  hardwareFactor?: number;
+  /** Robots factor */
+  robotFactor?: number;
+  /** AI Cores factor */
+  aiCoreFactor?: number;
+  /** Advertising factor (affects sales) */
+  advertisingFactor?: number;
+  producedMaterials?: CorpMaterialName[];
+}
+
 /**
  * General info about a corporation
  * @public
@@ -7607,67 +7637,144 @@ interface CorporationInfo {
  * @public
  */
 interface CorpConstants {
-  /** Corporation cycle states */
-  states: string[];
-  /** Unlockable upgrades */
-  unlocks: string[];
-  /** Levelable upgrades */
-  upgrades: string[];
-  /** Researches, product researches are only available to product making divisions */
-  researches: Record<string, string[]>;
-  /** Amount of funds required to bribe for 1 reputation */
-  bribeToRepRatio: number;
-  /** Amount of products a division can have without researches */
-  baseMaxProducts: number;
-  /** Cost to expand to another city within a division */
-  cityExpandCost: number;
-  /** Cost to purchase a warehouse in a city */
-  warehousePurchaseCost: number;
-  /** Cost of coffee per employee in an office */
-  coffeeCost: number;
-  /** Array of all material types */
-  materials: Record<string, materialInfo>;
-  /** Array of all product types */
-  products: Record<string, productInfo>;
-  /** Array of all division types */
-  divisions: Record<string, divisionInfo>;
+  /** Names of all corporation game states */
+  stateNames: CorpStateName[];
+  /** Names of all industries */
+  industryNames: CorpIndustryName[];
+  /** Names of all materials */
+  materialNames: CorpMaterialName[];
+  /** Names of all one-time corporation-wide unlocks */
+  unlockNames: CorpUnlockName[];
+  /** Names of all corporation-wide upgrades */
+  upgradeNames: CorpUpgradeName[];
+  /** Names of all researches common to all industries */
+  researchNamesBase: CorpResearchName[];
+  /** Names of all researches only available to product industries */
+  researchNamesProductOnly: CorpResearchName[];
+  /** Names of all researches */
+  researchNames: CorpResearchName[];
+  initialShares: number;
+  /** When selling large number of shares, price is dynamically updated for every batch of this amount */
+  sharesPerPriceUpdate: number;
+  /** Cooldown for issue new shares cooldown in game cycles (1 game cycle = 200ms) */
+  issueNewSharesCooldown: number;
+  /** Cooldown for selling shares in game cycles (1 game cycle = 200ms) */
+  sellSharesCooldown: number;
+  coffeeCostPerEmployee: number;
+  gameCyclesPerMarketCycle: number;
+  gameCyclesPerCorpStateCycle: number;
+  secondsPerMarketCycle: number;
+  warehouseInitialCost: number;
+  warehouseInitialSize: number;
+  warehouseSizeUpgradeCostBase: number;
+  officeInitialCost: number;
+  officeInitialSize: number;
+  officeSizeUpgradeCostBase: number;
+  bribeThreshold: number;
+  bribeAmountPerReputation: number;
+  baseProductProfitMult: number;
+  dividendMaxRate: number;
+  /** Conversion factor for employee stats to initial salary */
+  employeeSalaryMultiplier: number;
+  marketCyclesPerEmployeeRaise: number;
+  employeeRaiseAmount: number;
+  /** Max products for a division without upgrades */
+  maxProductsBase: number;
 }
+/** @public */
+type CorpStateName = "START" | "PURCHASE" | "PRODUCTION" | "SALE" | "EXPORT";
+
+/** @public */
+type CorpMaterialName =
+  | "Water"
+  | "Energy"
+  | "Food"
+  | "Plants"
+  | "Metal"
+  | "Hardware"
+  | "Chemicals"
+  | "Drugs"
+  | "Robots"
+  | "AI Cores"
+  | "Real Estate";
+
+/** @public */
+type CorpUnlockName =
+  | "Export"
+  | "Smart Supply"
+  | "Market Research - Demand"
+  | "Market Data - Competition"
+  | "VeChain"
+  | "Shady Accounting"
+  | "Government Partnership"
+  | "Warehouse API"
+  | "Office API";
+
+/** @public */
+type CorpUpgradeName =
+  | "Smart Factories"
+  | "Smart Storage"
+  | "DreamSense"
+  | "Wilson Analytics"
+  | "Nuoptimal Nootropic Injector Implants"
+  | "Speech Processor Implants"
+  | "Neural Accelerators"
+  | "FocusWires"
+  | "ABC SalesBots"
+  | "Project Insight";
+
+/** @public */
+type CorpResearchName =
+  | "Hi-Tech R&D Laboratory"
+  | "AutoBrew"
+  | "AutoPartyManager"
+  | "Automatic Drug Administration"
+  | "Bulk Purchasing"
+  | "CPH4 Injections"
+  | "Drones"
+  | "Drones - Assembly"
+  | "Drones - Transport"
+  | "Go-Juice"
+  | "HRBuddy-Recruitment"
+  | "HRBuddy-Training"
+  | "JoyWire"
+  | "Market-TA.I"
+  | "Market-TA.II"
+  | "Overclock"
+  | "Self-Correcting Assemblers"
+  | "Sti.mu"
+  | "uPgrade: Capacity.I"
+  | "uPgrade: Capacity.II"
+  | "uPgrade: Dashboard"
+  | "uPgrade: Fulcrum"
+  | "sudo.Assist";
 
 /**
  * Corporation material information
  * @public
  */
-interface materialInfo {
+interface CorpMaterialConstantData {
   /** Name of the material */
   name: string;
   /** Size of the material */
   size: number;
-  /** Revenue per second this cycle */
-  prodMult: boolean;
+  demandBase: number;
+  /** Min and max demand */
+  demandRange: [min: number, max: number];
+  competitionBase: number;
+  competitionRange: [min: number, max: number];
+  baseCost: number;
+  maxVolatility: number;
+  baseMarkup: number;
 }
 
 /**
- * Corporation product information
+ * Corporation industry information
  * @public
  */
-interface productInfo {
-  /** Product type */
-  type?: string;
-  /** Size of the product */
-  size: number;
-  /** Materials required to make the product */
-  requiredMaterials: string[];
-  /** Division type which makes the product */
-  division: string;
-}
-
-/**
- * Corporation division information
- * @public
- */
-interface divisionInfo {
-  /** Division type */
-  type: string;
+interface IndustryData {
+  /** Industry type */
+  type: CorpIndustryName;
   /** Cost to expand to the division */
   cost: number;
   /** Materials required for production and their amounts */
@@ -7704,7 +7811,7 @@ interface Product {
   /** Data refers to the production, sale, and quantity of the products
    * These values are specific to a city
    * For each city, the data is [qty, prod, sell] */
-  cityData: { [key: string]: number[] };
+  cityData: Record<CityName | `${CityName}`, number[]>;
   /** Creation progress - A number between 0-100 representing percentage */
   developmentProgress: number;
 }
@@ -7715,7 +7822,7 @@ interface Product {
  */
 interface Material {
   /** Name of the material */
-  name: string;
+  name: CorpMaterialName;
   /** Amount of material  */
   qty: number;
   /** Quality of the material */
@@ -7744,7 +7851,7 @@ interface Export {
   /** Division the material is being exported to */
   div: string;
   /** City the material is being exported to */
-  loc: string;
+  loc: CityName;
   /** Amount of material exported */
   amt: string;
 }
@@ -7757,7 +7864,7 @@ interface Warehouse {
   /** Amount of size upgrade bought */
   level: number;
   /** City in which the warehouse is located */
-  loc: string;
+  loc: CityName;
   /** Total space in the warehouse */
   size: number;
   /** Used space in the warehouse */
@@ -7772,7 +7879,7 @@ interface Warehouse {
  */
 export interface Office {
   /** City of the office */
-  loc: string;
+  loc: CityName;
   /** Maximum number of employee */
   size: number;
   /** Minimum amount of energy of the employees */
@@ -7796,9 +7903,9 @@ export interface Office {
   /** Average morale of the employees */
   avgMor: number;
   /** Production of the employees */
-  employeeProd: Record<`${EmployeePositions}`, number>;
+  employeeProd: Record<CorpEmployeePosition, number>;
   /** Positions of the employees */
-  employeeJobs: Record<`${EmployeePositions}`, number>;
+  employeeJobs: Record<CorpEmployeePosition, number>;
 }
 
 /**
@@ -7809,7 +7916,7 @@ interface Division {
   /** Name of the division */
   name: string;
   /** Type of division, like Agriculture */
-  type: string;
+  type: CorpIndustryName;
   /** Awareness of the division */
   awareness: number;
   /** Popularity of the division */
@@ -7829,7 +7936,7 @@ interface Division {
   /** All research bought */
   upgrades: number[];
   /** Cities in which this division has expanded */
-  cities: string[];
+  cities: CityName[];
   /** Products developed by this division */
   products: string[];
   /** Whether the industry this division is in is capable of making products */
diff --git a/src/Server/data/servers.ts b/src/Server/data/servers.ts
index 339509d26..e957a0f0c 100644
--- a/src/Server/data/servers.ts
+++ b/src/Server/data/servers.ts
@@ -3,7 +3,7 @@ import { FactionNames } from "../../Faction/data/FactionNames";
 
 // This could actually be a JSON file as it should be constant metadata to be imported...
 import { IMinMaxRange } from "../../types";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { LiteratureNames } from "../../Literature/data/LiteratureNames";
 import { SpecialServers } from "./SpecialServers";
 
diff --git a/src/Server/formulas/grow.ts b/src/Server/formulas/grow.ts
index ec94c8eec..980d69c75 100644
--- a/src/Server/formulas/grow.ts
+++ b/src/Server/formulas/grow.ts
@@ -1,7 +1,7 @@
 import { CONSTANTS } from "../../Constants";
 import { Server } from "../Server";
 import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
-import { Person as IPerson } from "../../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 
 export function calculateServerGrowth(server: Server, threads: number, p: IPerson, cores = 1): number {
   const numServerGrowthCycles = Math.max(Math.floor(threads), 0);
diff --git a/src/StockMarket/data/InitStockMetadata.ts b/src/StockMarket/data/InitStockMetadata.ts
index 8fedcd0b9..8a8dfd393 100644
--- a/src/StockMarket/data/InitStockMetadata.ts
+++ b/src/StockMarket/data/InitStockMetadata.ts
@@ -10,7 +10,7 @@
  */
 import { StockSymbols } from "./StockSymbols";
 import { IConstructorParams } from "../Stock";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 
 export const InitStockMetadata: IConstructorParams[] = [
   {
diff --git a/src/StockMarket/data/StockSymbols.ts b/src/StockMarket/data/StockSymbols.ts
index d85a10e5b..5647418aa 100644
--- a/src/StockMarket/data/StockSymbols.ts
+++ b/src/StockMarket/data/StockSymbols.ts
@@ -1,4 +1,4 @@
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 
 //Enum-like object because some keys are created via code and have spaces. Membership can still be checked with checkEnum.
 export const StockSymbols = {
diff --git a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
index b60d14e14..873a89796 100644
--- a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
+++ b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
@@ -11,7 +11,7 @@ import { HelpTexts } from "./HelpText";
 import { isScriptFilename } from "../Script/isScriptFilename";
 import { compile } from "../NetscriptJSEvaluator";
 import { Flags } from "../NetscriptFunctions/Flags";
-import { AutocompleteData } from "../ScriptEditor/NetscriptDefinitions";
+import { AutocompleteData } from "@nsdefs";
 import * as libarg from "arg";
 
 // An array of all Terminal commands
diff --git a/src/TextFile.ts b/src/TextFile.ts
index 5ce2a9adc..6b4e32fa6 100644
--- a/src/TextFile.ts
+++ b/src/TextFile.ts
@@ -11,7 +11,7 @@ export class TextFile {
   /** The content of the file. */
   text: string;
 
-  //TODO: Why are we using getter/setter for fn as filename?
+  //TODO 2.3: Why are we using getter/setter for fn as filename? Rename parameter as more-readable "filename"
   /** The full file name. */
   get filename(): string {
     return this.fn;
diff --git a/src/Themes/Styles.ts b/src/Themes/Styles.ts
index 9b74a4a4a..a6c24e26d 100644
--- a/src/Themes/Styles.ts
+++ b/src/Themes/Styles.ts
@@ -1,4 +1,4 @@
-import { IStyleSettings } from "../ScriptEditor/NetscriptDefinitions";
+import { IStyleSettings } from "@nsdefs";
 
 export const defaultStyles: IStyleSettings = {
   lineHeight: 1.5,
diff --git a/src/Themes/ui/StyleEditorModal.tsx b/src/Themes/ui/StyleEditorModal.tsx
index 374cd3ff1..64a6be678 100644
--- a/src/Themes/ui/StyleEditorModal.tsx
+++ b/src/Themes/ui/StyleEditorModal.tsx
@@ -13,7 +13,7 @@ import { ThemeEvents } from "./Theme";
 import { Settings } from "../../Settings/Settings";
 import { defaultStyles } from "../Styles";
 import { Tooltip } from "@mui/material";
-import { IStyleSettings } from "../../ScriptEditor/NetscriptDefinitions";
+import { IStyleSettings } from "@nsdefs";
 
 interface IProps {
   open: boolean;
diff --git a/src/Themes/ui/ThemeEditorModal.tsx b/src/Themes/ui/ThemeEditorModal.tsx
index 0d1d89abe..396fcbd96 100644
--- a/src/Themes/ui/ThemeEditorModal.tsx
+++ b/src/Themes/ui/ThemeEditorModal.tsx
@@ -14,7 +14,7 @@ import { Color, ColorPicker } from "material-ui-color";
 import { ThemeEvents } from "./Theme";
 import { Settings } from "../../Settings/Settings";
 import { defaultTheme } from "../Themes";
-import { UserInterfaceTheme } from "../../ScriptEditor/NetscriptDefinitions";
+import { UserInterfaceTheme } from "@nsdefs";
 import { Router } from "../../ui/GameRoot";
 import { Page } from "../../ui/Router";
 import { ThemeCollaborate } from "./ThemeCollaborate";
diff --git a/src/Work/ClassWork.tsx b/src/Work/ClassWork.tsx
index 8441255ce..d9bdcf829 100644
--- a/src/Work/ClassWork.tsx
+++ b/src/Work/ClassWork.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
 import { CONSTANTS } from "../Constants";
-import { LocationName } from "../utils/enums";
+import { LocationName } from "../Enums";
 import { numeralWrapper } from "../ui/numeralFormat";
 import { dialogBoxCreate } from "../ui/React/DialogBox";
 import { Money } from "../ui/React/Money";
@@ -10,7 +10,7 @@ import { Player } from "@player";
 import { calculateClassEarnings as calculateClassEarningsRate } from "./Formulas";
 import { Work, WorkType } from "./Work";
 import { applyWorkStats, newWorkStats, sumWorkStats, WorkStats } from "./WorkStats";
-import { GymType, UniversityClassType } from "../utils/enums";
+import { GymType, UniversityClassType } from "../Enums";
 import { checkEnum, findEnumMember } from "../utils/helpers/enum";
 
 export type ClassType = UniversityClassType | GymType;
diff --git a/src/Work/CompanyWork.tsx b/src/Work/CompanyWork.tsx
index 68952d05f..c7dc63d44 100644
--- a/src/Work/CompanyWork.tsx
+++ b/src/Work/CompanyWork.tsx
@@ -3,7 +3,7 @@ import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../uti
 import { Player } from "@player";
 import { Work, WorkType } from "./Work";
 import { influenceStockThroughCompanyWork } from "../StockMarket/PlayerInfluencing";
-import { LocationName } from "../utils/enums";
+import { LocationName } from "../Enums";
 import { calculateCompanyWorkStats } from "./Formulas";
 import { Companies } from "../Company/Companies";
 import { applyWorkStats, scaleWorkStats, WorkStats } from "./WorkStats";
diff --git a/src/Work/CrimeWork.ts b/src/Work/CrimeWork.ts
index f1821dd3f..8f8bf6141 100644
--- a/src/Work/CrimeWork.ts
+++ b/src/Work/CrimeWork.ts
@@ -5,7 +5,7 @@ import { determineCrimeSuccess, findCrime } from "../Crime/CrimeHelpers";
 import { Crimes } from "../Crime/Crimes";
 import { Player } from "@player";
 import { dialogBoxCreate } from "../ui/React/DialogBox";
-import { CrimeType } from "../utils/enums";
+import { CrimeType } from "../Enums";
 import { Work, WorkType } from "./Work";
 import { scaleWorkStats, WorkStats } from "./WorkStats";
 import { calculateCrimeWorkStats } from "./Formulas";
diff --git a/src/Work/FactionWork.tsx b/src/Work/FactionWork.tsx
index a9a74bd33..c78fb8be5 100644
--- a/src/Work/FactionWork.tsx
+++ b/src/Work/FactionWork.tsx
@@ -11,7 +11,7 @@ import { Reputation } from "../ui/React/Reputation";
 import { CONSTANTS } from "../Constants";
 import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
 import { calculateFactionExp, calculateFactionRep } from "./Formulas";
-import { FactionWorkType } from "../utils/enums";
+import { FactionWorkType } from "../Enums";
 import { findEnumMember } from "../utils/helpers/enum";
 
 interface FactionWorkParams {
diff --git a/src/Work/Formulas.ts b/src/Work/Formulas.ts
index d0e3718b7..1ec3cb516 100644
--- a/src/Work/Formulas.ts
+++ b/src/Work/Formulas.ts
@@ -1,9 +1,9 @@
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { Crime } from "../Crime/Crime";
 import { newWorkStats, scaleWorkStats, WorkStats, multWorkStats } from "./WorkStats";
-import { Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { CONSTANTS } from "../Constants";
-import { FactionWorkType, GymType } from "../utils/enums";
+import { FactionWorkType, GymType } from "../Enums";
 import {
   getFactionFieldWorkRepGain,
   getFactionSecurityWorkRepGain,
@@ -16,7 +16,7 @@ import { Class, Classes, ClassType } from "./ClassWork";
 import { Server } from "../Server/Server";
 import { GetServer } from "../Server/AllServers";
 import { serverMetadata } from "../Server/data/servers";
-import { LocationName } from "../utils/enums";
+import { LocationName } from "../Enums";
 import { Company } from "../Company/Company";
 import { CompanyPosition } from "../Company/CompanyPosition";
 import { checkEnum } from "../utils/helpers/enum";
diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx
index 9d49ff0e5..45b5c6dc0 100644
--- a/src/ui/GameRoot.tsx
+++ b/src/ui/GameRoot.tsx
@@ -4,7 +4,7 @@ import { Player } from "@player";
 import { installAugmentations } from "../Augmentation/AugmentationHelpers";
 import { saveObject } from "../SaveObject";
 import { onExport } from "../ExportBonus";
-import { LocationName } from "../utils/enums";
+import { LocationName } from "../Enums";
 import { Location } from "../Locations/Location";
 import { ITutorial, iTutorialStart } from "../InteractiveTutorial";
 import { InteractiveTutorialRoot } from "./InteractiveTutorial/InteractiveTutorialRoot";
diff --git a/src/ui/React/WorldMap.tsx b/src/ui/React/WorldMap.tsx
index ebe45df68..36a355b95 100644
--- a/src/ui/React/WorldMap.tsx
+++ b/src/ui/React/WorldMap.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName } from "../../Enums";
 import Typography from "@mui/material/Typography";
 import Tooltip from "@mui/material/Tooltip";
 import { Theme } from "@mui/material/styles";
diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx
index 7329cf153..45efd4946 100644
--- a/src/ui/WorkInProgressRoot.tsx
+++ b/src/ui/WorkInProgressRoot.tsx
@@ -5,7 +5,7 @@ import { uniqueId } from "lodash";
 import React, { useEffect, useState } from "react";
 import { Companies } from "../Company/Companies";
 import { CONSTANTS } from "../Constants";
-import { LocationName } from "../utils/enums";
+import { LocationName } from "../Enums";
 import { Locations } from "../Locations/Locations";
 import { Settings } from "../Settings/Settings";
 import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
@@ -25,7 +25,7 @@ import { WorkStats } from "../Work/WorkStats";
 import { isCreateProgramWork } from "../Work/CreateProgramWork";
 import { isGraftingWork } from "../Work/GraftingWork";
 import { isFactionWork } from "../Work/FactionWork";
-import { FactionWorkType } from "../utils/enums";
+import { FactionWorkType } from "../Enums";
 import { isCompanyWork } from "../Work/CompanyWork";
 
 const CYCLES_PER_SEC = 1000 / CONSTANTS.MilliPerCycle;
diff --git a/src/utils/helpers/enum.ts b/src/utils/helpers/enum.ts
index 752f9ee83..852410e35 100644
--- a/src/utils/helpers/enum.ts
+++ b/src/utils/helpers/enum.ts
@@ -1,5 +1,7 @@
+import { getRandomInt } from "./getRandomInt";
+
 /** Verifies that a supplied value is a member of the provided object/enum. Works for enums as well as enum-like objects (const {} as const). */
-export function checkEnum<T extends Record<string, unknown>>(obj: T, value: unknown): value is T[keyof T] {
+export function checkEnum<T extends object>(obj: T, value: unknown): value is T[keyof T] {
   return Object.values(obj).includes(value);
 }
 
@@ -9,3 +11,9 @@ export function findEnumMember<T extends Record<string, string>>(obj: T, value:
     if (lowerValue.includes(member.toLowerCase().replace(/ /g, ""))) return member;
   }
 }
+
+export function getRandomMember<T extends Record<string, string>>(obj: T): T[keyof T] {
+  const array = Object.values(obj);
+  const index = getRandomInt(0, array.length - 1);
+  return array[index] as T[keyof T];
+}
diff --git a/test/jest/Netscript/RamCalculation.test.ts b/test/jest/Netscript/RamCalculation.test.ts
index 8829e3a49..37ca100ed 100644
--- a/test/jest/Netscript/RamCalculation.test.ts
+++ b/test/jest/Netscript/RamCalculation.test.ts
@@ -20,12 +20,21 @@ function grabCost(ramLayer: RamLayer, fullPath: string[]) {
   if (typeof expectedRam !== "number") throw new Error(`There was no defined ram cost for ${fullPath.join(".")}().`);
   return expectedRam;
 }
+function isRemovedFunction(fn: Function) {
+  try {
+    fn();
+  } catch {
+    return true;
+  }
+  return false;
+}
 
 describe("Netscript RAM Calculation/Generation Tests", function () {
   Player.sourceFiles[0] = { n: 4, lvl: 3 };
-  const sf4 = Player.sourceFiles[0];
   // For simulating costs of singularity functions.
-  const ScriptBaseCost = RamCostConstants.ScriptBaseRamCost;
+  const sf4 = Player.sourceFiles[0];
+  const baseCost = RamCostConstants.Base;
+  const maxCost = RamCostConstants.Max;
   const script = new Script();
   /** Creates a RunningScript object which calculates static ram usage */
   function createRunningScript(code: string) {
@@ -49,7 +58,7 @@ describe("Netscript RAM Calculation/Generation Tests", function () {
     code: "",
     delay: null,
     dynamicLoadedFns: {},
-    dynamicRamUsage: RamCostConstants.ScriptBaseRamCost,
+    dynamicRamUsage: RamCostConstants.Base,
     env: new Environment(),
     ramUsage: scriptRef.ramUsage,
     scriptRef,
@@ -70,7 +79,7 @@ describe("Netscript RAM Calculation/Generation Tests", function () {
 
     // Static ram check
     const staticCost = calculateRamUsage(code, []).cost;
-    expect(staticCost).toBeCloseTo(ScriptBaseCost + expectedRamCost + extraLayerCost);
+    expect(staticCost).toBeCloseTo(Math.min(baseCost + expectedRamCost + extraLayerCost, maxCost));
 
     // reset workerScript for dynamic check
     scriptRef = createRunningScript(code);
@@ -78,7 +87,7 @@ describe("Netscript RAM Calculation/Generation Tests", function () {
       code,
       scriptRef,
       ramUsage: scriptRef.ramUsage,
-      dynamicRamUsage: ScriptBaseCost,
+      dynamicRamUsage: baseCost,
       env: new Environment(),
       dynamicLoadedFns: {},
     });
@@ -94,7 +103,7 @@ describe("Netscript RAM Calculation/Generation Tests", function () {
     }
 
     expect(workerScript.dynamicLoadedFns).toHaveProperty(fnName);
-    expect(workerScript.dynamicRamUsage - ScriptBaseCost).toBeCloseTo(expectedRamCost, 5);
+    expect(workerScript.dynamicRamUsage).toBeCloseTo(Math.min(expectedRamCost + baseCost, maxCost), 5);
     expect(workerScript.dynamicRamUsage).toBeCloseTo(scriptRef.ramUsage - extraLayerCost, 5);
   }
 
@@ -102,11 +111,13 @@ describe("Netscript RAM Calculation/Generation Tests", function () {
     Object.entries(wrappedNS as unknown as NSLayer).forEach(([key, val]) => {
       if (key === "args" || key === "enums") return;
       if (typeof val === "function") {
+        // Removed functions have no ram cost and should be skipped.
+        if (isRemovedFunction(val)) return;
         const expectedRam = grabCost(RamCosts, [key]);
         it(`${key}()`, () => combinedRamCheck(val.bind(ns), [key], expectedRam));
       }
       //The only other option should be an NSLayer
-      const extraLayerCost = { corporation: 1022.4, hacknet: 4 }[key] ?? 0;
+      const extraLayerCost = { hacknet: 4 }[key] ?? 0; // Currently only hacknet has a layer cost.
       testLayer(val as NSLayer, RamCosts[key as keyof typeof RamCosts] as RamLayer, [key], extraLayerCost);
     });
   });
@@ -118,6 +129,8 @@ describe("Netscript RAM Calculation/Generation Tests", function () {
       Object.entries(nsLayer).forEach(([key, val]) => {
         const newPath = [...path, key];
         if (typeof val === "function") {
+          // Removed functions have no ram cost and should be skipped.
+          if (isRemovedFunction(val)) return;
           const fnName = newPath.join(".");
           const expectedRam = grabCost(ramLayer, newPath);
           it(`${fnName}()`, () => combinedRamCheck(val.bind(actualLayer), newPath, expectedRam, extraLayerCost));
diff --git a/test/jest/Netscript/StaticRamParsingCalculation.test.ts b/test/jest/Netscript/StaticRamParsingCalculation.test.ts
index 950137f53..6dfaf11f8 100644
--- a/test/jest/Netscript/StaticRamParsingCalculation.test.ts
+++ b/test/jest/Netscript/StaticRamParsingCalculation.test.ts
@@ -1,18 +1,17 @@
-import { RamCostConstants } from "../../../src/Netscript/RamCostGenerator";
 import { calculateRamUsage } from "../../../src/Script/RamCalculations";
 import { Script } from "../../../src/Script/Script";
 
-const ScriptBaseCost = RamCostConstants.ScriptBaseRamCost;
+const BaseCost = 1.6;
 const HackCost = 0.1;
 const GrowCost = 0.15;
 const SleeveGetTaskCost = 4;
 const HacknetCost = 4;
-const CorpCost = 1024 - ScriptBaseCost;
+const MaxCost = 1024;
 
 describe("Parsing NetScript code to work out static RAM costs", function () {
   /** Tests numeric equality, allowing for floating point imprecision - and includes script base cost */
   function expectCost(val: number, expected: number) {
-    const expectedWithBase = expected + ScriptBaseCost;
+    const expectedWithBase = Math.min(expected + BaseCost, MaxCost);
     expect(val).toBeGreaterThanOrEqual(expectedWithBase - 100 * Number.EPSILON);
     expect(val).toBeLessThanOrEqual(expectedWithBase + 100 * Number.EPSILON);
   }
@@ -170,25 +169,25 @@ describe("Parsing NetScript code to work out static RAM costs", function () {
       expectCost(calculated, HacknetCost);
     });
 
-    it("Corporation NS function with a cost from namespace", async function () {
+    it("One corporation function reaching max ram cap", async function () {
       const code = `
         export async function main(ns) {
           ns.corporation.getCorporation();
         }
       `;
       const calculated = calculateRamUsage(code, []).cost;
-      expectCost(calculated, CorpCost);
+      expectCost(calculated, MaxCost);
     });
 
-    it("Both Corporation and Hacknet functions", async function () {
+    it("Two corporation functions at max ram cap", async function () {
       const code = `
         export async function main(ns) {
+          ns.corporation.createCorporation("Noodle Bar");
           ns.corporation.getCorporation();
-          ns.hacknet.purchaseNode(0);
         }
       `;
       const calculated = calculateRamUsage(code, []).cost;
-      expectCost(calculated, CorpCost + HacknetCost);
+      expectCost(calculated, MaxCost);
     });
 
     it("Sleeve functions with an individual cost", async function () {
diff --git a/test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts b/test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts
index 10a4c38c9..4f9f247a4 100644
--- a/test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts
+++ b/test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts
@@ -4,7 +4,7 @@ import { Player } from "../../../src/Player";
 import { determineAllPossibilitiesForTabCompletion } from "../../../src/Terminal/determineAllPossibilitiesForTabCompletion";
 import { Server } from "../../../src/Server/Server";
 import { AddToAllServers, prestigeAllServers } from "../../../src/Server/AllServers";
-import { LocationName } from "../../../src/utils/enums";
+import { LocationName } from "../../../src/Enums";
 import { CodingContract } from "../../../src/CodingContracts";
 import { initDarkWebItems } from "../../../src/DarkWeb/DarkWebItems";
 
diff --git a/tsconfig.json b/tsconfig.json
index fd20cb97c..f627a8e11 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@player": ["src/Player"]
+      "@player": ["src/Player"],
+      "@nsdefs": ["src/ScriptEditor/NetscriptDefinitions"]
     },
     "esModuleInterop": true,
     "isolatedModules": true,
diff --git a/webpack.config.js b/webpack.config.js
index 8ceda2c64..53e5008d7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -189,6 +189,7 @@ module.exports = (env, argv) => {
       extensions: [".tsx", ".ts", ".js", ".jsx"],
       alias: {
         "@player": path.resolve(__dirname, "src/Player"),
+        "@nsdefs": path.resolve(__dirname, "src/ScriptEditor/NetscriptDefinitions.d.ts"),
       },
     },
     stats: statsConfig,