diff --git a/.gitignore b/.gitignore
index 4a494a75..58456ca4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,8 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
diff --git a/Gemfile b/Gemfile
index 2d53ba9c..7f721b54 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.1'
+ruby '2.5.3'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index a0a07df1..0bf0d97a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ DEPENDENCIES
   will_paginate
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.5.3p105
 
 BUNDLED WITH
-   1.16.6
+   1.17.2
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index 362e2791..553a23e4 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -17,8 +17,18 @@ def show
       json: @movie.as_json(
         only: [:title, :overview, :release_date, :inventory],
         methods: [:available_inventory]
-        )
       )
+    )
+  end
+
+  def create
+    movie = Movie.new(movie_params)
+
+    if movie.save
+      render json: {id: movie.id}
+    else
+      render_error(:bad_request, movie.errors.messages)
+    end
   end
 
   private
@@ -29,4 +39,8 @@ def require_movie
       render status: :not_found, json: { errors: { title: ["No movie with title #{params["title"]}"] } }
     end
   end
+
+  def movie_params
+    params.permit(:title, :overview, :release_date, :inventory, :image_url)
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index f4c99688..1479a690 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,9 +3,9 @@
 
   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/:customer_id/check-out", to: "rentals#check_out", as: "check_out"
   post "/rentals/:title/return", to: "rentals#check_in", as: "check_in"
   get "/rentals/overdue", to: "rentals#overdue", as: "overdue"
 
diff --git a/db/schema.rb b/db/schema.rb
index ffb28f7e..d4b52b3c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,40 +10,43 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180618042754) do
+ActiveRecord::Schema.define(version: 2018_06_18_042754) do
 
-  create_table "customers", force: :cascade do |t|
-    t.string   "name"
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "customers", id: :serial, force: :cascade do |t|
+    t.string "name"
     t.datetime "registered_at"
-    t.string   "address"
-    t.string   "city"
-    t.string   "state"
-    t.string   "postal_code"
-    t.string   "phone"
-    t.float    "account_credit"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+    t.string "address"
+    t.string "city"
+    t.string "state"
+    t.string "postal_code"
+    t.string "phone"
+    t.float "account_credit"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "movies", force: :cascade do |t|
-    t.string   "title"
-    t.text     "overview"
-    t.date     "release_date"
-    t.integer  "inventory"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
-    t.string   "image_url"
-    t.integer  "external_id"
+  create_table "movies", id: :serial, force: :cascade do |t|
+    t.string "title"
+    t.text "overview"
+    t.date "release_date"
+    t.integer "inventory"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "image_url"
+    t.integer "external_id"
   end
 
-  create_table "rentals", force: :cascade do |t|
-    t.integer  "customer_id"
-    t.integer  "movie_id"
-    t.date     "checkout_date"
-    t.date     "due_date"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
-    t.boolean  "returned"
+  create_table "rentals", id: :serial, force: :cascade do |t|
+    t.integer "customer_id"
+    t.integer "movie_id"
+    t.date "checkout_date"
+    t.date "due_date"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "returned"
     t.index ["customer_id"], name: "index_rentals_on_customer_id"
     t.index ["movie_id"], name: "index_rentals_on_movie_id"
   end