diff --git a/Gemfile b/Gemfile
index 009415af..dc061ed6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,6 +37,7 @@ gem 'jbuilder', '~> 2.5'
 
 gem 'will_paginate'
 
+gem 'rack-cors', require: 'rack/cors'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f7601a8..fcb76c2a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,8 +118,9 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (3.6.2)
+    puma (3.11.4)
     rack (2.0.1)
+    rack-cors (1.0.2)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.1)
@@ -210,6 +211,7 @@ DEPENDENCIES
   minitest-spec-rails
   pry-rails
   puma (~> 3.0)
+  rack-cors
   rails (~> 5.0.1)
   sass-rails (~> 5.0)
   spring
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index 362e2791..2765b07d 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -1,3 +1,5 @@
+require "pry"
+
 class MoviesController < ApplicationController
   before_action :require_movie, only: [:show]
 
@@ -11,6 +13,16 @@ def index
     render status: :ok, json: data
   end
 
+
+  def create
+    movie = Movie.new(movie_params)
+    if movie.save
+      render json: {id: movie.id}
+    else
+      render json: {errors: movie.errors.messages},status: :bad_request
+    end
+  end
+
   def show
     render(
       status: :ok,
@@ -23,6 +35,11 @@ def show
 
   private
 
+
+  def movie_params
+    params.permit(:title, :overview, :inventory, :release_date, :external_id, :image_url)
+  end
+
   def require_movie
     @movie = Movie.find_by(title: params[:title])
     unless @movie
diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb
index 67e77073..da515857 100644
--- a/app/controllers/rentals_controller.rb
+++ b/app/controllers/rentals_controller.rb
@@ -9,6 +9,7 @@ def check_out
     if rental.save
       render status: :ok, json: {}
     else
+      puts rental.errors.messages
       render status: :bad_request, json: { errors: rental.errors.messages }
     end
   end
diff --git a/app/models/movie.rb b/app/models/movie.rb
index 0016080b..e14e2d56 100644
--- a/app/models/movie.rb
+++ b/app/models/movie.rb
@@ -2,6 +2,8 @@ class Movie < ApplicationRecord
   has_many :rentals
   has_many :customers, through: :rentals
 
+
+  validates :external_id, uniqueness: true
   def available_inventory
     self.inventory - Rental.where(movie: self, returned: false).length
   end
@@ -10,7 +12,7 @@ def image_url
     orig_value = read_attribute :image_url
     if !orig_value
       MovieWrapper::DEFAULT_IMG_URL
-    elsif external_id
+    elsif external_id && !(orig_value.include? MovieWrapper::BASE_IMG_URL)
       MovieWrapper.construct_image_url(orig_value)
     else
       orig_value
diff --git a/config/application.rb b/config/application.rb
index cc803322..0827fa4c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,9 +15,12 @@ class Application < Rails::Application
     #this loads everything in the lib folder automatically
     config.eager_load_paths << Rails.root.join('lib')
 
-    config.action_dispatch.default_headers = {
-      'Access-Control-Allow-Origin' => '*',
-      'Access-Control-Request-Method' => %w{GET POST OPTIONS}.join(",")
-    }
+    config.middleware.insert_before 0, Rack::Cors do
+      allow do
+        origins '*'
+        resource '*', headers: :any, methods: [:get, :post, :options]
+      end
+    end
+    
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 54bf033e..1b227184 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,7 +3,7 @@
 
   resources :customers, only: [:index]
 
-  resources :movies, only: [:index, :show], param: :title
+  resources :movies, only: [:index, :show, :create],  param: :title
 
   post "/rentals/:title/check-out", to: "rentals#check_out", as: "check_out"
   post "/rentals/:title/return", to: "rentals#check_in", as: "check_in"