diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index c033af09f..903caf8a5 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
@@ -15,11 +15,11 @@ def test_create_successful_movie():
     new_movie = create_movie(movie_title, genre, rating)
 
     # Assert
-    assert new_movie["title"] is MOVIE_TITLE_1
-    assert new_movie["genre"] is GENRE_1
+    assert new_movie["title"] == MOVIE_TITLE_1
+    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"] is GENRE_1
     assert updated_data["watched"][0]["rating"] is 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"] is GENRE_1
     assert updated_data["watchlist"][0]["rating"] is RATING_1
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_moves_movie_from_watchlist_to_empty_watched():
     # Arrange
     janes_data = {
@@ -118,12 +118,14 @@ def test_moves_movie_from_watchlist_to_empty_watched():
     # Assert
     assert len(updated_data["watchlist"]) is 0
     assert len(updated_data["watched"]) is 1
-    
+    assert updated_data['watched'][0]['title'] == MOVIE_TITLE_1
+    assert updated_data['watched'][0]['genre'] == GENRE_1
+    assert updated_data['watched'][0]['rating'] == RATING_1
     # *******************************************************************************************
     # ****** 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
@@ -141,12 +143,14 @@ def test_moves_movie_from_watchlist_to_watched():
     # Assert
     assert len(updated_data["watchlist"]) is 1
     assert len(updated_data["watched"]) is 2
-    
+    assert updated_data['watched'][1]['title'] == MOVIE_TITLE_1
+    assert updated_data['watched'][1]['genre'] == GENRE_1
+    assert updated_data['watched'][1]['rating'] == RATING_1
     # *******************************************************************************************
     # ****** 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 7c42a63c4..6c4b440c5 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():
     # Arrange
     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()
@@ -54,12 +54,13 @@ def test_friends_unique_movies_not_duplicated():
 
     # Arrange
     assert len(friends_unique_movies) == 3
-
+    assert amandas_data["watched"] not in friends_unique_movies
+    assert INTRIGUE_3 in friends_unique_movies
     # *************************************************************************************************
     # ****** Add assertions here to test that the correct movies are 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 72888410f..8cb037a87 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 = {
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 8ce5b57db..895b31ce6 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,12 +52,19 @@ def test_new_genre_rec_from_empty_friends():
             }
         ]
     }
+    # Act
+    recommendations = get_new_rec_by_genre(sonyas_data)
+
+    # Assert
+    for rec in recommendations:
+        assert rec['genre'] == 'Intrigue'
+    assert len(recommendations) == 0
 
     # *********************************************************************
     # ****** 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()
@@ -71,7 +78,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 = {
@@ -92,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 6d34a6b5f..e1ddc4dbf 100644
--- a/viewing_party/party.py
+++ b/viewing_party/party.py
@@ -1,23 +1,144 @@
 # ------------- WAVE 1 --------------------
 
+from cmath import rect
+from time import monotonic
+
+
 def create_movie(title, genre, rating):
-    pass
+    movie_dict = {}
+
+    if title and genre and rating:
+        movie_dict['title'] = title 
+        movie_dict['genre'] = genre
+        movie_dict['rating'] = rating
+    else:
+        return None
+    return movie_dict
+
+def add_to_watched(user_data, movie):
+    user_data['watched'].append(movie)
+    return user_data
+
+def add_to_watchlist(user_data, movie):
+    user_data['watchlist'].append(movie)
+    return user_data
+
+def watch_movie(user_data, movie):
+    for movie_dicts in user_data['watchlist']:
+        if movie_dicts['title'] == movie:
+            user_data['watched'].append(movie_dicts)
+            user_data['watchlist'].remove(movie_dicts)    
+    return user_data
 
 # -----------------------------------------
 # ------------- WAVE 2 --------------------
 # -----------------------------------------
 
+def get_watched_avg_rating(user_data):
+    rating_total = 0
+    watch_counter = 0
+    
+    for movie_dicts in user_data['watched']:
+        rating_total += movie_dicts['rating']
+        watch_counter += 1
+
+    if rating_total > 0:
+        avg_rating = rating_total/watch_counter
+    else:
+        avg_rating = 0
+    return avg_rating
+
+def get_most_watched_genre(user_data):
+    genre_list = []
+
+    for movie_dicts in user_data['watched']:
+        genre_list.append(movie_dicts['genre'])
+    if genre_list:
+        return max(set(genre_list), key = genre_list.count)
 
 # -----------------------------------------
 # ------------- WAVE 3 --------------------
 # -----------------------------------------
 
-        
+def get_unique_watched(user_data):
+    user_movies = user_data['watched']
+    friends_movies = []
+    user_unique_movies = []
+
+    for movie_dicts in user_data['friends']:
+        for movie in movie_dicts['watched']:
+            friends_movies.append(movie)
+
+    for user_movie in user_movies:
+        if user_movie not in friends_movies and user_movie not in user_unique_movies:
+            user_unique_movies.append(user_movie) 
+    return user_unique_movies
+
+def get_friends_unique_watched(user_data):
+    user_movies = user_data['watched']
+    friends_movies = []
+    friends_unique_movies = []
+
+    for movie_dicts in user_data['friends']:
+        for movie in movie_dicts['watched']:
+            friends_movies.append(movie)
+
+    for movie_dicts in friends_movies:
+        if movie_dicts not in user_movies and movie_dicts not in friends_unique_movies:
+            friends_unique_movies.append(movie_dicts) 
+    return friends_unique_movies
+
+
 # -----------------------------------------
 # ------------- WAVE 4 --------------------
 # -----------------------------------------
 
+def get_available_recs(user_data):
+    user_subscriptions = user_data['subscriptions']
+    user_recommendations = []
+    friends_watched = []
+
+    for movie_dicts in user_data['friends']:
+        for movie in movie_dicts['watched']:
+            friends_watched.append(movie)
+
+    for movie_dicts in friends_watched:
+        if movie_dicts['host'] in user_subscriptions and movie_dicts not in user_data['watched'] and movie_dicts not in user_recommendations:
+            user_recommendations.append(movie_dicts)
+
+    return user_recommendations
+
+
 # -----------------------------------------
 # ------------- WAVE 5 --------------------
 # -----------------------------------------
 
+def get_new_rec_by_genre(user_data):
+    genre_most_watched = get_most_watched_genre(user_data)
+    friends_watched = []
+    most_genre_recommendations = []
+
+    for movie_dicts in user_data['friends']:
+        for movie in movie_dicts['watched']:
+            friends_watched.append(movie)
+
+    for movie_dicts in friends_watched:
+        if movie_dicts not in user_data['watched'] and movie_dicts['genre'] == genre_most_watched:
+            most_genre_recommendations.append(movie_dicts)
+
+    return most_genre_recommendations
+
+def get_rec_from_favorites(user_data):
+    user_favorites = user_data['favorites']
+    friends_watched = []
+    rec_from_favorites = []
+
+    for movie_dicts in user_data['friends']:
+        for movie in movie_dicts['watched']:
+            friends_watched.append(movie)
+    
+    for movie_dicts in user_favorites:
+        if movie_dicts not in friends_watched:
+            rec_from_favorites.append(movie_dicts)
+
+    return rec_from_favorites