diff --git a/seasoned_api/src/tmdb/convertTmdbToMovie.js b/seasoned_api/src/tmdb/convertTmdbToMovie.js
deleted file mode 100644
index 7740cca..0000000
--- a/seasoned_api/src/tmdb/convertTmdbToMovie.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const Movie = require('src/media_classes/movie');
-
-function convertTmdbToMovie(tmdbMovie) {
-	const movie = new Movie();
-	movie.id = tmdbMovie.id;
-	if (tmdbMovie.media_type === 'movie' || tmdbMovie.release_date !== undefined) {
-		movie.title = tmdbMovie.title;
-		movie.type = 'movie';
-
-		if (tmdbMovie.release_date !== undefined) {
-			movie.release_date = new Date(tmdbMovie.release_date);
-			movie.year = movie.release_date.getFullYear();
-		}
-	} else if (tmdbMovie.first_air_date !== undefined) {
-		movie.title = tmdbMovie.name;
-		movie.type = 'show';
-		if (tmdbMovie.first_air_date !== undefined) {
-			movie.release_date = new Date(tmdbMovie.first_air_date);
-			movie.year = movie.release_date.getFullYear();
-		}
-	}
-
-	movie.poster = tmdbMovie.poster_path;
-	movie.background = tmdbMovie.backdrop_path;
-	movie.overview = tmdbMovie.overview;
-
-	return movie;
-}
-
-module.exports = convertTmdbToMovie;
\ No newline at end of file
diff --git a/seasoned_api/src/tmdb/convertTmdbToSeasoned.js b/seasoned_api/src/tmdb/convertTmdbToSeasoned.js
new file mode 100644
index 0000000..3f6c65e
--- /dev/null
+++ b/seasoned_api/src/tmdb/convertTmdbToSeasoned.js
@@ -0,0 +1,38 @@
+const Movie = require('src/media_classes/movie');
+const Show = require('src/media_classes/show');
+
+function convertTmdbToSeasoned(tmdbObject) {
+	console.log(tmdbObject)
+
+	const mediaType = tmdbObject.media_type;
+
+	// There are many diff types of content, we only want to look at movies and tv shows
+	if (mediaType === 'movie') {
+		const year = new Date(tmdbObject.release_date).getFullYear();
+
+		const movie = new Movie(tmdbObject.title, year, mediaType);
+
+		movie.summary = tmdbObject.overview;
+		movie.rating = tmdbObject.vote_average;
+		movie.poster = tmdbObject.poster_path;
+		movie.background = tmdbObject.backdrop_path;
+		movie.genre = tmdbObject.genre_ids;
+
+		return movie;
+	} 
+	else if (mediaType === 'tv') {
+		const year = new Date(tmdbObject.first_air_date).getFullYear();
+
+		const show = new Show(tmdbObject.title, year, mediaType);
+
+		show.summary = tmdbObject.overview;
+		show.rating = tmdbObject.vote_average;
+		show.poster = tmdbObject.poster_path;
+		show.background = tmdbObject.backdrop_path;
+		show.genre = tmdbObject.genre_ids;
+
+		return show;
+	}
+}
+
+module.exports = convertTmdbToSeasoned;
\ No newline at end of file