diff --git a/README.md b/README.md
index 187cdb442..cd8d3a9ad 100644
--- a/README.md
+++ b/README.md
@@ -270,7 +270,7 @@ Note: For Waves 2, 3, 4, and 5, your implementation of each of the functions sho
   - The average rating of an empty watched list is `0.0`
 - return the average rating
 
-2. Create a function named `get_most_watched_genre`. This function should...
+2. Create a function named ``get_most_watched_genre``. This function should...
 
 - take one parameter: `user_data`
   - the value of `user_data` will be a dictionary with a `"watched"` list of movie dictionaries. Each movie dictionary has a key `"genre"`.
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 6be6994a5..815b89621 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -1,10 +1,10 @@
 import pytest
 # NOTE: In production code, we developers should change import * to something more specific. Due to some constraints of this project, we will import * in our test files.
-# from viewing_party.main import *
+#from viewing_party.main import *
 from viewing_party.party import *
 from tests.test_constants import *
-
-@pytest.mark.skip()
+#
+#@pytest.mark.skip()
 def test_create_successful_movie():
     # Arrange
     movie_title = MOVIE_TITLE_1
@@ -19,7 +19,7 @@ def test_create_successful_movie():
     assert new_movie["genre"] == GENRE_1
     assert new_movie["rating"] == pytest.approx(RATING_1)
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_create_no_title_movie():
     # Arrange
     movie_title = None
@@ -32,7 +32,7 @@ def test_create_no_title_movie():
     # Assert
     assert new_movie is None
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_create_no_genre_movie():
     # Arrange
     movie_title = "Title A"
@@ -45,7 +45,7 @@ def test_create_no_genre_movie():
     # Assert
     assert new_movie is None
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_create_no_rating_movie():
     # Arrange
     movie_title = "Title A"
@@ -58,7 +58,7 @@ def test_create_no_rating_movie():
     # Assert
     assert new_movie is None
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_adds_movie_to_user_watched():
     # Arrange
     movie = {
@@ -79,7 +79,7 @@ def test_adds_movie_to_user_watched():
     assert updated_data["watched"][0]["genre"] == GENRE_1
     assert updated_data["watched"][0]["rating"] == RATING_1
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_adds_movie_to_user_watchlist():
     # Arrange
     movie = {
@@ -100,7 +100,7 @@ def test_adds_movie_to_user_watchlist():
     assert updated_data["watchlist"][0]["genre"] == GENRE_1
     assert updated_data["watchlist"][0]["rating"] == RATING_1
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_moves_movie_from_watchlist_to_empty_watched():
     # Arrange
     janes_data = {
@@ -119,12 +119,15 @@ def test_moves_movie_from_watchlist_to_empty_watched():
     assert len(updated_data["watchlist"]) == 0
     assert len(updated_data["watched"]) == 1
     
-    raise Exception("Test needs to be completed.")
+    #Mine below:
+    assert updated_data["watched"][0]['title'] == MOVIE_TITLE_1
+
+    # raise Exception("Test needs to be completed.")
     # *******************************************************************************************
     # ****** Add assertions here to test that the correct movie was added to "watched" **********
     # *******************************************************************************************
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_moves_movie_from_watchlist_to_watched():
     # Arrange
     movie_to_watch = HORROR_1
@@ -143,12 +146,16 @@ def test_moves_movie_from_watchlist_to_watched():
     assert len(updated_data["watchlist"]) == 1
     assert len(updated_data["watched"]) == 2
     
-    raise Exception("Test needs to be completed.")
+    #Mine teste below:
+    assert updated_data["watched"][-1]['title'] == movie_to_watch["title"]
+    
+    # raise Exception("Test needs to be completed.")
     # *******************************************************************************************
     # ****** Add assertions here to test that the correct movie was added to "watched" **********
     # *******************************************************************************************
 
-@pytest.mark.skip()
+
+# @pytest.mark.skip()
 def test_does_nothing_if_movie_not_in_watchlist():
     # Arrange
     movie_to_watch = HORROR_1
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index 3a588299e..198e395b3 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_calculates_watched_average_rating():
     # Arrange
     janes_data = clean_wave_2_data()
@@ -14,7 +14,7 @@ def test_calculates_watched_average_rating():
     assert average == pytest.approx(3.58333)
     assert janes_data == clean_wave_2_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_empty_watched_average_rating_is_zero():
     # Arrange
     janes_data = {
@@ -27,7 +27,7 @@ def test_empty_watched_average_rating_is_zero():
     # Assert
     assert average == pytest.approx(0.0)
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_most_watched_genre():
     # Arrange
     janes_data = clean_wave_2_data()
@@ -39,7 +39,7 @@ def test_most_watched_genre():
     assert popular_genre == "Fantasy"
     assert janes_data == clean_wave_2_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_genre_is_None_if_empty_watched():
     # Arrange
     janes_data = {
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 046429360..3405fc6a1 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_my_unique_movies():
     # Arrange
     amandas_data = clean_wave_3_data()
@@ -16,7 +16,7 @@ def test_my_unique_movies():
     assert INTRIGUE_2 in amandas_unique_movies
     assert amandas_data == clean_wave_3_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_my_not_unique_movies():
     # Arrange
     amandas_data = clean_wave_3_data()
@@ -28,7 +28,7 @@ def test_my_not_unique_movies():
     # Assert
     assert len(amandas_unique_movies) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_friends_unique_movies():
     # Arrange
     amandas_data = clean_wave_3_data()
@@ -43,7 +43,7 @@ def test_friends_unique_movies():
     assert FANTASY_4 in friends_unique_movies
     assert amandas_data == clean_wave_3_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_friends_unique_movies_not_duplicated():
     # Arrange
     amandas_data = clean_wave_3_data()
@@ -55,12 +55,15 @@ def test_friends_unique_movies_not_duplicated():
     # Assert
     assert len(friends_unique_movies) == 3
 
-    raise Exception("Test needs to be completed.")
+    # raise Exception("Test needs to be completed.")
     # *************************************************************************************************
     # ****** Add assertions here to test that the correct movies are in friends_unique_movies **********
     # **************************************************************************************************
+    assert INTRIGUE_3 in friends_unique_movies
 
-@pytest.mark.skip()
+    
+    
+# @pytest.mark.skip()
 def test_friends_not_unique_movies():
     # Arrange
     amandas_data = {
diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py
index 499669077..0b0b3c7e2 100644
--- a/tests/test_wave_04.py
+++ b/tests/test_wave_04.py
@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_get_available_friend_rec():
     # Arrange
     amandas_data = clean_wave_4_data()
@@ -16,7 +16,7 @@ def test_get_available_friend_rec():
     assert FANTASY_4b in recommendations
     assert amandas_data == clean_wave_4_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_no_available_friend_recs():
     # Arrange
     amandas_data = {
@@ -38,7 +38,7 @@ def test_no_available_friend_recs():
     # Assert
     assert len(recommendations) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_no_available_friend_recs_watched_all():
     # Arrange
     amandas_data = {
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 85ebb8b18..d7b34119d 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_genre_rec():
     # Arrange
     sonyas_data = clean_wave_5_data()
@@ -17,7 +17,7 @@ def test_new_genre_rec():
     assert FANTASY_4b in recommendations
     assert sonyas_data == clean_wave_5_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_genre_rec_from_empty_watched():
     # Arrange
     sonyas_data = {
@@ -38,7 +38,7 @@ def test_new_genre_rec_from_empty_watched():
     # Assert
     assert len(recommendations) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_genre_rec_from_empty_friends():
     # Arrange
     sonyas_data = {
@@ -52,13 +52,17 @@ def test_new_genre_rec_from_empty_friends():
             }
         ]
     }
+# #   # Act  (MY part >>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<)
+    recommendations = get_new_rec_by_genre(sonyas_data)
+    
+# #     # raise Exception("Test needs to be completed.")
+    assert len(recommendations) == 0
 
-    raise Exception("Test needs to be completed.")
-    # *********************************************************************
+#     # *********************************************************************
     # ****** Complete the Act and Assert Portions of theis tests **********
     # *********************************************************************
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_unique_rec_from_favorites():
     # Arrange
     sonyas_data = clean_wave_5_data()
@@ -72,7 +76,7 @@ def test_unique_rec_from_favorites():
     assert INTRIGUE_2b in recommendations
     assert sonyas_data == clean_wave_5_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_unique_from_empty_favorites():
     # Arrange
     sonyas_data = {
@@ -94,7 +98,7 @@ def test_unique_from_empty_favorites():
     # Assert
     assert len(recommendations) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_rec_from_empty_friends():
     # Arrange
     sonyas_data = {
diff --git a/viewing_party/party.py b/viewing_party/party.py
index 6d34a6b5f..69c22c91a 100644
--- a/viewing_party/party.py
+++ b/viewing_party/party.py
@@ -1,23 +1,283 @@
 # ------------- WAVE 1 --------------------
+from lib2to3.pytree import generate_matches
+from operator import ge
+from stat import filemode
+from typing import Counter
+# from turtle import title
 
 def create_movie(title, genre, rating):
-    pass
+    # define variables:
+    new_movie = { }
+    
+    # if an argument is None, return None
+    if title == None or genre == None or rating == None:
+        return None
+
+    else:
+        new_movie['title'] = title
+        new_movie['genre'] = genre
+        new_movie['rating'] = rating
+    
+        return new_movie
+
+def add_to_watched(user_data,movie):
+    """Function to update the value for user_data['watched']"""
+    user_data['watched'].append(movie)
+    return user_data
+    
+def add_to_watchlist(user_data, movie):
+    """Function to update the value for user_data['watchlist']"""
+    user_data['watchlist'].append(movie)
+    return user_data
+
+def watch_movie(user_data, title):
+    """
+    title = 'string'
+    input : user_data = dictionary
+            2 keys, 'watchlist', 'watched'
+            values = [ list ]
+    """
+    
+    for count in range(len(user_data['watchlist'])):
+        if user_data["watchlist"][count]['title'] == title:
+            
+            user_data['watched'].append(user_data["watchlist"][count])
+            
+            del user_data['watchlist'][count]
+        
+    return user_data         
+
 
 # -----------------------------------------
 # ------------- WAVE 2 --------------------
 # -----------------------------------------
 
+def get_watched_avg_rating(user_data):
+    """ Function to get the average of ratings"""
+    #define variables 
+    sum = 0
+    count = 0
+    #sum the values of rating, if it does't have any value, add 0.0
+    for count in range(len(user_data['watched'])):
+        if (user_data["watched"][count]['rating']) != 0:
+            sum += (user_data["watched"][count]['rating'])
+        
+        else:
+            user_data["watched"][count]['rating'] = 0.0
+            sum += (user_data["watched"][count]['rating'])
 
+    average = sum / (count+1)
+    return average
+
+def get_most_watched_genre(user_data):
+    """Get the genre most seen"""
+    total_genre = {}
+    # If statement, it the value of user_data['watched'] is empty list, the max. value is None. 
+    if user_data["watched"] == []:
+        max_genre = None
+    else:
+        for count in range(len(user_data['watched'])):
+            if user_data["watched"][count]['genre'] not in total_genre:
+                total_genre[user_data["watched"][count]['genre']] = 1 #add first value, start counting.
+            else:
+                total_genre[user_data["watched"][count]['genre']] +=1   #increase the counter 1 by 1.
+        max_genre = max(total_genre, key=total_genre.get)
+    
+    return max_genre
+
+#***************************************************************************************************
 # -----------------------------------------
 # ------------- WAVE 3 --------------------
 # -----------------------------------------
 
+def get_unique_watched(user_data):
+    #define lists:
+    movies_user = []
+    friends_user = []
+    
+    #for loop to get the title from user.
+    for count in range(len(user_data['watched'])):
+        movies_user.append(user_data['watched'][count]['title'])
+
+    #for loop to get the title from friends.
+    for friend in user_data['friends']:
+        for movie in friend['watched']:
+            for title,value in movie.items():
+                if title == 'title':
+                    friends_user.append(value)
+    
+    #transforme the list of movies from user and friends to set, para avoid duplicate titles
+    movies_user_set = set(movies_user)
+    friends_user_set = set(friends_user)
+    
+    # obtain the difference of movies_user minus friends_movies
+    movies_only_user = movies_user_set - friends_user_set
+    
+    #convert the list -> from set to list.
+    movies_only_final_list = list(movies_only_user)
+    
+    movies_only_final_list_dict = []
+    
+    for title in movies_only_final_list:
+        for count in range(len(user_data['watched'])):
+            if user_data['watched'][count]['title'] == title:
+                movies_only_final_list_dict.append(user_data['watched'][count])
+    
+    return movies_only_final_list_dict
+
+#***************************************************************************************************
+def get_friends_unique_watched(user_data):
+    #create empty lists
+    movie_user = []
+    friends_users = []
+    
+    #add values to the empty list, from user:
+    for count in range(len(user_data['watched'])):
+        movie_user.append(user_data['watched'][count]['title'])
+    
+
+    #add values to the empty list, from friends    
+    for friend in user_data['friends']:
+        for movie in friend['watched']:
+            for title,value in movie.items():
+                if title == 'title':
+                    friends_users.append(value)
+    
+    #transforme the list of movies from user and friends to set, para avoid duplicate titles
+    movies_user_set = set(movie_user)
+    friends_user_set = set(friends_users)
+    
+    # obtain the difference of friends_movies minus movies_user
+    movies_only_friends = friends_user_set - movies_user_set
+    
+    #convert the list -> from set to list.
+    movies_only_final_list = list(movies_only_friends)
+    movies_friends_final_list_dict = []
+    
+    #update list of dicitonaries 
+    for title in movies_only_final_list:
+        for friend in user_data['friends']:
+            for movie in friend['watched']:
+                if (movie['title']) == title:
+                    if movie not in movies_friends_final_list_dict:
+                        movies_friends_final_list_dict.append(movie)
+    
+    return movies_friends_final_list_dict
         
 # -----------------------------------------
 # ------------- WAVE 4 --------------------
 # -----------------------------------------
 
+def get_available_recs(user_data):
+    #define variables for lists
+    movie_user = []
+    friends_users = []
+    subscriptions_user = user_data['subscriptions']
+    
+    # for loop to get elements for the list of movies_user
+    for count in range(len(user_data['watched'])):
+        movie_user.append(user_data['watched'][count]['title'])
+    
+    #for loop to get elements for the list of friends_user
+    for friend in user_data['friends']:
+        for movie in friend['watched']:
+            for title,value in movie.items():
+                if title == 'title':
+                    friends_users.append(value)
+    
+    #transforme the list of movies from user and friends to set, para avoid duplicate titles:
+    movies_user_set = set(movie_user)
+    friends_user_set = set(friends_users)
+    
+    # obtain the difference of friends_movies minus movies_user
+    movies_only_friends = friends_user_set - movies_user_set
+    
+    # convert the list back from set to list.
+    movies_only_final_list = list(movies_only_friends)
+
+    movies_friends_final_list_dict = []
+
+    #for loop to bring the dictionaries for movies(elements) on the movies_only_final_list
+    for title in movies_only_final_list:
+        for friend in user_data['friends']:
+            for movie in friend['watched']:
+                if (movie['title']) == title:         
+                    if movie not in movies_friends_final_list_dict:
+                        movies_friends_final_list_dict.append(movie)
+    
+    #create variable for recommended_movies
+    recommended_movies =[] 
+    
+    #for loop to confirm the recommended movies is on the host/subscription the user has.
+    for movie in movies_friends_final_list_dict:
+        for host in subscriptions_user:
+            if host in movie['host']:
+                recommended_movies.append(movie)
+                
+    return recommended_movies
+
 # -----------------------------------------
 # ------------- WAVE 5 --------------------
 # -----------------------------------------
 
+def get_new_rec_by_genre(user_data):
+    #define variables and create empty list:
+    user_watched = user_data['watched'] #list,dict
+    friends = user_data['friends']
+    user_genre = []
+    friends_genre = []
+    recommended_movies = []
+
+    genre_max = get_most_watched_genre(user_data)
+
+    # if the user didn't watch movies, return an empty list
+    if len(user_data['watched']) == 0:
+        return []
+    
+    # loop through user_data["watched"] to create list
+    for movie in user_watched:
+        if genre_max in movie['genre']:
+            user_genre.append(movie)
+
+    count =0
+    for movie in friends[count]['watched']:
+        if genre_max in movie['genre']:
+            friends_genre.append(movie)
+    count += 1
+
+    #for loop to get the reccomended list
+    for film in friends_genre:
+        if film not in user_genre:
+            recommended_movies.append(film)
+
+    return recommended_movies
+            
+#**************************************************************************************************
+
+def get_rec_from_favorites(user_data):
+    
+    
+    friends_users = []
+    recommended_movies = []
+    
+    # if the user doesn't have favorites, it's equal length cero, then return an empty list.
+    if len(user_data['favorites']) == 0:
+        return []
+    
+    movie_user_favorites = user_data['favorites']
+    
+    #foor loop to append values, to the friends list.
+    for friend in user_data['friends']:
+        for movie in friend['watched']:
+            friends_users.append(movie)
+    
+    #for loop to compare movies between favorites and friend.        
+    for film in movie_user_favorites:
+        if film not in friends_users:
+            recommended_movies.append(film)
+    
+    
+    # print('number>>', len(user_data['favorites']))
+    return recommended_movies
+
+    
\ No newline at end of file