diff --git a/build/api/getCarClasses.js b/build/api/getCarClasses.js
new file mode 100644
index 0000000..678da6f
--- /dev/null
+++ b/build/api/getCarClasses.js
@@ -0,0 +1,12 @@
+import { clientGet } from './iracingClient';
+
+// Only used to help get Ring Meister / Draftmaster in check
+export default async function getCarClasses() {
+  const carClassResponse = await clientGet('/data/carclass/get');
+  return carClassResponse.data.map((carClass) => ({
+    id: carClass.id,
+    cars_in_class: carClass.cars_in_class,
+    name: carClass.car_name,
+    short_name: carClass.short_name,
+  }));
+}
diff --git a/build/scrape.js b/build/scrape.js
index f899cbd..e2bdecb 100644
--- a/build/scrape.js
+++ b/build/scrape.js
@@ -5,6 +5,7 @@ import getContributors from './api/getContributors';
 import getCars from './api/getCars';
 import getTracks from './api/getTracks';
 import getSeason from './api/getSeason';
+import getCarClasses from './api/getCarClasses';
 
 (async () => {
   const username = process.env.IWP_USERNAME || 'test';
@@ -33,4 +34,10 @@ import getSeason from './api/getSeason';
     path.join(__dirname, '../src/data/contributors.json'),
     JSON.stringify(contributors, null, 2),
   );
+
+  const carClasses = await getCarClasses();
+  await writeFile(
+    path.join(__dirname, '../src/data/car-class.json'),
+    JSON.stringify(carClasses, null, 2),
+  );
 })();
diff --git a/src/config.js b/src/config.js
index 09a119c..3621c6f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,8 +1,8 @@
 import moment from 'moment';
 
-export const seasonStart = moment('2023-12-12T00:00:00+00:00').utc();
-export const seasonEnd = moment('2024-03-11T00:00:00+00:00').utc();
-export const weekSeasonStart = moment('2023-12-12T00:00:00+00:00').utc();
+export const seasonStart = moment('2024-03-12T00:00:00+00:00').utc();
+export const seasonEnd = moment('2024-06-10T00:00:00+00:00').utc();
+export const weekSeasonStart = moment('2024-03-12T00:00:00+00:00').utc();
 
 export const firebaseConfig = {
   apiKey: 'AIzaSyAWNRqHLhhvhzKl0gkKybocd0nAk2eTlVg',
diff --git a/src/data/changelog.js b/src/data/changelog.js
index 9e1dd11..fd18ef6 100644
--- a/src/data/changelog.js
+++ b/src/data/changelog.js
@@ -1,6 +1,11 @@
 import moment from 'moment';
 
 export default [{
+  date: moment('2024-03-12 00:00:00').utc(),
+  items: [
+    'Update to 2024S2',
+  ],
+}, {
   date: moment('2024-03-06 00:00:00').utc(),
   items: [
     'Update with new categories',
diff --git a/src/data/offWeeks.js b/src/data/offWeeks.js
index b8e2780..7120b1d 100644
--- a/src/data/offWeeks.js
+++ b/src/data/offWeeks.js
@@ -229,4 +229,66 @@ export default {
       1.1, 2.1, 2.1, 2.1, 4.1, 5.1, 8.1, 9.1, 12.1, 12.1, 12.1, 15.1,
     ],
   },
+  // Prelim Draft Master - Fixed
+  99998: {
+    carByWeek: [
+      [10068], // 1 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      [10481, 10530, 10459], // 2 NASCAR Trucks
+      [10527, 10482, 10483, 10566], // 3 NASCAR Classic 1987
+      [10503, 10504, 10505], // 4 NASCAR Next Gen
+      [10068], // 5 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      [10481, 10530, 10459], // 6 NASCAR Trucks
+      [10527, 10482, 10483, 10566], // 7 NASCAR Classic 1987
+      [10503, 10504, 10505], // 8 NASCAR Next Gen
+      [10068], // 9 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      [10481, 10530, 10459], // 10 NASCAR Trucks
+      [10527, 10482, 10483, 10566], // 11 NASCAR Classic 1987
+      [10503, 10504, 10505], // 12 NASCAR Next Gen
+    ],
+    carClassShortNameByWeek: [
+      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 1 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      ['NASCAR Trucks'], // 2 NASCAR Trucks
+      ['NASCAR 1987'], // 3 NASCAR Classic 1987
+      ['NASCAR 2022 NG'], // 4 NASCAR Next Gen
+      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 5 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      ['NASCAR Trucks'], // 6 NASCAR Trucks
+      ['NASCAR 1987'], // 7 NASCAR Classic 1987
+      ['NASCAR 2022 NG'], // 8 NASCAR Next Gen
+      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 9 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      ['NASCAR Trucks'], // 10 NASCAR Trucks
+      ['NASCAR 1987'], // 11 NASCAR Classic 1987
+      ['NASCAR 2022 NG'], // 12 NASCAR Next Gen
+    ],
+  },
+  // Prelim Ring Meister
+  99999: {
+    carByWeek: [
+      [10306], // 1 Cadillac CTS-V Racecar
+      [10548], // 2 Renault Clio
+      [10552], // 3 Ligier JS P320
+      [10110], // 4 Lotus 79
+      [10517], // 5 Honda Civic Type R TCR
+      [10457], // 6 BMW M8 GTE
+      [10524], // 7 Stock Car Brasil Chevrolet Cruze
+      [10394], // 8 Global Mazda MX-5 Cup
+      [10113], // 9 Chevrolet Corvette C6.R GT
+      [10563], // 10 Ferrari 296 GT3
+      [10040], // 11 Radical SR8
+      [999999], // 12 ??????
+    ],
+    carClassShortNameByWeek: [
+      ['Cadillac CTS-VR'], // 1 Cadillac CTS-V Racecar
+      ['Renault Clio'], // 2 Renault Clio
+      ['Ligier JS P320'], // 3 Ligier JS P320
+      ['Lotus 79'], // 4 Lotus 79
+      ['Civic Type R'], // 5 Honda Civic Type R TCR
+      ['BMW M8 GTE'], // 6 BMW M8 GTE
+      ['Stock Car Brasil'], // 7 Stock Car Brasil Chevrolet Cruze
+      ['MX5 Cup 2016'], // 8 Global Mazda MX-5 Cup
+      ['C6R GT1'], // 9 Chevrolet Corvette C6.R GT
+      ['Ferrari 296 GT3'], // 10 Ferrari 296 GT3
+      ['SR8'], // 11 Radical SR8
+      [999999], // 12 ?????
+    ],
+  },
 };