diff --git a/play_tester.py b/play_tester.py
index 9e2aecf4..3a69aaa8 100644
--- a/play_tester.py
+++ b/play_tester.py
@@ -14,16 +14,16 @@
 pp.pprint(FANTASY_1)
 pp.pprint(FANTASY_2)
 
-# print("\n-----Wave 02 user_data-----")
-# pp.pprint(clean_wave_2_data())
+print("\n-----Wave 02 user_data-----")
+pp.pprint(clean_wave_2_data())
 
-#print("\n-----Wave 03 user_data-----")
-#pp.pprint(clean_wave_3_data())
+print("\n-----Wave 03 user_data-----")
+pp.pprint(clean_wave_3_data())
 
-# Wave 04 user data
-#print("\n-----Wave 04 user_data-----")
-#pp.pprint(clean_wave_4_data())
+#Wave 04 user data
+print("\n-----Wave 04 user_data-----")
+pp.pprint(clean_wave_4_data())
 
 # Wave 05 user data
-#print("\n-----Wave 05 user_data-----")
-#pp.pprint(clean_wave_5_data())
+print("\n-----Wave 05 user_data-----")
+pp.pprint(clean_wave_5_data())
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 669efee6..6aed219a 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -4,7 +4,7 @@
 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_non_empty_user_watched():
     # Arrange
     movie = {
@@ -99,7 +99,7 @@ def test_adds_movie_to_non_empty_user_watched():
     assert movie in updated_data["watched"]
     assert FANTASY_2 in updated_data["watched"]
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_adds_movie_to_user_watchlist():
     # Arrange
     movie = {
@@ -120,7 +120,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_adds_movie_to_non_empty_user_watchlist():
     # Arrange
     movie = {
@@ -140,7 +140,7 @@ def test_adds_movie_to_non_empty_user_watchlist():
     assert movie in updated_data["watchlist"]
     assert FANTASY_2 in updated_data["watchlist"]
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_moves_movie_from_watchlist_to_empty_watched():
     # Arrange
     janes_data = {
@@ -158,13 +158,13 @@ def test_moves_movie_from_watchlist_to_empty_watched():
     # Assert
     assert len(updated_data["watchlist"]) == 0
     assert len(updated_data["watched"]) == 1
-    
-    raise Exception("Test needs to be completed.")
+    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
@@ -182,13 +182,14 @@ def test_moves_movie_from_watchlist_to_watched():
     # Assert
     assert len(updated_data["watchlist"]) == 1
     assert len(updated_data["watched"]) == 2
-    
-    raise Exception("Test needs to be completed.")
+    assert HORROR_1 in updated_data["watched"]
+
+    #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 19f045c7..831ae5f0 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_most_watched_genre_order_mixed():
     # Arrange
     janes_data = clean_wave_2b_data()
@@ -51,7 +51,7 @@ def test_most_watched_genre_order_mixed():
     assert popular_genre == "Fantasy"
     assert janes_data == clean_wave_2b_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 04642936..e3576fb0 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,8 @@ 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 +29,8 @@ def test_my_not_unique_movies():
     # Assert
     assert len(amandas_unique_movies) == 0
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_friends_unique_movies():
     # Arrange
     amandas_data = clean_wave_3_data()
@@ -43,7 +45,8 @@ 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()
+# @pytest.mark.skip()
 def test_friends_unique_movies_not_duplicated():
     # Arrange
     amandas_data = clean_wave_3_data()
@@ -53,14 +56,19 @@ def test_friends_unique_movies_not_duplicated():
     friends_unique_movies = get_friends_unique_watched(amandas_data)
 
     # Assert
-    assert len(friends_unique_movies) == 3
+    new_var = friends_unique_movies
+    assert len(new_var) == 3
+    assert INTRIGUE_3 in friends_unique_movies
+    assert FANTASY_4 in friends_unique_movies
+    assert HORROR_1 in friends_unique_movies
 
-    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 **********
     # **************************************************************************************************
 
-@pytest.mark.skip()
+#@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 49966907..0b0b3c7e 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 b2ba9ad3..2456066e 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,18 @@ def test_new_genre_rec_from_empty_friends():
             }
         ]
     }
+    # Act
+    recommendations = get_new_rec_by_genre(sonyas_data)
+
+    # Assert
+    assert len(recommendations) == 0
 
-    raise Exception("Test needs to be completed.")
+    #raise Exception("Test needs to be completed.")
     # *********************************************************************
     # ****** Complete the Act and Assert Portions of these tests **********
     # *********************************************************************
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_unique_rec_from_favorites():
     # Arrange
     sonyas_data = clean_wave_5_data()
@@ -72,7 +77,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 +99,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 6d34a6b5..f39589d7 100644
--- a/viewing_party/party.py
+++ b/viewing_party/party.py
@@ -1,23 +1,170 @@
+import copy 
 # ------------- WAVE 1 --------------------
-
+# No.1
 def create_movie(title, genre, rating):
-    pass
+    movie = {"title": title, "genre": genre, "rating": rating}
+
+    if movie["title"] and movie["genre"] and movie["rating"]:
+        return movie
+    else:
+        return None 
+# No.2
+def add_to_watched(user_data, movie):
+    user_data["watched"].append(movie)
+    print(len(user_data["watched"]))
+    return user_data
+    
+# No.3
+def add_to_watchlist(user_data, movie):
+    user_data["watchlist"].append(movie)
+    return user_data
+# No.4 -A
+def watch_movie(user_data,title):
+    for movie in user_data["watchlist"]:
+        if title in movie["title"]: 
+            user_data["watchlist"].remove(movie)
+            user_data["watched"].append(movie)
+    return user_data    
 
 # -----------------------------------------
 # ------------- WAVE 2 --------------------
 # -----------------------------------------
+# No.1-M
+def get_watched_avg_rating(user_data):
+    avg_rating = 0
+    ratings = 0
+    for movies in user_data.values():
+        for movie in movies:
+            rating = movie["rating"]
+            ratings += rating
+            avg_rating = ratings/ len(movies)
+    return avg_rating
+
+
+# No.2-A
+def get_most_watched_genre(user_data):
+    if len(user_data["watched"]) == 0:
+        return None
+    most_watched_list = []
+    max_count = 0
+    max_genre = 0
+    for movie in user_data["watched"]:
+        #for genre in movie["genre"]:
+        most_watched_list.append(movie["genre"])
+    for genre in set(most_watched_list):
+        if most_watched_list.count(genre) > max_count:
+            max_count = most_watched_list.count(genre)
+            max_genre = genre
+
+    return max_genre    
+
 
 
 # -----------------------------------------
 # ------------- WAVE 3 --------------------
 # -----------------------------------------
 
-        
+# No.1-M
+def get_unique_watched(user_data):
+    my_data = user_data["watched"].copy()
+    friends_data = user_data["friends"]
+    for watched in friends_data:
+        their_watched = watched["watched"]
+        for their_movie in their_watched:
+            for i in range(0, len(my_data)):
+                if their_movie["title"] == my_data[i]["title"]:
+                    del my_data[i]
+                    break
+    return my_data
+
+# No.2-A
+def get_friends_unique_watched(user_data):
+    user_data_copy = copy.deepcopy(user_data)
+    unique_watched = []
+    user_watched_list = []
+    user_watched_unique = []
+    for movie in user_data_copy["watched"]:
+        user_watched_list.append(movie["title"])
+    for friend in user_data_copy["friends"]:
+        for movie in friend["watched"]:
+            if movie["title"] not in user_watched_list:
+                unique_watched.append(movie)
+
+    unique_list_set = set()           
+
+    for movie in unique_watched:
+        if movie["title"] not in unique_list_set:
+            user_watched_unique.append(movie)
+            unique_list_set.add(movie["title"])                   
+            
+    return user_watched_unique 
+
+
+
 # -----------------------------------------
 # ------------- WAVE 4 --------------------
 # -----------------------------------------
+# No.1-M
+def get_available_recs(user_data):
+    my_data = user_data["watched"]
+    my_data_titles = []
+    for movie in my_data:
+        my_data_titles.append(movie["title"])
+    the_movies = []
+    added_movies = []
+
+    friends_data = user_data["friends"]
+    subscriptions = user_data["subscriptions"]
+
+    for watched in friends_data:
+        their_watched = watched["watched"]
+        for their_movie in their_watched:
+            if their_movie["host"] not in subscriptions:
+                continue
+            if their_movie["title"] not in my_data_titles and their_movie["title"] not in added_movies:
+                the_movies.append(their_movie)
+                added_movies.append(their_movie["title"])
+    return the_movies
 
 # -----------------------------------------
 # ------------- WAVE 5 --------------------
 # -----------------------------------------
+# No.1-A
+def get_new_rec_by_genre(user_data):
+    fav_genre = get_most_watched_genre(user_data)
+    recommend = get_friends_unique_watched(user_data)
+    recommend_watch = []
+    if fav_genre is None:
+        recommend_watch = []
+    else:
+        for movie in recommend:
+            if fav_genre in movie["genre"]:
+                recommend_watch.append(movie)
+    return recommend_watch         
+
+# No.2-M
+def get_rec_from_favorites(user_data):
+    my_data = user_data["favorites"].copy()
+
+    friends_data = user_data["friends"]
+    for watched in friends_data:
+        their_watched = watched["watched"]
+        for their_movie in their_watched:
+            for i in range(0, len(my_data)):
+                if their_movie["title"] != my_data[i]["title"]:
+                    del my_data[i]
+                    break 
+    return my_data
+
+def get_rec_from_favorites(user_data):
+    my_data = {}
+    for movie in user_data["favorites"]:
+        my_data[movie["title"]] = movie
 
+    friends_data = user_data["friends"]
+    for watched in friends_data:
+        their_watched = watched["watched"]
+        for their_movie in their_watched:
+            title = their_movie["title"]
+            my_data.pop(title, None)
+    return my_data.values()
\ No newline at end of file