diff --git a/seasoned_api/src/tmdb/tmdb.js b/seasoned_api/src/tmdb/tmdb.js
index a536381..c9481b7 100644
--- a/seasoned_api/src/tmdb/tmdb.js
+++ b/seasoned_api/src/tmdb/tmdb.js
@@ -1,7 +1,10 @@
 const moviedb = require('moviedb');
 const convertTmdbToSeasoned = require('src/tmdb/convertTmdbToSeasoned');
-var methodTypes = { 'movie': 'searchMovie', 'tv': 'searchTv', 'multi': 'searchMulti', 'movieInfo': 'movieInfo', 
-	'tvInfo': 'tvInfo' };
+var methodTypes = { 'movie': 'searchMovie', 'show': 'searchTv', 'multi': 'searchMulti', 'movieInfo': 'movieInfo', 
+	'tvInfo': 'tvInfo', 'upcomingMovies': 'miscUpcomingMovies', 'discoverMovie': 'discoverMovie', 
+	'discoverShow': 'discoverTv', 'popularMovies': 'miscPopularMovies', 'popularShows': 'miscPopularTvs',
+	'nowPlayingMovies': 'miscNowPlayingMovies', 'nowAiringShows': 'tvOnTheAir', 'movieSimilar': 'movieSimilar',
+	'showSimilar': 'tvSimilar' };
 
 class TMDB {
 	constructor(apiKey, tmdbLibrary) {
@@ -9,7 +12,7 @@ class TMDB {
 	}
 
 	search(text, page = 1, type = 'multi') {
-		const query = { query: text, page };
+		const query = { 'query': text, 'page': page };
 		return Promise.resolve()
 		 .then(() => this.tmdb(type, query))
 		 .catch(() => { throw new Error('Could not search for movies.'); })
@@ -26,27 +29,235 @@ class TMDB {
 	}
 
 
+	/**
+	* Retrive list of discover section of movies from TMDB.
+	* @param {Page, type} the page number to specify in the request for discover, 
+	* and type for movie or show
+	* @returns {Promise} dict with query results, current page and total_pages
+	*/ 
+	discover(page, type='movie') {
+		// Sets the tmdb function type to the corresponding type from query
+		var tmdbType;
+		if (type === 'movie') {
+			tmdbType = 'discoverMovie';
+		} else if (type === 'show') {
+			tmdbType = 'discoverShow';
+		} else {
+			// Throw error if invalid type from query
+			return Promise.resolve()
+			.then(() => {
+				throw new Error('Invalid type declaration.')
+			})
+		}
+
+		// Build a query for tmdb with pagenumber
+		const query = { 'page': page }
+		return Promise.resolve()
+			.then(() => this.tmdb(tmdbType, query))
+			.catch(() => { throw new Error('Could not fetch discover.'); })
+			.then((response) => {
+				try {
+					// Return a object that has the results and a variable for page, total_pages 
+					// and seasonedResponse
+					var seasonedResponse = response.results.map((result) => { 
+						return convertTmdbToSeasoned(result, type); }
+					);
+					return { 'results': seasonedResponse,
+						'page': response.page, 'total_pages': response.total_pages };
+				} catch (error) {
+					console.log(error)
+					throw new Error('Error while parsing discover list.')
+				}
+			});
+	}
+
+
+	/**
+	* Retrive list of popular section of movies or shows from TMDB.
+	* @param {Page, type} the page number to specify in the request for popular, 
+	* and type for movie or show
+	* @returns {Promise} dict with query results, current page and total_pages
+	*/ 
+	// TODO add filter for language
+	popular(page, type='movie') {
+		// Sets the tmdb function type to the corresponding type from query
+		var tmdbType;
+		if (type === 'movie') {
+			tmdbType = 'popularMovies';
+		} else if (type === 'show') {
+			tmdbType = 'popularShows';
+		} else {
+			// Throw error if invalid type from query
+			return Promise.resolve()
+			.then(() => {
+				throw new Error('Invalid type declaration.')
+			})
+		}
+
+		// Build a query for tmdb with pagenumber
+		const query = { 'page': page }
+		return Promise.resolve()
+			.then(() => this.tmdb(tmdbType, query))
+			.catch(() => { throw new Error('Could not fetch popular.'); })
+			.then((response) => {
+				try {
+					var seasonedResponse = response.results.map((result) => { 
+						return convertTmdbToSeasoned(result, type); }
+					);
+					// Return a object that has the results and a variable for page, total_pages 
+					// and seasonedResponse
+					return { 'results': seasonedResponse,
+						'page': response.page, 'total_pages': response.total_pages };
+				} catch (error) {
+					console.log(error)
+					throw new Error('Error while parsing discover list.')
+				}
+			});
+	}
+
+
+
+	/**
+	* Retrive list of now playing/airing section of movies or shows from TMDB.
+	* @param {Page, type} the page number to specify in the request for now playing/airing, 
+	* and type for movie or show
+	* @returns {Promise} dict with query results, current page and total_pages
+	*/ 
+	// TODO add filter for language
+	nowplaying(page, type='movie') {
+		// Sets the tmdb function type to the corresponding type from query
+		var tmdbType;
+		if (type === 'movie') {
+			tmdbType = 'nowPlayingMovies';
+		} else if (type === 'show') {
+			tmdbType = 'nowAiringShows';
+		} else {
+			// Throw error if invalid type from query
+			return Promise.resolve()
+			.then(() => {
+				throw new Error('Invalid type declaration.')
+			})
+		}
+
+		// Build a query for tmdb with pagenumber
+		const query = { 'page': page }
+		return Promise.resolve()
+			.then(() => this.tmdb(tmdbType, query))
+			.catch(() => { throw new Error('Could not fetch popular.'); })
+			.then((response) => {
+				try {
+					var seasonedResponse = response.results.map((result) => { 
+						return convertTmdbToSeasoned(result, type); }
+					);
+					// Return a object that has the results and a variable for page, total_pages 
+					// and seasonedResponse
+					return { 'results': seasonedResponse,
+						'page': response.page, 'total_pages': response.total_pages };
+				} catch (error) {
+					console.log(error)
+					throw new Error('Error while parsing discover list.')
+				}
+			});
+	}
+
+	/**
+	* Retrive list of upcmoing movies from TMDB.
+	* @param {Page} the page number to specify in the request for upcoming movies
+	* @returns {Promise} dict with query results, current page and total_pages
+	*/ 
+	// TODO add filter for language
+	upcoming(page) {
+		const query = { 'page': page }
+		return Promise.resolve()
+			.then(() => this.tmdb('upcomingMovies', query))
+			.catch(() => { throw new Error('Could not fetch upcoming movies.'); })
+			.then((response) => {
+				try {
+					var seasonedResponse = response.results.map((result) => { 
+						return convertTmdbToSeasoned(result, 'movie'); }
+					);
+					// Return a object that has the results and a variable for page, total_pages 
+					// and seasonedResponse
+					return { 'results': seasonedResponse,
+						'page': response.page, 'total_pages': response.total_pages };
+				} catch (parseError) {
+					throw new Error('Error while parsing upcoming movies list.')
+				}
+			});
+	}
+
+
+	/**
+	* Retrive list of upcmoing movies from TMDB.
+	* @param {Page} the page number to specify in the request for upcoming movies
+	* @returns {Promise} dict with query results, current page and total_pages
+	*/ 
+	// TODO add filter for language
+	similar(identifier, type) {
+		var tmdbType;
+		if (type === 'movie') {
+			tmdbType = 'movieSimilar';
+		} else if (type === 'show') {
+			tmdbType = 'showSimilar';
+		} else {
+			// Throw error if invalid type from query
+			return Promise.resolve()
+			.then(() => {
+				throw new Error('Invalid type declaration.')
+			})
+		}
+
+		const query = { id: identifier }
+		return Promise.resolve()
+			.then(() => this.tmdb(tmdbType, query))
+			.catch(() => { throw new Error('Could not fetch upcoming movies.'); })
+			.then((response) => {
+				try {
+					var seasonedResponse = response.results.map((result) => { 
+						return convertTmdbToSeasoned(result, type); }
+					);
+					// Return a object that has the results and a variable for page, total_pages 
+					// and seasonedResponse
+					return { 'results': seasonedResponse,
+						'page': response.page, 'total_pages': response.total_pages };
+				} catch (parseError) {
+					throw new Error('Error while parsing silimar media list.')
+				}
+			});
+	}
+
+
 	/**
 	* Retrieve a specific movie by id from TMDB.
 	* @param {Number} identifier of the movie you want to retrieve
 	* @returns {Promise} succeeds if movie was found
 	*/
-	lookup(identifier, type = 'movie') {
-		if (type === 'movie') { type = 'movieInfo'}
-			else if (type === 'tv') { type = 'tvInfo'}
+	lookup(identifier, queryType = 'movie') {
+		var type;
+		if (queryType === 'movie') { type = 'movieInfo'}
+		else if (queryType === 'show') { type = 'tvInfo'}
+		else {
+			return Promise.resolve()
+			.then(() => {
+				throw new Error('Invalid type declaration.')
+			})
+		}
 		const query = { id: identifier };
 		return Promise.resolve()
-		.then(() => this.tmdb(type, query))
-		.catch(() => { throw new Error('Could not find a movie with that id.'); })
-		.then((response) => {
-		  try {
-		    return convertTmdbToSeasoned(response);
-		  } catch (parseError) {
-		    throw new Error('Could not parse movie.');
-		  }
-		});
+			.then(() => this.tmdb(type, query))
+			.catch(() => { throw new Error('Could not find a movie with that id.'); })
+			.then((response) => {
+			  try {
+			    var car = convertTmdbToSeasoned(response, queryType);
+			    console.log(car);
+			    return car;
+			  } catch (parseError) {
+			    throw new Error('Could not parse movie.');
+			  }
+			});
 	}
 
+	// TODO ADD CACHE LOOKUP
 	tmdb(method, argument) {
 		return new Promise((resolve, reject) => {
 			const callback = (error, reponse) => {
@@ -58,6 +269,7 @@ class TMDB {
 
 			if (!argument) {
 				this.tmdbLibrary[methodTypes[method]](callback);
+				// this.tmdbLibrary['miscUpcomingMovies']
 			} else {
 				this.tmdbLibrary[methodTypes[method]](argument, callback);
 			}