diff --git a/src/components/DriverEntryInlineForm.vue b/src/components/DriverEntryInlineForm.vue
new file mode 100644
index 0000000..af49f77
--- /dev/null
+++ b/src/components/DriverEntryInlineForm.vue
@@ -0,0 +1,106 @@
+<script lang="ts" setup>
+import { DriverCategories } from '@/lib/gameData'
+import type { EntryListDriver } from '@/lib/gameFiles'
+import { formatPlayerId, getPlatformClass, parsePlayerId } from '@/lib/utils'
+import { useDriverStore } from '@/stores/drivers'
+import { PlatformOptionsSmall } from '@/stores/settings'
+import type { SelectOption } from 'bootstrap-vue-next'
+import { cloneDeep } from 'lodash-es'
+import { onMounted } from 'vue'
+import { computed, reactive, watchEffect } from 'vue'
+
+const driverStore = useDriverStore()
+const driver = defineModel<EntryListDriver>()
+
+// #region Category
+const driverCategoryOptions = computed(() => {
+  const options = [
+    {
+      value: '',
+      text: 'No category',
+    },
+  ] as SelectOption[]
+  for (const category of DriverCategories) {
+    options.push({ value: category.value, text: category.name })
+  }
+  return options
+})
+// #endregion
+
+// #region Player ID formatting
+const playerIdForm = reactive({
+  id: '',
+  platform: cloneDeep(driverStore.defaultPlatform),
+})
+function onPlayerIdUpdated() {
+  if (!driver.value) return
+  driver.value.playerID = formatPlayerId(playerIdForm.id, playerIdForm.platform)
+}
+// #endregion
+
+watchEffect(() => {
+  if (driver.value) {
+    // Remove blank properties
+    if (driver.value.firstName == '') delete driver.value.firstName
+    if (driver.value.lastName == '') delete driver.value.lastName
+    if (driver.value.shortName == '') delete driver.value.shortName
+    if (driver.value.driverCategory?.toString() == '') delete driver.value.driverCategory
+  }
+})
+onMounted(() => {
+  if (driver.value) {
+    const parsedId = parsePlayerId(driver.value.playerID, playerIdForm.platform)
+    playerIdForm.id = parsedId.playerId
+    playerIdForm.platform = parsedId.platform
+  }
+})
+</script>
+
+<template>
+  <div v-if="driver" class="driver-entry-inline row">
+    <div class="col-4">
+      <b-input-group>
+        <template #prepend>
+          <b-form-select
+            v-model="playerIdForm.platform"
+            id="platform-select"
+            :class="`platform-select ${getPlatformClass(playerIdForm.platform)}`"
+            :options="PlatformOptionsSmall"
+            size="sm"
+            @update:model-value="onPlayerIdUpdated"
+          />
+        </template>
+        <b-form-input v-model="playerIdForm.id" type="text" id="id" required size="sm" placeholder="Player ID" @update:model-value="onPlayerIdUpdated" />
+      </b-input-group>
+    </div>
+    <div class="col-5">
+      <b-input-group>
+        <b-form-input v-model="driver.firstName" type="text" id="first-name" size="sm" placeholder="First name" />
+        <b-form-input v-model="driver.lastName" type="text" id="last-name" size="sm" placeholder="Last name" />
+        <b-form-input v-model="driver.shortName" type="text" id="short-name" size="sm" placeholder="LAS" />
+      </b-input-group>
+    </div>
+    <div class="col-3">
+      <b-input-group>
+        <b-form-select v-model="driver.driverCategory" :options="driverCategoryOptions" id="category" size="sm" />
+      </b-input-group>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.driver-entry-inline {
+  padding: 0;
+  margin: 0;
+  div {
+    padding: 0 0.05em;
+  }
+
+  select#platform-select {
+    max-width: 4.5em;
+  }
+  input#short-name {
+    max-width: 3em;
+  }
+}
+</style>
diff --git a/src/components/EntryOptionToggle.vue b/src/components/EntryOptionToggle.vue
new file mode 100644
index 0000000..4dd3059
--- /dev/null
+++ b/src/components/EntryOptionToggle.vue
@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+const value = defineModel<boolean | number>()
+
+function toggle() {
+  if (typeof value.value === 'number') value.value = value.value === 0 ? 1 : 0
+  else value.value = !value.value
+}
+</script>
+
+<template>
+  <b-button class="option-toggle" :variant="value ? 'info' : 'outline-info'" size="sm" @click="toggle">
+    <slot />
+  </b-button>
+</template>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/components/FilePicker.vue b/src/components/FilePicker.vue
index 0f1d185..015df99 100644
--- a/src/components/FilePicker.vue
+++ b/src/components/FilePicker.vue
@@ -14,48 +14,50 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import download from "downloadjs";
-import { cloneDeep } from "lodash-es";
-import { ref, watch } from "vue";
+import download from 'downloadjs'
+import { clone, cloneDeep } from 'lodash-es'
+import { ref, watch } from 'vue'
 
 const props = defineProps<{
-  fileName: string,
+  fileName: string
   default?: T
-}>();
+}>()
 
-const jsonError = ref<string>();
+const jsonError = ref<string>()
 
 //#region File parsing
-const file = defineModel<T>();
-const fileText = ref<string>();
+const file = defineModel<T>()
+const fileText = ref<string>()
 
-watch(file, (value) => {
-  try {
-    if (value !== undefined && value !== null)
-      fileText.value = JSON.stringify(value, null, 2);
-    else
-      fileText.value = undefined;
-  } catch (e: any) {
-    jsonError.value = e.message;
-  }
-}, { deep: true });
+watch(
+  file,
+  (value) => {
+    try {
+      if (value != undefined) {
+        fileText.value = JSON.stringify(value, null, 2)
+      } else fileText.value = undefined
+    } catch (e: any) {
+      jsonError.value = e.message
+    }
+  },
+  { deep: true },
+)
 watch(fileText, (newValue) => {
   try {
     if (newValue) file.value = JSON.parse(newValue)
-    else file.value = undefined;
+    else file.value = undefined
   } catch (e: any) {
-    jsonError.value = e.message;
+    jsonError.value = e.message
   }
 })
 //#endregion
 
 function onNew() {
-  file.value = cloneDeep(props.default);
+  file.value = cloneDeep(props.default)
 }
 
 function downloadFile() {
-  if (fileText.value)
-    download(fileText.value, `${props.fileName}.json`, "application/json");
+  if (fileText.value) download(fileText.value, `${props.fileName}.json`, 'application/json')
 }
 </script>
 
@@ -64,19 +66,14 @@ function downloadFile() {
     <b-alert variant="danger" :show="!!jsonError" class="mb-2">
       {{ jsonError }}
     </b-alert>
-    <BFormTextarea v-model="fileText" rows="10" class="mb-2"
-      :placeholder="`Drag & Drop your ${fileName}.json or paste its contents here...`" />
+    <BFormTextarea v-model="fileText" rows="10" class="mb-2" :placeholder="`Drag & Drop your ${fileName}.json or paste its contents here...`" />
     <div class="d-flex flex-row justify-content-center mb-1">
-      <b-button variant="secondary" @click="onNew">
-        New {{ fileName }}.json
-      </b-button>
+      <b-button variant="secondary" @click="onNew"> New {{ fileName }}.json </b-button>
     </div>
     <div v-if="!!file" class="d-flex flex-row justify-content-center mb-1">
-      <b-button variant="secondary" @click="downloadFile">
-        Download {{ fileName }}.json
-      </b-button>
+      <b-button variant="secondary" @click="downloadFile"> Download {{ fileName }}.json </b-button>
     </div>
   </div>
 </template>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/composables/gameData.ts b/src/composables/gameData.ts
index 88e2153..1ef6b1f 100644
--- a/src/composables/gameData.ts
+++ b/src/composables/gameData.ts
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { CupCategories, DriverCategories, SessionTypes } from '@/lib/gameData'
+import { Cars, CupCategories, DriverCategories, SessionTypes } from '@/lib/gameData'
 
 export function useGameData() {
   //#region Session types
@@ -23,7 +23,7 @@ export function useGameData() {
     for (const item of SessionTypes) {
       result.push({
         text: item.name,
-        value: item.value
+        value: item.value,
       })
     }
     return result
@@ -36,7 +36,7 @@ export function useGameData() {
     for (const item of CupCategories) {
       result.push({
         text: item.name,
-        value: item.value
+        value: item.value,
       })
     }
     return result
@@ -49,7 +49,7 @@ export function useGameData() {
     for (const item of DriverCategories) {
       result.push({
         text: item.name,
-        value: item.value
+        value: item.value,
       })
     }
     return result
@@ -57,10 +57,25 @@ export function useGameData() {
   //#endregion Driver categories
 
   //#region Cars
+  function carOptions() {
+    const result = [
+      {
+        text: 'Any car',
+        value: -1,
+      },
+    ]
+    for (const item of Cars) {
+      result.push({
+        text: item.name,
+        value: item.value,
+      })
+    }
+    return result
+  }
   //#endregion Cars
 
   //#region Tracks
   //#endregion Tracks
 
-  return { sessionTypeOptions, cupCategoryOptions, driverCategoryOptions }
+  return { sessionTypeOptions, cupCategoryOptions, driverCategoryOptions, carOptions }
 }
diff --git a/src/lib/gameFiles.ts b/src/lib/gameFiles.ts
index 75b554c..34c337d 100644
--- a/src/lib/gameFiles.ts
+++ b/src/lib/gameFiles.ts
@@ -15,6 +15,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 import { DriverCategory, SettingsCarGroup, SettingsFormationLapType } from './gameData'
+import { randomString } from './utils'
 
 //#region eventRules.json
 export class EventRules {
@@ -61,27 +62,23 @@ export class EntryList {
   entries: EntryListEntry[] = []
   forceEntryList: 0 | 1 = 0
 }
-export type EntryListEntry = {
-  drivers: EntryListDriver[]
-  raceNumber: number
-  forcedCarModel: number
-  overrideDriverInfo: number
-  isServerAdmin: number
+export class EntryListEntry {
+  drivers: EntryListDriver[] = []
+  raceNumber: number = 0
+  forcedCarModel: number = -1
+  overrideDriverInfo: number = 0
+  isServerAdmin: number = 0
   defaultGridPosition?: number
   ballastKg?: number
   restrictor?: number
   customCar?: string
   overrideCarModelForCustomCar?: number
 }
-export type EntryListDriver = {
-  playerID: string
+export class EntryListDriver {
+  playerID: string = ''
   firstName?: string
   lastName?: string
   shortName?: string
   driverCategory?: DriverCategory
 }
-// Defaults
-export const EntryListDriverDefault: EntryListDriver = {
-  playerID: '',
-}
 //#endregion
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 42d7e8c..b6d5e3e 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -15,7 +15,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 import { Platform } from '@/stores/settings'
-import type { EntryListEntry } from './gameFiles'
 
 export function isNullOrWhitespace(input: string | null | undefined) {
   return !input || !input.trim()
@@ -52,8 +51,8 @@ export function randomString(length: number = 6) {
   for (let i = length; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)]
   return result
 }
-export function parsePlayerId(playerId: string) {
-  let platform = Platform.Steam
+export function parsePlayerId(playerId: string, defaultPlatform: Platform = Platform.Steam) {
+  let platform = defaultPlatform
   if (playerId.startsWith('S')) platform = Platform.Steam
   else if (playerId.startsWith('M')) platform = Platform.Xbox
   else if (playerId.startsWith('P')) platform = Platform.PlayStation
diff --git a/src/stores/settings.ts b/src/stores/settings.ts
index 278fdb7..c3db107 100644
--- a/src/stores/settings.ts
+++ b/src/stores/settings.ts
@@ -12,6 +12,11 @@ export const PlatformOptions = [
   { value: Platform.Xbox, text: 'Xbox' },
   { value: Platform.PlayStation, text: 'PlayStation' },
 ] as SelectOption[]
+export const PlatformOptionsSmall = [
+  { value: Platform.Steam, text: 'S' },
+  { value: Platform.Xbox, text: 'X' },
+  { value: Platform.PlayStation, text: 'PS' },
+] as SelectOption[]
 
 export const useSettingsStore = defineStore('settings', () => {
   // #region Platform
diff --git a/src/views/EntryListView.vue b/src/views/EntryListView.vue
new file mode 100644
index 0000000..99f1624
--- /dev/null
+++ b/src/views/EntryListView.vue
@@ -0,0 +1,213 @@
+<script setup lang="ts">
+/*
+Copyright (C) 2024 Conor Morgan
+This file is part of ACC Tooklit, which is free software: you can
+redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later version.
+
+ACC Tooklit is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import EntryOptionToggle from '@/components/EntryOptionToggle.vue'
+import FilePicker from '@/components/FilePicker.vue'
+import { useGameData } from '@/composables/gameData'
+import { EntryList, EntryListDriver, EntryListEntry } from '@/lib/gameFiles'
+import { getNextAvailableCarNumber, getPlatformClass } from '@/lib/utils'
+import { useDriverStore } from '@/stores/drivers'
+import { Platform, PlatformOptions } from '@/stores/settings'
+import { orderBy } from 'lodash-es'
+import { computed, ref, watch, watchEffect } from 'vue'
+
+const data = ref<EntryList>()
+const driverStore = useDriverStore()
+const gameData = useGameData()
+
+//#region Default platform
+const defaultPlatform = ref<Platform>(driverStore.defaultPlatform)
+const defaultPlatformClass = computed(() => getPlatformClass(defaultPlatform.value))
+watchEffect(() => {
+  defaultPlatform.value = driverStore.defaultPlatform
+})
+watch(defaultPlatform, (value) => {
+  if (driverStore.defaultPlatform != value) driverStore.updateDefaultPlatform(value)
+})
+//#endregion
+
+//#region Entry management
+function addEntry() {
+  if (!data.value) return
+  let entry = new EntryListEntry()
+  entry.raceNumber = getNextAvailableCarNumber(data.value.entries)
+  data.value.entries.push(entry)
+}
+function sortEntries() {
+  if (!data.value) return
+  data.value.entries = orderBy(data.value.entries, ['raceNumber'])
+}
+//#endregion
+
+//#region Driver management
+function addBlankDriver(entry: EntryListEntry) {
+  entry.drivers.push(new EntryListDriver())
+}
+function addSavedDriver(entry: EntryListEntry) {}
+function makeFirstDriver(entry: EntryListEntry, driver: EntryListDriver) {
+  const index = entry.drivers.indexOf(driver)
+  if (index === 0) return
+  entry.drivers.splice(index, 1)
+  entry.drivers.unshift(driver)
+}
+function deleteDriver(entry: EntryListEntry, driver: EntryListDriver) {
+  const index = entry.drivers.indexOf(driver)
+  entry.drivers.splice(index, 1)
+}
+//#endregion
+
+//#region Cars
+
+//#endregion
+</script>
+
+<template>
+  <main>
+    <div class="container">
+      <h3>Entry List Editor</h3>
+      <div class="wiki-link">
+        <a href="https://www.acc-wiki.info/wiki/Server_Configuration#entrylist.json" target="_blank"><i class="bi bi-info-circle-fill me-1" />View the wiki</a>
+      </div>
+      <template v-if="data">
+        <div class="controls">
+          <div class="d-flex flex-row align-items-center">
+            <div class="me-1">Default platform</div>
+            <b-form-select v-model="defaultPlatform" :class="`platform-select ${defaultPlatformClass}`" :options="PlatformOptions" />
+          </div>
+          <b-button variant="success" @click="addEntry"><i class="bi bi-plus me-1" />Add car</b-button>
+        </div>
+        <div class="entries">
+          <div v-for="(entry, i) in data.entries" class="entry row">
+            <div class="col-12 col-md-1">
+              <div class="car-number">
+                <div>Car</div>
+                <b-form-input v-model="entry.raceNumber" size="lg" />
+              </div>
+              <div class="grid-position">
+                <div>Grid</div>
+                <b-form-input v-model="entry.defaultGridPosition" size="lg" />
+              </div>
+            </div>
+            <div class="drivers col-12 col-md-6">
+              <div v-for="(driver, i) in entry.drivers" :key="driver.playerID" class="driver">
+                <DriverEntryInlineForm v-model="entry.drivers[i]" />
+                <div class="driver-controls">
+                  <b-button variant="secondary" size="sm" :disabled="i === 0" v-b-tooltip.hover.left="'Set as lead driver'" @click="makeFirstDriver(entry, driver)">
+                    <i class="bi bi-award-fill" />
+                  </b-button>
+                  <b-button variant="danger" size="sm" @click="deleteDriver(entry, driver)"><i class="bi bi-trash-fill" /></b-button>
+                </div>
+              </div>
+              <div class="d-flex flex-row justify-content-center gap-2">
+                <b-button variant="outline-success" size="sm" @click="addBlankDriver(entry)"><i class="bi bi-plus me-1" />Add blank</b-button>
+                <b-button disabled variant="outline-success" size="sm" @click="addSavedDriver(entry)"><i class="bi bi-person-arms-up me-1" />Add saved</b-button>
+              </div>
+            </div>
+            <div class="options col-12 col-md-5">
+              <div class="d-flex flex-row gap-1 justify-content-between">
+                <EntryOptionToggle v-model="entry.overrideDriverInfo">Override driver info</EntryOptionToggle>
+                <EntryOptionToggle v-model="entry.overrideCarModelForCustomCar">Override custom car model</EntryOptionToggle>
+                <EntryOptionToggle v-model="entry.isServerAdmin">Server admin</EntryOptionToggle>
+              </div>
+              <b-input-group size="sm">
+                <template #prepend>
+                  <b-input-group-text>Car</b-input-group-text>
+                </template>
+                <b-form-select v-model="entry.forcedCarModel" :options="gameData.carOptions()" size="sm" />
+              </b-input-group>
+              <div class="d-flex flex-row gap-1">
+                <b-input-group size="sm">
+                  <template #prepend>
+                    <b-input-group-text>Ballast</b-input-group-text>
+                  </template>
+                  <b-form-input v-model="entry.ballastKg" type="number" min="0" max="100" size="sm" />
+                  <template #append>
+                    <b-input-group-text>kg</b-input-group-text>
+                  </template>
+                </b-input-group>
+                <b-input-group size="sm">
+                  <template #prepend>
+                    <b-input-group-text>Restrictor</b-input-group-text>
+                  </template>
+                  <b-form-input v-model="entry.ballastKg" type="number" min="0" max="20" size="sm" />
+                  <template #append>
+                    <b-input-group-text>%</b-input-group-text>
+                  </template>
+                </b-input-group>
+              </div>
+              <b-input-group size="sm">
+                <template #prepend>
+                  <b-input-group-text>Custom livery</b-input-group-text>
+                </template>
+                <b-form-input v-model="entry.customCar" type="text" placeholder="exampleCar.json" size="sm" />
+              </b-input-group>
+            </div>
+          </div>
+        </div>
+      </template>
+      <hr />
+      <FilePicker v-model="data" file-name="entrylist" :default="new EntryList()" />
+    </div>
+  </main>
+</template>
+
+<style scoped lang="scss">
+.controls {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  gap: 1em;
+  margin-bottom: 1rem;
+}
+.entries {
+  display: flex;
+  flex-direction: column;
+  gap: 1em;
+
+  .entry {
+    background-color: rgba(0, 0, 0, 0.1);
+    border-radius: 12px;
+    padding: 0.5em 0;
+
+    .drivers {
+      display: flex;
+      flex-direction: column;
+      gap: 0.5em;
+
+      .driver {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+        gap: 0.25em;
+        .driver-controls {
+          display: flex;
+          flex-direction: row;
+          gap: 0.15em;
+        }
+      }
+    }
+
+    .options {
+        display: flex;
+        flex-direction: column;
+        gap: 0.25em;
+    }
+  }
+}
+</style>