diff --git a/movie_json.rb b/movie_json.rb
index d8a91d7..2941546 100644
--- a/movie_json.rb
+++ b/movie_json.rb
@@ -1,21 +1,44 @@
 require_relative "lib/movie"
 require_relative "lib/api"
 
+def get_average(movies, attribute)
+  data = movies.map(&attribute)
+  average = data.inject(0.0) { |sum, rating| sum + rating } / data.size
+end
+
+def calculate_slope(movies)
+  movies = movies.sort_by { |i| i.year }
+  slope = (movies.last.score - movies.first.score).to_f / 
+            (movies.last.year - movies.first.year).to_f
+  if slope < 0 
+    puts "You are getting madder."
+  elsif slope > 0
+    puts "You are getting happier."
+  end
+end
+
 def find_movie
-  puts "OH HAI. Search?"
+  puts "Add a movie you really like."
   movie_title = gets
   movie = Api.search_by_title(movie_title)
   puts "Found: #{movie.title}. Score: #{movie.score}"
+  movie
+rescue NoMethodError
+ puts "Movie not found."
 end
 
-find_movie
-
-while true do
-  puts "Search Again (Y/N)" 
-  answer = gets.upcase[0]
-  if answer == "Y"
-    find_movie
+movies = []
+while true
+  movies << find_movie
+  if movies.last.nil?
+    movies.pop
   else
+    puts "Average rating: #{get_average(movies, :score)}. Average year: #{get_average(movies, :year)}"
+  end
+  puts "Search Again (Y/N)"
+  answer = gets.upcase[0]
+  if answer != "Y"
+    calculate_slope(movies) if movies.count > 1
     break
   end
 end
diff --git a/spec/api_spec.rb b/spec/api_spec.rb
index 9014106..fe98a4f 100644
--- a/spec/api_spec.rb
+++ b/spec/api_spec.rb
@@ -24,4 +24,10 @@
   it "should return the year" do
     movie.year.should eq(1994)
   end
+ 
+  it "should not throw an error" do
+    expect {
+      Api.search_by_title("NOTHINGFOUNDHERE")
+    }.to_not raise_error
+  end
 end