diff --git a/client/src/Router.tsx b/client/src/Router.tsx
index e2d90110..ceff3f26 100644
--- a/client/src/Router.tsx
+++ b/client/src/Router.tsx
@@ -12,6 +12,7 @@ import { ImportFromFloxPage } from './pages/import/ImportFromFloxPage';
 import { ImportFromGoodreadsPage } from './pages/import/ImportFromGoodreadsPage';
 import { ImportFromSimklPage } from './pages/import/ImportFromSimklPage';
 import { ImportFromTraktPage } from './pages/import/ImportFromTraktPage';
+import { ImportFromCsvPage } from './pages/import/ImportFromCsvPage';
 import { ImportPage } from './pages/ImportPage';
 import { JellyfinIntegrationPage } from './pages/integrations/JellyfinIntegrationPage';
 import { KodiIntegrationPage } from './pages/integrations/KodiIntegrationPage';
@@ -159,6 +160,10 @@ export const router = createBrowserRouter([
             path: '/import/mediatracker',
             element: <ImportFormMediaTrackerPage />,
           },
+          {
+            path: '/import/csv',
+            element: <ImportFromCsvPage />,
+          },
           {
             path: '/integrations',
             element: <IntegrationsPage />,
diff --git a/client/src/pages/ImportFromFilePage.tsx b/client/src/pages/ImportFromFilePage.tsx
index 00faddda..a19b02f2 100644
--- a/client/src/pages/ImportFromFilePage.tsx
+++ b/client/src/pages/ImportFromFilePage.tsx
@@ -61,7 +61,8 @@ export const ImportFormFilePage: FC<{
                 />
                 {importFromFile.isError && (
                   <div className="text-red-600">
-                    <Trans>Unexpected file format</Trans>
+                    <Trans>Unexpected file format</Trans><br/>
+                    <pre>{ importFromFile.variables?.source == 'CSV' ? importFromFile.error.message : "" }</pre>
                   </div>
                 )}
                 {file && (
diff --git a/client/src/pages/ImportPage.tsx b/client/src/pages/ImportPage.tsx
index 24713a81..5c7f6bcf 100644
--- a/client/src/pages/ImportPage.tsx
+++ b/client/src/pages/ImportPage.tsx
@@ -27,6 +27,7 @@ export const ImportPage: FC = () => {
         <ImportLinkComponent path="simkl" imgSrc={simklLogo} />
         <ImportLinkComponent path="ryot" imgSrc={ryotLogo} />
         <ImportLinkComponent path="mediatracker" text="backup" />
+        <ImportLinkComponent path="csv" text="CSV" />
       </div>
     </>
   );
diff --git a/client/src/pages/SearchPage.tsx b/client/src/pages/SearchPage.tsx
index 31da8855..d92e69aa 100644
--- a/client/src/pages/SearchPage.tsx
+++ b/client/src/pages/SearchPage.tsx
@@ -55,6 +55,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
     narrator: ['audiobook'],
     tmdbId: ['movie', 'tv'],
     imdbId: ['movie', 'tv'],
+    igdbId: ['video_game']
   });
 
   const [query, setQuery] = useState({
@@ -63,6 +64,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
     narrator: searchParams.get('narrator'),
     imdbId: searchParams.get('imdbId'),
     tmdbId: parseInt(searchParams.get('tmdbId') || '') || null,
+    igdbId: parseInt(searchParams.get('igdbId') || '') || null,
   });
 
   const searchQuery = trpc.search.search.useQuery(
@@ -106,6 +108,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
         narrator: string;
         imdbId: string;
         tmdbId: string;
+        igdbId: string;
       }>
         className="flex flex-col gap-5 md:flex-row"
         validation={
@@ -120,9 +123,10 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
                 },
               }
             : undefined
-        }
+        } 
         initialValues={{
           tmdbId: query.tmdbId?.toString() || undefined,
+          igdbId: query.igdbId?.toString() || undefined,
           author: query.author || undefined,
           imdbId: query.imdbId || undefined,
           narrator: query.narrator || undefined,
@@ -137,6 +141,9 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
               data.tmdbId?.length > 0
                 ? !isNaN(parseInt(data.tmdbId || ''))
                 : false,
+              data.igdbId?.length > 0
+                ? !isNaN(parseInt(data.igdbId || ''))
+                : false,
               data.imdbId,
             ].filter(Boolean).length === 0
           ) {
@@ -152,6 +159,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
             narrator: data.narrator || null,
             imdbId: data.imdbId || null,
             tmdbId: parseInt(data.tmdbId || '') || null,
+            igdbId: parseInt(data.igdbId || '') || null,
           };
 
           setQuery(newQuery);
@@ -171,7 +179,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
             <input
               type="text"
               autoFocus
-              className="w-full md:w-80"
+              className="w-full md:max-w-80"
               placeholder={t`Query`}
               ref={ref('query')}
               value={q}
@@ -183,6 +191,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
                   narrator: null,
                   query: null,
                   tmdbId: null,
+                  igdbId: null,
                 });
               }}
             />
@@ -190,7 +199,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
             {canUse('author') && (
               <input
                 type="text"
-                className="w-full md:w-80"
+                className="w-full md:max-w-80"
                 aria-label={t`Author`}
                 placeholder={t`Author`}
                 ref={ref('author')}
@@ -199,7 +208,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
             {canUse('narrator') && (
               <input
                 type="text"
-                className="w-full md:w-80"
+                className="w-full md:max-w-80"
                 aria-label={t`Narrator`}
                 placeholder={t`Narrator`}
                 ref={ref('narrator')}
@@ -209,7 +218,7 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
             {canUse('tmdbId') && (
               <input
                 type="text"
-                className="w-full md:w-80"
+                className="w-full md:max-w-80"
                 aria-label="tmdb"
                 placeholder="tmdb"
                 ref={ref('tmdbId')}
@@ -219,13 +228,23 @@ const SearchPageImpl: FC<{ mediaType: MediaType }> = (props) => {
             {canUse('imdbId') && (
               <input
                 type="text"
-                className="w-full md:w-80"
+                className="w-full md:max-w-80"
                 aria-label="imdb"
                 placeholder="imdb"
                 ref={ref('imdbId')}
               />
             )}
 
+            {canUse('igdbId') && (
+              <input
+                type="text"
+                className="w-full md:max-w-80"
+                aria-label="igdb"
+                placeholder="igdb"
+                ref={ref('igdbId')}
+              />
+            )}
+
             <Button
               actionType="submit"
               text={<Trans>Search</Trans>}
diff --git a/client/src/pages/import/ImportFromCsvPage.tsx b/client/src/pages/import/ImportFromCsvPage.tsx
new file mode 100644
index 00000000..7c1e4e2f
--- /dev/null
+++ b/client/src/pages/import/ImportFromCsvPage.tsx
@@ -0,0 +1,83 @@
+import { FC } from 'react';
+import { ImportFormFilePage } from '../ImportFromFilePage';
+import { Trans } from '@lingui/macro';
+import { MainTitle } from '../../components/MainTitle';
+
+export const ImportFromCsvPage: FC = () => {
+  return (
+    <>
+      <MainTitle
+        elements={[<Trans>Import</Trans>, <Trans>from CSV</Trans>]}
+      />
+
+      <ImportFormFilePage
+        source="CSV"
+        fileType="text/csv"
+        itemTypes={['movie', 'tv']}
+        instructions={<div>{
+          <CsvInstructions />
+        }</div>}
+      />
+    </>
+  );
+};
+
+const CsvInstructions: FC = () => {
+  
+  //workaround because react and the ligui lib process escapes differently
+  const newline = '\\n';
+  
+  return (
+    <details className="instructions">
+      <summary className="instructions-summary">
+        <Trans>Click to show CSV file requirements</Trans>
+      </summary>
+      <div className="instructions-content">
+        <ul className="ml-8 list-decimal">
+          <li><Trans>Comma delimited, plain UTF-8 files only</Trans></li>
+          <li><Trans>Quote and escape characters are optional but must use double quotes: "</Trans></li>
+          <li><Trans>Windows (\r{newline}), Linux ({newline}) and old macOS (\r) record delimiters are auto-detected</Trans></li>
+          <li><Trans>The first line MUST be column headers</Trans></li>
+          <li>
+            <Trans>Allowed column headers are, in any order and case-insensitive:</Trans><br/>
+            <code>type, imdbId, tmdbId, tvdbId, listId, rating, seen, season, episode</code>
+          </li>
+          <li><Trans>The only mandatory column is</Trans> <code>type</code></li>
+          <li>
+            <Trans>Valid values for <code>type</code> are:</Trans><br/>
+            <code>tv, movie</code>
+          </li>
+          <li>
+            <Trans>Other columns are optional, but you must include at least one of:</Trans><br/>
+            <code>tmdbId, imdbId, tvdbId</code>
+          </li>
+          <li><Trans>Leading and trailing whitespaces are stripped</Trans></li>
+          <li><Trans>Any record that cannot be parsed or contains errors will be skipped</Trans></li>
+          <li><Trans>Any record with missing fields compared to header will be skipped</Trans></li>
+          <li><Trans>List IDs must exist and be owned by the user</Trans></li>
+          <li><Trans>Items with invalid or other users list IDs are discarded</Trans></li>
+          <li><Trans>The watchlist list ID is found on the Lists page</Trans></li>
+          <li><Trans>Seen is a Y/N column only</Trans></li>
+          <li>
+            <Trans>Movies will be looked up in this order:</Trans><br />
+            <code>tmdbId, imdbId</code>
+          </li>
+          <li>
+            <Trans>TV shows will be looked up in this order:</Trans><br />
+            <code>tmdbId, imdbId, tvdbId</code>
+          </li>
+          <li><Trans>TV shows must only use the show's main ID from tvdb, tmdb, or imdb</Trans></li>
+          <li>
+            <Trans>To set episodes of a TV show as Seen, must provide a record for each:</Trans><br />
+            <code>season</code> <Trans>and</Trans> <code>episode</code>
+          </li>
+          <li><Trans>Valid ratings are decimal values between 0.1 and 10.0</Trans></li>
+          <li>
+            <Trans>If you use "out of 5" ratings, multiply the value by 2</Trans><br/>
+            <Trans>Eg: for a rating of 4 out of 5, provide a value of 8</Trans>
+          </li>
+        </ul>
+      </div>
+    </details>
+  );
+};
diff --git a/src/import/csvImport.ts b/src/import/csvImport.ts
new file mode 100644
index 00000000..115a26a9
--- /dev/null
+++ b/src/import/csvImport.ts
@@ -0,0 +1,110 @@
+import { parse } from 'csv-parse/sync';
+import _ from 'lodash';
+import { record, z } from 'zod';
+
+import { ImportDataType, ImportListItem, ImportRatingItem, ImportSeenHistoryItem, ImportWatchlistItem } from '../repository/importRepository.js';
+import { listRepository } from '../repository/listRepository.js';
+import { mediaTypeSchema } from '../entity/mediaItemModel.js';
+
+export const csvImport = {
+  async map(user: number, csvData: string): Promise<ImportDataType> {
+    const data = csvImportSchema.parse(
+      parse(csvData, {
+        bom: true,                     //detects and removes any utf-8 byte order marks
+        delimiter: ',',                //did you know the "C" in CSV stands for "comma"? :)
+        columns: header => header.map((column: string) => column.toLowerCase()),
+        skip_empty_lines: true,        //blank lines are ignored
+        skip_records_with_error: true, //if any field parsing errors (eg: invalid numbers), skip entire record
+        trim: true                     //strip leading and trailing whitespace in fields
+      })
+    )
+    .filter(item => 
+      (Object.values(mediaTypeSchema.Values).includes(item.type)) // sanity check
+      && ((item.type === 'tv' && (item.tmdbid || item.imdbid || item.tvdbid))
+         ||(item.type === 'movie' && (item.tmdbid || item.imdbid)))
+    );
+
+    const dateNow = new Date();
+    const userLists = await listRepository.getLists({userId: user});
+    const watchListId = userLists.find(userList => userList.isWatchlist)?.id;
+
+    const importLists = _(data)
+      .map((item) => item.listid)
+      .uniq()
+      .value();
+
+    const importData: ImportDataType = {
+      ratings: data
+        .filter((item) => item.rating && item.rating > 0)
+        .map((item) => (<ImportRatingItem>{
+          itemType: item.type,
+          tmdbId: item.tmdbid ? item.tmdbid : undefined,
+          imdbId: item.imdbid ? item.imdbid : undefined,
+          tvdbId: item.tvdbid ? item.tvdbid : undefined,
+          rating: item.rating,
+          ratedAt: dateNow,
+          episode: item.type === 'tv' ? {
+            seasonNumber: item.season ? item.season : undefined,
+            episodeNumber: item.episode ? item.episode : undefined
+          } : undefined
+      })),
+      watchlist: data
+        .filter((item) => item.listid && watchListId && item.listid == watchListId)
+        .map((item) => (<ImportWatchlistItem>{
+          itemType: item.type,
+          tmdbId: item.tmdbid ? item.tmdbid : undefined,
+          imdbId: item.imdbid ? item.imdbid : undefined,
+          tvdbId: item.tvdbid ? item.tvdbid : undefined,
+          addedAt: dateNow
+      })),
+      seenHistory: data
+        .filter((item) => item.seen == 'Y')
+        .map((item) => (<ImportSeenHistoryItem>{
+          itemType: item.type === 'tv' ? 'episode' : item.type,
+          tmdbId: item.tmdbid ? item.tmdbid : undefined,
+          imdbId: item.imdbid ? item.imdbid : undefined,
+          tvdbId: item.tvdbid ? item.tvdbid : undefined,
+          seenAt: dateNow,
+          episode: item.type === 'tv' ? {
+            seasonNumber: item.season ? item.season : undefined,
+            episodeNumber: item.episode ? item.episode : undefined
+          } : undefined
+      })),
+      lists: userLists
+        .filter((userList) => importLists.find(importList =>
+          !userList.isWatchlist && importList == userList.id))
+        .map((list) => (<ImportListItem>{
+          name: list.name,
+          description: list.description,
+          traktId: list.traktId,
+          createdAt: dateNow,
+          items: data
+            .filter((item) => item.listid == list.id)
+            .map((item) => ({
+              itemType: item.type,
+              tmdbId: item.tmdbid ? item.tmdbid : undefined,
+              imdbId: item.imdbid ? item.imdbid : undefined,
+              tvdbId: item.tvdbid ? item.tvdbid : undefined,
+              addedAt: dateNow
+        }))
+      }))
+    }
+
+    return importData;
+  },
+};
+
+const csvImportSchema = z.array(
+  z.object({
+    //lowercase every column name to allow case insensitive parsing
+    type: z.enum(['tv', 'movie']),
+    tmdbid: z.coerce.number().optional(),
+    imdbid: z.string().optional(),
+    tvdbid: z.coerce.number().optional(),
+    listid: z.coerce.number().optional(),
+    rating: z.coerce.number().optional(),
+    seen: z.string().optional(),
+    season: z.coerce.number().optional(),
+    episode: z.coerce.number().optional()
+  })
+);
diff --git a/src/routers/importRouter.ts b/src/routers/importRouter.ts
index 1261e6f4..4d5c4d7f 100644
--- a/src/routers/importRouter.ts
+++ b/src/routers/importRouter.ts
@@ -5,6 +5,7 @@ import { backupImport } from '../import/backupImport.js';
 import { floxImport } from '../import/floxImport.js';
 import { goodreadsImport } from '../import/goodreadsImport.js';
 import { simklImport } from '../import/simklImport.js';
+import { csvImport } from '../import/csvImport.js';
 import {
   importRepository,
   ImportState,
@@ -18,6 +19,7 @@ const importSourceSchema = z.enum([
   'Goodreads',
   'Simkl',
   'MediaTracker',
+  'CSV',
   'Ryot',
 ]);
 
@@ -82,7 +84,7 @@ const importFromFileHandler = async (args: {
   });
 
   try {
-    const importData = await mapImportData(source, data);
+    const importData = await mapImportData(userId, source, data);
 
     await importRepository.importDataByExternalIds({
       userId,
@@ -125,7 +127,7 @@ const progressMap = (() => {
   return { set, get, remove, has };
 })();
 
-const mapImportData = async (source: ImportSource, data: string) => {
+const mapImportData = async (userId: number, source: ImportSource, data: string) => {
   switch (source) {
     case 'Flox':
       return floxImport.map(data);
@@ -136,6 +138,8 @@ const mapImportData = async (source: ImportSource, data: string) => {
       return simklImport.map(data);
     case 'MediaTracker':
       return backupImport.map(data);
+    case 'CSV':
+      return csvImport.map(userId, data);
     case 'Ryot':
       return ryotImport.map(data);
   }
diff --git a/src/routers/searchRouter.ts b/src/routers/searchRouter.ts
index e556cef6..15ee5e94 100644
--- a/src/routers/searchRouter.ts
+++ b/src/routers/searchRouter.ts
@@ -10,6 +10,7 @@ import { logger } from '../logger.js';
 import { metadataProviders } from '../metadata/metadataProviders.js';
 import { TmdbMovie } from '../metadata/provider/tmdbMovie.js';
 import { TmdbTv } from '../metadata/provider/tmdbTv.js';
+import { IGDB } from '../metadata/provider/igdb.js';
 import { mediaItemRepository } from '../repository/mediaItemRepository.js';
 import { protectedProcedure, router } from '../router.js';
 import { h, is } from '../utils.js';
@@ -32,6 +33,7 @@ export const searchRouter = router({
           narrator: z.string().nullish(),
           imdbId: z.string().nullish(),
           tmdbId: z.number().nullish(),
+          igdbId: z.number().nullish(),
         }),
         mediaType: mediaTypeSchema,
       })
@@ -57,6 +59,9 @@ export const searchRouter = router({
         } else if (query.tmdbId && mediaType === 'movie') {
           logger.debug(h`searching TMDB for a movie by tmdb: ${query.tmdbId}`);
           return [await TmdbMovie.findByTmdbId(query.tmdbId)];
+        } else if (query.igdbId && mediaType === 'video_game') {
+          logger.debug(h`searching IGDB for a game by igdb: ${query.igdbId}`);
+          return [await IGDB.findByIgdbId(query.igdbId)];
         }
 
         const metadataProvider = metadataProviders.get(mediaType);