diff --git a/app.go b/app.go
index 90aa879..13edb4d 100644
--- a/app.go
+++ b/app.go
@@ -463,6 +463,17 @@ func (a *App) PickRLBotToml() (string, error) {
 	return "", fmt.Errorf("invalid file name")
 }
 
+func (a *App) PickToml() (string, error) {
+	path, err := zenity.SelectFile(zenity.FileFilter{
+		Name:     ".toml files",
+		Patterns: []string{"*.toml"},
+	})
+	if err != nil {
+		return "", nil
+	}
+	return path, nil
+}
+
 func (a *App) ShowPathInExplorer(path string) error {
 	fileInfo, err := os.Stat(path)
 	if err != nil {
diff --git a/frontend/src/assets/cannot_play.svg b/frontend/src/assets/cannot_play.svg
new file mode 100644
index 0000000..942cd3c
--- /dev/null
+++ b/frontend/src/assets/cannot_play.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#000000"><path d="m609-181 70-70 70 70 30-30-69-69 70-70-30-30-70 70-70-70-30 30 70 70-70 70 29 29Zm-489 21v-640l572 240h-12q-35 0-66 8t-60 22L200-680v140l240 60-240 60v140l216-92q-8 23-12 45.5t-4 46.5v2L120-160Zm560 80q-83 0-141.5-58.5T480-280q0-83 58.5-141.5T680-480q83 0 141.5 58.5T880-280q0 83-58.5 141.5T680-80ZM200-372v-308 400-92Z"/></svg>
\ No newline at end of file
diff --git a/frontend/src/base-players.ts b/frontend/src/base-players.ts
index 7c14dbe..8ab8d03 100644
--- a/frontend/src/base-players.ts
+++ b/frontend/src/base-players.ts
@@ -9,41 +9,50 @@ export const BASE_PLAYERS: DraggablePlayer[] = [
     id: crypto.randomUUID(),
     player: new HumanInfo(),
     tags: ["human"],
+    overrides: { name: "Human", loadout: null, autoStart: true },
   },
   {
     displayName: "Psyonix Beginner",
     icon: "",
     id: crypto.randomUUID(),
     player: new PsyonixBotInfo({
+      name: "",
       skill: 0,
     }),
     tags: ["psyonix"],
+    overrides: { name: "", loadout: null, autoStart: true },
   },
   {
     displayName: "Psyonix Rookie",
     icon: "",
     id: crypto.randomUUID(),
     player: new PsyonixBotInfo({
+      name: "",
       skill: 1,
     }),
     tags: ["psyonix"],
+    overrides: { name: "", loadout: null, autoStart: true },
   },
   {
     displayName: "Psyonix Pro",
     icon: "",
     id: crypto.randomUUID(),
     player: new PsyonixBotInfo({
+      name: "",
       skill: 2,
     }),
     tags: ["psyonix"],
+    overrides: { name: "", loadout: null, autoStart: true },
   },
   {
     displayName: "Psyonix Allstar",
     icon: "",
     id: crypto.randomUUID(),
     player: new PsyonixBotInfo({
+      name: "",
       skill: 3,
     }),
     tags: ["psyonix"],
+    overrides: { name: "", loadout: null, autoStart: true },
   },
 ];
diff --git a/frontend/src/components/Teams/Main.svelte b/frontend/src/components/Teams/Main.svelte
index f0624eb..018cff4 100644
--- a/frontend/src/components/Teams/Main.svelte
+++ b/frontend/src/components/Teams/Main.svelte
@@ -5,10 +5,12 @@ let {
   bluePlayers = $bindable(),
   orangePlayers = $bindable(),
   selectedTeam = $bindable(null),
+  globalAutoStart = $bindable(true),
 }: {
   bluePlayers: any[];
   orangePlayers: any[];
   selectedTeam: "blue" | "orange" | null;
+  globalAutoStart: boolean;
 } = $props();
 
 function toggleTeam(team: "blue" | "orange") {
@@ -29,7 +31,7 @@ function toggleTeam(team: "blue" | "orange") {
             <div style="flex: 1;"></div>
             <h3 class="dimmed">{bluePlayers?.length || 0} bots</h3>
         </header>
-        <TeamBotList bind:items={bluePlayers} />
+        <TeamBotList bind:items={bluePlayers} bind:globalAutoStart />
     </div>
     <div class="team box orange" onclick={() => toggleTeam('orange')} class:selected={selectedTeam === 'orange'}>
         <header class="orange">
@@ -37,7 +39,7 @@ function toggleTeam(team: "blue" | "orange") {
             <div style="flex: 1;"></div>
             <h3 class="dimmed">{orangePlayers?.length || 0} bots</h3>
         </header>
-        <TeamBotList bind:items={orangePlayers} />
+        <TeamBotList bind:items={orangePlayers} bind:globalAutoStart />
     </div>
 </div>
 
diff --git a/frontend/src/components/Teams/PlayerOverridesModal.svelte b/frontend/src/components/Teams/PlayerOverridesModal.svelte
new file mode 100644
index 0000000..d00a40d
--- /dev/null
+++ b/frontend/src/components/Teams/PlayerOverridesModal.svelte
@@ -0,0 +1,77 @@
+<script lang="ts">
+    import Modal from "../Modal.svelte";
+    import type {DraggablePlayer} from "../../index";
+    import {App, BotInfo, PsyonixBotInfo} from "../../../bindings/gui";
+
+    let {
+    player = $bindable(undefined),
+    visible = $bindable(false)
+}: {
+    player?: DraggablePlayer | null
+    visible?: boolean
+} = $props();
+
+function clearOverrides() {
+    if (player) {
+        player.overrides.name = player.player instanceof PsyonixBotInfo ? "" : player.displayName;
+        player.overrides.loadout = null;
+        player.overrides.autoStart = true;
+    }
+}
+
+function hasNameOverride(): boolean {
+    if (!player) return false;
+    let expectedName = player.player instanceof BotInfo ? player.displayName : "";
+    return player.overrides.name !== expectedName;
+}
+
+async function pickLoadoutOverride() {
+    if (!player) return;
+    let path = await App.PickToml();
+    if (!path) return;
+    player.overrides.loadout = await App.GetLoadout(path)
+}
+
+</script>
+
+{#if player}
+<Modal title={`Edit ${player.displayName}`} bind:visible >
+    <p style={hasNameOverride() ? "color: orange;" : ""}>In-game name:</p>
+    <input
+            type="text"
+            placeholder="Bot name"
+            id={`edit-name-${player.id}`}
+            bind:value={player.overrides.name}
+    >
+    <br />
+    <br />
+    {#if player.player instanceof BotInfo || player.player instanceof PsyonixBotInfo}
+        <p style={player.overrides.loadout ? "color: orange;" : ""}>Loadout: {player.overrides.loadout ? "Customized" : ""}</p>
+        <button onclick={pickLoadoutOverride}>Pick TOML</button>
+        <br />
+        <br />
+    {/if}
+    {#if player.player instanceof BotInfo}
+        <input
+                type="checkbox"
+                id={`edit-auto-start-${player.id}`}
+                bind:checked={player.overrides.autoStart}
+        >
+        <label for={`edit-auto-start-${player.id}`} style={player.overrides.autoStart ? "" : "color: orange;"}>Auto start</label>
+    {/if}
+    <hr>
+    <div class="buttons">
+        <button onclick={clearOverrides}>Clear Overrides</button>
+    </div>
+</Modal>
+{/if}
+
+<style>
+    .buttons {
+        display: flex;
+        width: 100%;
+        justify-content: left;
+        gap: .5rem;
+        padding-top: 1rem;
+    }
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/Teams/TeamBotList.svelte b/frontend/src/components/Teams/TeamBotList.svelte
index 89ddcfb..0b84828 100644
--- a/frontend/src/components/Teams/TeamBotList.svelte
+++ b/frontend/src/components/Teams/TeamBotList.svelte
@@ -5,14 +5,21 @@ import { untrack } from "svelte";
 import { flip } from "svelte/animate";
 import { fade } from "svelte/transition";
 import type { DraggablePlayer } from "../..";
-import { BotInfo } from "../../../bindings/gui";
+import {BotInfo, PsyonixBotInfo} from "../../../bindings/gui";
 import closeIcon from "../../assets/close.svg";
 import duplicateIcon from "../../assets/duplicate.svg";
 import editIcon from "../../assets/edit.svg";
+import cannotAutoRunIcon from "../../assets/cannot_play.svg";
 import defaultIcon from "../../assets/rlbot_mono.png";
-import ModalPrompt from "../ModalPrompt.svelte";
+import PlayerOverridesModal from "./PlayerOverridesModal.svelte";
 
-let { items = $bindable() }: { items: DraggablePlayer[] } = $props();
+let {
+  items = $bindable(),
+  globalAutoStart = $bindable(true)
+}: {
+  items: DraggablePlayer[],
+  globalAutoStart: boolean,
+} = $props();
 
 function remove(id: string): any {
   items = items.filter((x) => x.id !== id);
@@ -24,61 +31,41 @@ function dupe(id: string): any {
     // Create a copy with a new ID
     const newItem = {
       ...items[index],
-      id: crypto.randomUUID(), // Generate a new unique ID
+      overrides: {...items[index].overrides},
+      id: crypto.randomUUID() // Generate a new unique ID
     };
     // Insert the new item after the original
     items = [...items.slice(0, index + 1), newItem, ...items.slice(index + 1)];
   }
 }
 
-let editPrompts: { [key: string]: ModalPrompt } = {};
-let editDataNames: { [key: string]: string } = $state({});
+let editedPlayer: DraggablePlayer | undefined = $state(undefined)
+let showEditPrompt = $state(false)
 
-// Update editDataNames once items updates, but try to keep as much state as possible
-// Once editing more stuff is supported, this approach should probably change
-$effect(() => {
-  let localEditDataNames = untrack(() => {
-    return editDataNames;
-  });
-  let updated = Object.fromEntries(
-    items
-      .filter((x) => {
-        return x.player instanceof BotInfo;
-      })
-      .map((bot) => {
-        return [
-          bot.id,
-          // use ! + ?: instead of ?? so that "" is treated as null
-          // this is due to the input binding value to "" before this is ran
-          !localEditDataNames[bot.id]
-            ? (<BotInfo>bot.player).config.settings.name
-            : localEditDataNames[bot.id],
-        ];
-      }),
-  );
-  untrack(() => {
-    editDataNames = updated;
-  });
-});
-
-async function edit_custom_bot(id: string): Promise<void> {
-  let modal = editPrompts[id];
+async function showEditModal(d: DraggablePlayer) {
+  if (d) {
+    editedPlayer = d
+    showEditPrompt = true;
+  }
+}
 
-  let modified = await modal.prompt();
-  if (modified) {
-    const index = items.findIndex((x) => x.id === id);
-    let copy = {
-      ...items[index],
-      // We need to deepclone here to make sure we don't modify the player globally.
-      // We also need to do BotInfo.createFrom to make sure that instanceof BotInfo == true still.
-      player: BotInfo.createFrom(structuredClone(items[index].player)),
-    };
-    copy.modified = true;
-    if (copy.player instanceof BotInfo) {
-      copy.player.config.settings.name = editDataNames[id];
-    }
-    items[index] = copy;
+function reasonsForManualStart(d: DraggablePlayer): string[] {
+  let reasons: string[] = []
+  if (d.player instanceof BotInfo) {
+    if (!globalAutoStart) reasons.push("Auto-start disabled in Extra");
+    if (!d.player.config.settings.runCommand) reasons.push("No run_command declared");
+    if (!d.overrides.autoStart) reasons.push("Auto-start disabled for bot");
   }
+  return reasons
+}
+
+function canAutoStart(d: DraggablePlayer): boolean {
+  return reasonsForManualStart(d).length == 0;
+}
+
+function hasOverrides(d: DraggablePlayer): boolean {
+  let expectedName = (d.player instanceof BotInfo) ? d.displayName : "";
+  return d.overrides.name !== expectedName || !d.overrides.autoStart || d.overrides.loadout != null
 }
 
 // :fire: :fire: :fire:
@@ -157,7 +144,7 @@ const dnd_container_namespace = `team_${crypto.randomUUID()}`;
         }}
         animate:flip={{ duration: 100 }}
         in:fade={{ duration: 100 }}
-				out:fade={{ duration: 100 }}
+        out:fade={{ duration: 100 }}
       >
         <div
           class="bot"
@@ -170,25 +157,24 @@ const dnd_container_namespace = `team_${crypto.randomUUID()}`;
           onclick={e => e.stopPropagation()}
         >
           <img src={bot.icon || defaultIcon} alt="icon" />
-          <p
-            style={bot.modified ? "color: orange" : ""}
-            title={bot.modified ? "(modified)" : undefined}
-          >{bot.displayName}</p>
+          <p>{bot.displayName === bot.overrides.name || (bot.player instanceof PsyonixBotInfo && bot.overrides.name === "") ? bot.displayName : `${bot.overrides.name}`}</p>
           {#if bot.uniquePathSegment}
             <span class="unique-bot-identifier">({bot.uniquePathSegment})</span>
           {/if}
-          <div style="flex: 1;"></div>
-          {#if bot.player instanceof BotInfo}
-            <button class="edit" title="edit" onclick={edit_custom_bot.bind(null, bot.id)}>
-              <img src={editIcon} alt="Dupe">
-            </button>
+          {#if !canAutoStart(bot)}
+            <img class="bot-icon" src={cannotAutoRunIcon} alt="No auto-run" title={`Must be launched manually (${reasonsForManualStart(bot).join("; ")})`}>
           {/if}
-          <!-- TODO: support editing psyonix bots too, skill level (and name?) -->
+          <div style="flex: 1;"></div>
           {#if !bot.tags.includes("human")}
             <button class="duplicate" title="Duplicate" onclick={dupe.bind(null, bot.id)}>
               <img src={duplicateIcon} alt="Dupe">
             </button>
           {/if}
+          {#if bot.player instanceof BotInfo || bot.player instanceof PsyonixBotInfo}
+            <button class={hasOverrides(bot) ? "edit has-overrides" : "edit"} title="Edit" onclick={() => showEditModal(bot)}>
+              <img src={editIcon} alt="Edit">
+            </button>
+          {/if}
           <button class="close" onclick={remove.bind(null, bot.id)}>
             <img src={closeIcon} alt="X" />
           </button>
@@ -202,21 +188,7 @@ const dnd_container_namespace = `team_${crypto.randomUUID()}`;
   </div>
 </div>
 
-{#each items as bot (bot.id)}
-  <ModalPrompt title={"Edit " + bot.displayName} bind:this={editPrompts[bot.id]}>
-    <div style="display: flex; flex-direction: column;">
-      <label for={`edit-name-${bot.id}`}>Bot name (note: only in-game)</label>
-      <input
-        type="text"
-        placeholder="Bot name"
-        id={`edit-name-${bot.id}`}
-        bind:value={editDataNames[bot.id]}
-      >
-      <!-- TODO: Add a bunch of more stuff to edit, loadout etc -->
-      <!-- TODO: Perhaps add a way to save mods to bots as new tomls? -->
-    </div>
-  </ModalPrompt>
-{/each}
+<PlayerOverridesModal bind:player={editedPlayer} bind:visible={showEditPrompt} />
 
 <style>
   * {
@@ -282,19 +254,33 @@ const dnd_container_namespace = `team_${crypto.randomUUID()}`;
   .bot:not(:hover) :is(.duplicate, .edit) {
     visibility: hidden;
   }
+  .has-overrides img {
+    visibility: visible;
+  }
   .close, .duplicate, .edit {
     background-color: transparent;
     height: 100%;
     padding: 0;
   }
   .duplicate {
-    padding: 0 .2rem;
+    padding: 0 .1rem;
   }
   :is(.close, .duplicate, .edit) img {
     height: 100%;
     width: auto;
     filter: invert();
   }
+  :is(.has-overrides) img {
+    filter: invert(68%) sepia(66%) saturate(2755%) hue-rotate(360deg) brightness(103%) contrast(104%);
+  }
+  .bot-icon {
+    background-color: transparent;
+    padding: 0 .1rem;
+    margin: .4rem 0;
+    height: 100%;
+    width: auto;
+    filter: invert(60%);
+  }
   .unique-bot-identifier {
     color: #868686;
   }
diff --git a/frontend/src/index.ts b/frontend/src/index.ts
index bee756a..314e67f 100644
--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@@ -2,7 +2,7 @@ import "./global.css";
 import { mount } from "svelte";
 import {
   BotInfo,
-  HumanInfo,
+  HumanInfo, LoadoutConfig,
   type PlayerJs,
   PsyonixBotInfo,
 } from "../bindings/gui";
@@ -32,6 +32,12 @@ export function parseJSON(item: string | null): any | null {
   }
 }
 
+export interface PlayerFieldOverrides {
+  name: string;
+  loadout: LoadoutConfig | null
+  autoStart: boolean;
+}
+
 export interface DraggablePlayer {
   id: string;
   displayName: string;
@@ -39,7 +45,7 @@ export interface DraggablePlayer {
   player: BotInfo | PsyonixBotInfo | HumanInfo;
   tags: string[];
   uniquePathSegment?: string;
-  modified?: boolean;
+  overrides: PlayerFieldOverrides;
 }
 
 export interface ToggleableScript {
@@ -52,20 +58,39 @@ export interface ToggleableScript {
 }
 
 export function draggablePlayerToPlayerJs(d: DraggablePlayer): PlayerJs {
-  let sort = "";
-
   if (d.player instanceof BotInfo) {
-    sort = "rlbot";
+    let player = BotInfo.createFrom(structuredClone(d.player))
+    // Apply overrides
+    player.config.settings.name = d.overrides.name;
+    player.loadout = d.overrides.loadout ?? d.player.loadout;
+    if (!d.overrides.autoStart) {
+      player.config.settings.runCommand = ""
+      player.config.settings.runCommandLinux = ""
+    }
+    // We don't need to know the icon to start a bot.
+    // This fixes oversized requests that result in a CORS error on windows (WebView2)
+    player.config.settings.logoFile = "";
+
+    return {
+      sort: "rlbot",
+      player: player,
+    }
   }
+
   if (d.player instanceof PsyonixBotInfo) {
-    sort = "psyonix";
-  }
-  if (d.player instanceof HumanInfo) {
-    sort = "human";
+    let player = PsyonixBotInfo.createFrom(structuredClone(d.player))
+    // Apply overrides
+    player.name = d.overrides.name;
+    player.loadout = d.overrides.loadout ?? d.player.loadout;
+
+    return {
+      sort: "psyonix",
+      player: player
+    }
   }
 
   return {
-    sort: sort,
+    sort: "human",
     player: d.player,
   };
 }
diff --git a/frontend/src/pages/Home.svelte b/frontend/src/pages/Home.svelte
index 1db803d..8024875 100644
--- a/frontend/src/pages/Home.svelte
+++ b/frontend/src/pages/Home.svelte
@@ -179,12 +179,8 @@ function updateTeam(team: DraggablePlayer[]) {
     let newPlayer: DraggablePlayer = {
       ...found,
       id: player.id,
-      modified: player.modified,
+      overrides: player.overrides,
     };
-    if (player.modified) {
-      // keep the modified display name
-      newPlayer.displayName = player.displayName;
-    }
 
     newTeam.push(newPlayer);
   }
@@ -216,7 +212,11 @@ async function updateBots() {
         id: crypto.randomUUID(),
         tags: x.config.details.tags,
         uniquePathSegment,
-        modified: false,
+        overrides: {
+          name: x.config.settings.name,
+          loadout: null,
+          autoStart: true,
+        },
       };
     }),
   );
@@ -319,25 +319,12 @@ async function onMatchStart(randomizeMap: boolean) {
       ];
   }
 
-  // this syntax makes more sense when inside of another function
-  const playerMap = (draggable: DraggablePlayer): PlayerJs => {
-    let clone = { ...draggable };
-    if (clone.player instanceof BotInfo) {
-      clone.player = BotInfo.createFrom(structuredClone(clone.player));
-      // We don't need to know the icon to start a bot.
-      // This fixes oversized requests that result in a CORS error on windows (WebView2)
-      // TODO: There is probably a better way to do this.
-      (clone.player as BotInfo).config.settings.logoFile = "";
-    }
-    return draggablePlayerToPlayerJs(clone);
-  };
-
   const options: StartMatchOptions = {
     map: $mapStore,
     gameMode: mode,
     scripts: scripts.filter((x) => enabledScripts[x.id]).map((x) => x.config),
-    bluePlayers: bluePlayers.map(playerMap),
-    orangePlayers: orangePlayers.map(playerMap),
+    bluePlayers: bluePlayers.map(draggablePlayerToPlayerJs),
+    orangePlayers: orangePlayers.map(draggablePlayerToPlayerJs),
     launcher,
     launcherArg: localStorage.getItem("MS_LAUNCHER_ARG") || "",
     mutatorSettings,
@@ -435,7 +422,7 @@ function handleSearch(event: Event) {
     />
   </div>
 
-  <div class="teams"><Teams bind:bluePlayers bind:orangePlayers bind:selectedTeam /></div>
+  <div class="teams"><Teams bind:bluePlayers bind:orangePlayers bind:selectedTeam bind:globalAutoStart={extraOptions.autoStartAgents} /></div>
 
   <div class="box">
     <MatchSettings
diff --git a/players.go b/players.go
index b5aeee5..691d87b 100644
--- a/players.go
+++ b/players.go
@@ -49,17 +49,32 @@ type Player interface {
 }
 
 type PsyonixBotInfo struct {
+	Name    string         `json:"name"`
+	Loadout *LoadoutConfig `json:"loadout,omitempty"`
 	// Beginner: 0, Rookie: 1, Pro: 2, AllStar: 3
 	Skill byte `json:"skill"`
 }
 
 func (info PsyonixBotInfo) ToPlayerConfig(team uint32) *flat.PlayerConfigurationT {
+
+	var loadout *flat.PlayerLoadoutT = nil
+	if info.Loadout != nil {
+		var teamLoadout *TeamLoadoutConfig
+		if team == 0 {
+			teamLoadout = &info.Loadout.Blue
+		} else {
+			teamLoadout = &info.Loadout.Orange
+		}
+
+		loadout = teamLoadout.ToPlayerLoadout()
+	}
+
 	return &flat.PlayerConfigurationT{
 		Variety: &flat.PlayerClassT{
 			Type: flat.PlayerClassPsyonixBot,
 			Value: &flat.PsyonixBotT{
-				Name:     "",
-				Loadout:  nil,
+				Name:     info.Name,
+				Loadout:  loadout,
 				BotSkill: flat.PsyonixSkill(info.Skill),
 			},
 		},
@@ -279,11 +294,9 @@ func (a *App) GetBots(paths []string) []BotInfo {
 		var loadout *LoadoutConfig = nil
 		if conf.Settings.LoadoutFile != "" {
 			loadoutPath := filepath.Join(filepath.Dir(potentialConfigPath), conf.Settings.LoadoutFile)
-			loadoutData, err := os.ReadFile(loadoutPath)
+			loadout, err = a.GetLoadout(loadoutPath)
 			if err != nil {
 				println("WARN: failed to read loadout file at " + conf.Settings.LoadoutFile)
-			} else {
-				toml.Decode(string(loadoutData), &loadout)
 			}
 		}
 
@@ -301,3 +314,16 @@ func (a *App) GetBots(paths []string) []BotInfo {
 
 	return infos
 }
+
+func (a *App) GetLoadout(path string) (*LoadoutConfig, error) {
+	loadoutData, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	var loadout *LoadoutConfig = nil
+	_, err = toml.Decode(string(loadoutData), &loadout)
+	if err != nil {
+		return nil, err
+	}
+	return loadout, nil
+}