diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..ea4b32f59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 000000000..160fe391c
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.5.5
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..8143da43e
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,59 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby '2.5.5'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.2.3'
+# Use postgresql as the database for Active Record
+gem 'pg', '>= 0.18', '< 2.0'
+# Use Puma as the app server
+gem 'puma', '~> 3.11'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+# gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use ActiveStorage variant
+# gem 'mini_magick', '~> 4.8'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
+# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
+# gem 'rack-cors'
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+group :development, :test do
+  gem 'pry-rails'
+end
+
+group :development do
+  gem 'debase', '>= 0.2.4.1'
+  gem 'ruby-debug-ide', '>= 0.7.0'
+end
+
+group :test do
+  gem 'minitest-rails'
+  gem 'minitest-reporters'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..981f08e8a
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,175 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ansi (1.5.0)
+    arel (9.0.0)
+    bootsnap (1.4.5)
+      msgpack (~> 1.0)
+    builder (3.2.3)
+    byebug (11.0.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
+    debase (0.2.4.1)
+      debase-ruby_core_source (>= 0.10.2)
+    debase-ruby_core_source (0.10.6)
+    erubi (1.9.0)
+    ffi (1.11.1)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.3.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.13.0)
+    minitest-rails (5.2.0)
+      minitest (~> 5.10)
+      railties (~> 5.2.0)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    msgpack (1.3.1)
+    nio4r (2.5.2)
+    nokogiri (1.10.5)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    puma (3.12.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    ruby-debug-ide (0.7.0)
+      rake (>= 0.8.1)
+    ruby-progressbar (1.10.1)
+    ruby_dep (1.5.0)
+    spring (2.1.0)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootsnap (>= 1.1.0)
+  byebug
+  debase (>= 0.2.4.1)
+  listen (>= 3.0.5, < 3.2)
+  minitest-rails
+  minitest-reporters
+  pg (>= 0.18, < 2.0)
+  pry-rails
+  puma (~> 3.11)
+  rails (~> 5.2.3)
+  ruby-debug-ide (>= 0.7.0)
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  tzinfo-data
+
+RUBY VERSION
+   ruby 2.5.5p157
+
+BUNDLED WITH
+   2.0.2
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 000000000..e34f706f4
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,9 @@
+guard :minitest, autorun: false, spring: true do
+  watch(%r{^app/(.+).rb$})                               { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
+  watch(%r{^app/controllers/(.+)_controller.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
+  watch(%r{^app/views/(.+)_mailer/.+})                    { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
+  watch(%r{^lib/(.+).rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
+  watch(%r{^test/.+_test.rb$})
+  watch(%r{^test/test_helper.rb$}) { 'test' }
+end
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000000000..e85f91391
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..d67269728
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100644
index 000000000..0ff5442f4
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
new file mode 100644
index 000000000..4ac8823b0
--- /dev/null
+++ b/app/controllers/application_controller.rb
@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::API
+end
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb
new file mode 100644
index 000000000..321c3a35c
--- /dev/null
+++ b/app/controllers/customers_controller.rb
@@ -0,0 +1,31 @@
+class CustomersController < ApplicationController
+  SORT_CATEGORIES = ["name", "registered_at", "postal_code"]
+  
+  def index
+    if params[:sort] && SORT_CATEGORIES.include?(params[:sort]) == false
+      render json: {ok: false, "errors" => ["invalid sort category"]}, status: :bad_request
+      return
+    end
+    
+    if params[:sort] || params[:n] || params[:p]
+      if !params[:n].nil? && params[:n].to_i <= 0
+        render json: {ok: false, "errors" => ["unable to group customers"]}, status: :bad_request
+        return
+      elsif !params[:p].nil? && params[:p].to_i <= 0
+        render json: {ok: false, "errors" => ["unable to group customers"]}, status: :bad_request
+        return
+      else
+        customers = Customer.group_by_n(params[:sort], params[:n], params[:p])
+      end        
+      if customers == nil
+        render json: {ok: false, "errors" => ["not found"]}, status: :not_found
+        return
+      end
+    else
+      customers = Customer.all
+    end  
+    
+    render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok
+    return
+  end
+end
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
new file mode 100644
index 000000000..b9d7fa0ef
--- /dev/null
+++ b/app/controllers/movies_controller.rb
@@ -0,0 +1,41 @@
+KEYS = [:id, :title, :overview, :release_date]
+
+class MoviesController < ApplicationController
+  def index
+    movies = Movie.all
+    
+    render json: movies.as_json(only: KEYS), status: :ok
+    return
+  end
+
+  def show
+    movie = Movie.find_by(id: params[:id])
+
+    if movie
+      render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok
+      return
+    else
+      render json: { ok: false, "errors" => ["not found"] }, status: :not_found
+      return
+    end
+  end
+
+  def create
+    movie = Movie.new(movie_params)
+    movie.available_inventory = movie.inventory
+    
+    if movie.save
+      render json: movie.as_json(only: [:id]), status: :ok
+      return
+    else
+      render json: { ok: false, "errors" => ["unable to create movie"] }, status: :bad_request
+      return
+    end
+  end
+
+  private
+
+  def movie_params
+    return params.permit(:title, :release_date, :overview, :inventory, :available_inventory)
+  end
+end
diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb
new file mode 100644
index 000000000..897ea96ba
--- /dev/null
+++ b/app/controllers/rentals_controller.rb
@@ -0,0 +1,64 @@
+class RentalsController < ApplicationController
+  SORT_CATEGORIES = ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"]
+
+  def create
+    if params[:movie_id].nil? || params[:customer_id].nil?
+      render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request
+      return
+    end
+    if Movie.find(params[:movie_id]) && Customer.find(params[:customer_id])    
+      rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id])
+      rental.checkout_date = Date.today
+      rental.due_date = Date.today + 7 
+      
+      if rental.movie.available_inventory > 0 && rental.save
+        rental.check_out_rental
+        
+        render json: rental.as_json(only: [:id]), status: :ok
+        return
+      else
+        render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request
+        return
+      end
+    else
+      render json: { ok: false, "errors" => ["unable to create rental"]}, status: :bad_request
+      return
+    end
+    
+  end
+  
+  def update
+    rental = Rental.find_by(movie_id: params[:movie_id], customer_id: params[:customer_id])
+    
+    if rental
+      rental.check_in_rental
+      render json: rental.as_json(only: [:id]), status: :ok
+      return
+    else
+      render json: { ok: false, "errors" => ["rental not found"]}, status: :not_found
+      return
+    end
+  end
+  
+  def overdue
+    if params[:sort] && SORT_CATEGORIES.include?(params[:sort]) == false
+      render json: {ok: false, "errors" => ["invalid sort category"]}, status: :bad_request
+      return
+    end
+
+    if params[:sort] || params[:n] || params[:p]
+      rentals = Rental.overdue.group_by_n(params[:sort], params[:n], params[:p])
+
+      if rentals == nil
+        render json: {ok: false, "errors" => ["not found"]}, status: :not_found
+        return
+      end
+    else
+      rentals = Rental.overdue
+    end
+    
+    render json: rentals.as_json(only: [:id, :movie_id, :title, :customer_id, :name, :postal_code, :checkout_date, :due_date]), status: :ok
+    return
+  end
+  
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 000000000..a009ace51
--- /dev/null
+++ b/app/jobs/application_job.rb
@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 000000000..286b2239d
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 000000000..10a4cba84
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/models/customer.rb b/app/models/customer.rb
new file mode 100644
index 000000000..6c3e0572f
--- /dev/null
+++ b/app/models/customer.rb
@@ -0,0 +1,38 @@
+class Customer < ApplicationRecord
+  has_many :rentals
+  
+  def self.group_by_n(sort_type, n, page)
+    if sort_type
+      customers = Customer.sort_by_type(sort_type).to_a
+    else
+      customers = Customer.all.to_a
+    end
+    
+    if n
+      iterations = (customers.count)/n.to_i
+      
+      groups_of_customers = []
+
+      # separates customers into page groups based on n
+      iterations.times do
+        groups_of_customers << customers.shift(n.to_i)
+      end
+      
+      groups_of_customers << customers unless customers.empty?  
+
+      # selects array to be displayed to user
+      if page
+        groups_of_customers = groups_of_customers[page.to_i - 1]
+      end
+      
+      return groups_of_customers
+    else 
+      return customers
+    end
+  end
+  
+  def self.sort_by_type(sort_type)
+    sort_type = sort_type.to_sym
+    return Customer.order(sort_type => :asc)
+  end
+end
diff --git a/app/models/movie.rb b/app/models/movie.rb
new file mode 100644
index 000000000..f86ed5c46
--- /dev/null
+++ b/app/models/movie.rb
@@ -0,0 +1,6 @@
+class Movie < ApplicationRecord
+  validates :title, presence: true
+  validates :inventory, presence: true
+  
+  has_many :rentals
+end
diff --git a/app/models/rental.rb b/app/models/rental.rb
new file mode 100644
index 000000000..1a16e22e9
--- /dev/null
+++ b/app/models/rental.rb
@@ -0,0 +1,59 @@
+class Rental < ApplicationRecord
+  belongs_to :movie
+  belongs_to :customer
+  
+  def check_out_rental
+    self.movie.available_inventory -= 1
+    self.movie.save
+    self.customer.movies_checked_out_count += 1
+    self.customer.save
+  end
+  
+  def check_in_rental
+    self.movie.available_inventory += 1
+    self.movie.save
+    self.customer.movies_checked_out_count -= 1
+    self.customer.save
+    self.returned = true
+    self.save
+  end
+  
+  def self.overdue
+    return Rental.where("due_date < ? and returned = ?", Date.today, false)
+  end
+  
+  def self.group_by_n(sort_type, n, page)
+    if sort_type
+      rentals = Rental.sort_by_type(sort_type).to_a
+    else
+      rentals = Rental.all.to_a
+    end
+    
+    if n
+      groups_of_rentals = []
+      iterations = (rentals.count)/n.to_i
+      
+      iterations.times do
+        groups_of_rentals << rentals.shift(n.to_i)
+      end
+      
+      groups_of_rentals << rentals unless rentals.empty?
+      
+      groups_of_rentals = groups_of_rentals[page.to_i - 1] if page
+      
+      return groups_of_rentals
+    else 
+      return rentals
+    end
+  end
+  
+  def self.sort_by_type(sort_type)
+    if ["name", "postal_code"].include? sort_type
+      return Rental.all.sort_by{|rental| rental.customer[sort_type]}
+    elsif ["title"].include? sort_type
+      return Rental.all.sort_by{|rental| rental.movie[sort_type]}
+    else
+      return Rental.order(sort_type => :asc)
+    end
+  end
+end
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 000000000..cbd34d2e9
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 000000000..37f0bddbd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..f19acf5b5
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 000000000..5badb2fde
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 000000000..d87d5f578
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..a334d86a6
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 000000000..d89ee495f
--- /dev/null
+++ b/bin/spring
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads Spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end
diff --git a/bin/update b/bin/update
new file mode 100755
index 000000000..67d0d4964
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/config.ru b/config.ru
new file mode 100644
index 000000000..f7ba0b527
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,5 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application
diff --git a/config/application.rb b/config/application.rb
new file mode 100644
index 000000000..56f84c20c
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,41 @@
+require_relative 'boot'
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "action_cable/engine"
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module VideoStoreApi
+  class Application < Rails::Application
+  config.generators do |g|
+    # Force new test files to be generated in the minitest-spec style
+    g.test_framework :minitest, spec: true
+    # Always use .js files, never .coffee
+    g.javascript_engine :js
+  end
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+
+    # Only loads a smaller set of middleware suitable for API only apps.
+    # Middleware like session, flash, cookies can be added back manually.
+    # Skip views, helpers and assets when generating a new resource.
+    config.api_only = true
+  end
+end
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 000000000..b9e460cef
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,4 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 000000000..6cc616cd1
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: video-store-api_production
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
new file mode 100644
index 000000000..6986a57b2
--- /dev/null
+++ b/config/credentials.yml.enc
@@ -0,0 +1 @@
+xIiQidOxMouH3RIEHYDQflMzJjNgQRcFo7SgWy31aJuxtBRgwVcdhXVdKoKd+lNrUcPRgClYfvz6+KpW5eRqlT4kcgLL3y34S7EOwOPP0XOtNSiXr3lg8io2uzcgVrZ2j9YhCefXR3wXDiqh0YBOxtISvJhLj3SVSSc41PdKUmaFJCnDwL7bhMRA6RK4Wp5ZMJLAHwioMjEnLyfR/HBLLC1SKc/Yrlm2ZVhuNeYR0OXsyZEphw770yGDFOZ7/AM7R3xZQU1zvpzxxoZTvMtnRgfUGy7ilPUlcQszNuK7ulkNZhCPX/w2ZYVj9R9eIAqQ45DOW3N28Ffi75itz33k8Ij0bPUES7ZbdyP1XOoWuA5xFkywu7gm4zOkTyhf+1WZNqkecSlmpDbM/JYNKhrEnlhlDgJ6BKPsYwxm--p3WW1ZxTzW8IDRfK--QBljyNNa9ABACbAAtaUgvQ==
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 000000000..25f76c8e1
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,85 @@
+# PostgreSQL. Versions 9.1 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+
+development:
+  <<: *default
+  database: video-store-api_development
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: video-store-api
+
+  # The password associated with the postgres role (username).
+  #password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: video-store-api_test
+
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
+production:
+  <<: *default
+  database: video-store-api_production
+  username: video-store-api
+  password: <%= ENV['VIDEO-STORE-API_DATABASE_PASSWORD'] %>
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 000000000..426333bb4
--- /dev/null
+++ b/config/environment.rb
@@ -0,0 +1,5 @@
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
new file mode 100644
index 000000000..d52ec9efb
--- /dev/null
+++ b/config/environments/development.rb
@@ -0,0 +1,54 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
new file mode 100644
index 000000000..5f023a796
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,85 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  config.log_tags = [ :request_id ]
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "video-store-api_#{Rails.env}"
+
+  config.action_mailer.perform_caching = false
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  end
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
new file mode 100644
index 000000000..0a38fd3ce
--- /dev/null
+++ b/config/environments/test.rb
@@ -0,0 +1,46 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
+  config.action_mailer.perform_caching = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb
new file mode 100644
index 000000000..142d382f8
--- /dev/null
+++ b/config/initializers/action_view.rb
@@ -0,0 +1 @@
+Rails.application.config.action_view.form_with_generates_remote_forms = false
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..89d2efab2
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
new file mode 100644
index 000000000..59385cdf3
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
new file mode 100644
index 000000000..3b1c1b5ed
--- /dev/null
+++ b/config/initializers/cors.rb
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Avoid CORS issues when API is called from the frontend app.
+# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests.
+
+# Read more: https://github.com/cyu/rack-cors
+
+# Rails.application.config.middleware.insert_before 0, Rack::Cors do
+#   allow do
+#     origins 'example.com'
+#
+#     resource '*',
+#       headers: :any,
+#       methods: [:get, :post, :put, :patch, :delete, :options, :head]
+#   end
+# end
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 000000000..4a994e1e7
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
new file mode 100644
index 000000000..ac033bf9d
--- /dev/null
+++ b/config/initializers/inflections.rb
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 000000000..dc1899682
--- /dev/null
+++ b/config/initializers/mime_types.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
new file mode 100644
index 000000000..bbfc3961b
--- /dev/null
+++ b/config/initializers/wrap_parameters.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#   self.include_root_in_json = true
+# end
diff --git a/config/locales/en.yml b/config/locales/en.yml
new file mode 100644
index 000000000..decc5a857
--- /dev/null
+++ b/config/locales/en.yml
@@ -0,0 +1,33 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+#   'true': 'foo'
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 000000000..a5eccf816
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,34 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+# preload_app!
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
new file mode 100644
index 000000000..b0d9ae43d
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,10 @@
+Rails.application.routes.draw do
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  
+  resources :movies, only: [:index, :show, :create]
+  
+  get "/rentals/overdue", to: "rentals#overdue", as: "overdue"
+  post "/rentals/check-out", to: "rentals#create", as: "checkout"
+  patch "/rentals/check-in", to: "rentals#update", as: "checkin"
+  get "/customers", to: "customers#index", as: "customers"
+end
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..9fa7863f9
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 000000000..d32f76e8f
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]
diff --git a/db/migrate/20191105195417_create_movies.rb b/db/migrate/20191105195417_create_movies.rb
new file mode 100644
index 000000000..1748c0def
--- /dev/null
+++ b/db/migrate/20191105195417_create_movies.rb
@@ -0,0 +1,12 @@
+class CreateMovies < ActiveRecord::Migration[5.2]
+  def change
+    create_table :movies do |t|
+      t.string :title
+      t.string :overview
+      t.date :release_date
+      t.integer :inventory
+      
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20191105195554_create_customers.rb b/db/migrate/20191105195554_create_customers.rb
new file mode 100644
index 000000000..b8ef49ec2
--- /dev/null
+++ b/db/migrate/20191105195554_create_customers.rb
@@ -0,0 +1,15 @@
+class CreateCustomers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :customers 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.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20191105213019_add_available_inventory_to_movie.rb b/db/migrate/20191105213019_add_available_inventory_to_movie.rb
new file mode 100644
index 000000000..8aa5f5b56
--- /dev/null
+++ b/db/migrate/20191105213019_add_available_inventory_to_movie.rb
@@ -0,0 +1,5 @@
+class AddAvailableInventoryToMovie < ActiveRecord::Migration[5.2]
+  def change
+    add_column :movies, :available_inventory, :integer, :default => :inventory
+  end
+end
diff --git a/db/migrate/20191105221030_create_rentals.rb b/db/migrate/20191105221030_create_rentals.rb
new file mode 100644
index 000000000..c98328095
--- /dev/null
+++ b/db/migrate/20191105221030_create_rentals.rb
@@ -0,0 +1,10 @@
+class CreateRentals < ActiveRecord::Migration[5.2]
+  def change
+    create_table :rentals do |t|
+      t.date :checkout_date
+      t.date :due_date
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb b/db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb
new file mode 100644
index 000000000..9cad41361
--- /dev/null
+++ b/db/migrate/20191105221230_add_movie_and_customer_foreign_keys_to_rental.rb
@@ -0,0 +1,6 @@
+class AddMovieAndCustomerForeignKeysToRental < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :rentals, :movie, foreign_key: true
+    add_reference :rentals, :customer, foreign_key: true
+  end
+end
diff --git a/db/migrate/20191105225728_add_movies_checked_out_to_customer.rb b/db/migrate/20191105225728_add_movies_checked_out_to_customer.rb
new file mode 100644
index 000000000..37574877e
--- /dev/null
+++ b/db/migrate/20191105225728_add_movies_checked_out_to_customer.rb
@@ -0,0 +1,5 @@
+class AddMoviesCheckedOutToCustomer < ActiveRecord::Migration[5.2]
+  def change
+    add_column :customers, :movies_checked_out_count, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20191107180624_add_returned_to_rental.rb b/db/migrate/20191107180624_add_returned_to_rental.rb
new file mode 100644
index 000000000..7af216b31
--- /dev/null
+++ b/db/migrate/20191107180624_add_returned_to_rental.rb
@@ -0,0 +1,5 @@
+class AddReturnedToRental < ActiveRecord::Migration[5.2]
+  def change
+    add_column :rentals, :returned, :boolean, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..04bf4766d
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,55 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2019_11_07_180624) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "customers", 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.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "movies_checked_out_count", default: 0
+  end
+
+  create_table "movies", force: :cascade do |t|
+    t.string "title"
+    t.string "overview"
+    t.date "release_date"
+    t.integer "inventory"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "available_inventory"
+  end
+
+  create_table "rentals", force: :cascade do |t|
+    t.date "checkout_date"
+    t.date "due_date"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "movie_id"
+    t.bigint "customer_id"
+    t.boolean "returned", default: false
+    t.index ["customer_id"], name: "index_rentals_on_customer_id"
+    t.index ["movie_id"], name: "index_rentals_on_movie_id"
+  end
+
+  add_foreign_key "rentals", "customers"
+  add_foreign_key "rentals", "movies"
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 5322340ba..e20b4e4cf 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -3,5 +3,6 @@
 end
 
 JSON.parse(File.read('db/seeds/movies.json')).each do |movie|
-  Movie.create!(movie)
+  m = Movie.create!(movie)
+  m.update(available_inventory: m.inventory)
 end
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 000000000..37b576a4a
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
diff --git a/storage/.keep b/storage/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/VideoStoreAPI Optional.postman_collection.json b/test/VideoStoreAPI Optional.postman_collection.json
new file mode 100644
index 000000000..6f36670b6
--- /dev/null
+++ b/test/VideoStoreAPI Optional.postman_collection.json	
@@ -0,0 +1,384 @@
+{
+	"info": {
+		"_postman_id": "892e7ad2-13f7-4d89-873b-e8bbe28188be",
+		"name": "VideoStoreAPI Optional",
+		"description": "Optional tests!",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Sort Customers By Name",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "21780182-d694-4396-beba-b13b2535c622",
+						"exec": [
+							"// Check headers",
+							"tests[\"Status code is 200\"] = responseCode.code === 200;",
+							"",
+							"var contentType = postman.getResponseHeader(\"Content-Type\");",
+							"tests[\"Content-Type is present\"] = contentType;",
+							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+							"",
+							"// Check data format",
+							"var jsonData = JSON.parse(responseBody);",
+							"tests[\"Data is an array\"] = Array.isArray(jsonData);",
+							"tests[\"Many customers were sent\"] = jsonData.length > 0;",
+							"",
+							"// Check required fields",
+							"var hasId = true;",
+							"var hasName = true;",
+							"var hasRegisteredAt = true;",
+							"var hasPostalCode = true;",
+							"var hasPhone = true;",
+							"var hasMoviesCheckedOutCount = true;",
+							"",
+							"jsonData.forEach(function(customer) {",
+							"  hasId = hasId && \"id\" in customer;",
+							"  hasName = hasName && \"name\" in customer;",
+							"  hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;",
+							"  hasPostalCode = hasPostalCode && \"postal_code\" in customer;",
+							"  hasPhone = hasPhone && \"phone\" in customer;",
+							"  hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;",
+							"});",
+							"",
+							"var customerId = postman.getEnvironmentVariable(\"customer_id\");",
+							"",
+							"tests[\"All customers have id\"] = hasId;",
+							"tests[\"All customers have name\"] = hasName;",
+							"tests[\"All customers have registered_at\"] = hasRegisteredAt;",
+							"tests[\"All customers have postal_code\"] = hasPostalCode;",
+							"tests[\"All customers have phone\"] = hasPhone;",
+							"tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;",
+							"tests[\"First customer's name starts with 'A'\"] = jsonData[0].name[0] == \"A\";",
+							"tests[\"First customer's id is not 1\"] = jsonData[0].id != \"1\";"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"disableBodyPruning": true
+			},
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "formdata",
+					"formdata": [
+						{
+							"key": "sort",
+							"value": "name",
+							"type": "text"
+						}
+					]
+				},
+				"url": {
+					"raw": "{{url}}/customers/?sort=name",
+					"host": [
+						"{{url}}"
+					],
+					"path": [
+						"customers",
+						""
+					],
+					"query": [
+						{
+							"key": "sort",
+							"value": "name"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Group Customers by n",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "ee343710-c9ea-4e4c-b37d-0e03881e8b1a",
+						"exec": [
+							"// Check headers",
+							"tests[\"Status code is 200\"] = responseCode.code === 200;",
+							"",
+							"var contentType = postman.getResponseHeader(\"Content-Type\");",
+							"tests[\"Content-Type is present\"] = contentType;",
+							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+							"",
+							"// Check data format",
+							"var jsonData = JSON.parse(responseBody);",
+							"tests[\"Data is an array of arrays\"] = Array.isArray(jsonData[0]);",
+							"tests[\"'n' customers per array were sent\"] = jsonData[0].length === parseInt(postman.getEnvironmentVariable(\"group_by_n\"));",
+							"",
+							"// Check required fields",
+							"var hasId = true;",
+							"var hasName = true;",
+							"var hasRegisteredAt = true;",
+							"var hasPostalCode = true;",
+							"var hasPhone = true;",
+							"var hasMoviesCheckedOutCount = true;",
+							"",
+							"jsonData[0].forEach(function(customer) {",
+							"  hasId = hasId && \"id\" in customer;",
+							"  hasName = hasName && \"name\" in customer;",
+							"  hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;",
+							"  hasPostalCode = hasPostalCode && \"postal_code\" in customer;",
+							"  hasPhone = hasPhone && \"phone\" in customer;",
+							"  hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;",
+							"});",
+							"",
+							"tests[\"All customers have id\"] = hasId;",
+							"tests[\"All customers have name\"] = hasName;",
+							"tests[\"All customers have registered_at\"] = hasRegisteredAt;",
+							"tests[\"All customers have postal_code\"] = hasPostalCode;",
+							"tests[\"All customers have phone\"] = hasPhone;",
+							"tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{url}}/customers/?n={{group_by_n}}",
+					"host": [
+						"{{url}}"
+					],
+					"path": [
+						"customers",
+						""
+					],
+					"query": [
+						{
+							"key": "n",
+							"value": "{{group_by_n}}"
+						}
+					]
+				},
+				"description": "Groups customers in subarrays of n length"
+			},
+			"response": []
+		},
+		{
+			"name": "Group Customers by n & p",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "ee343710-c9ea-4e4c-b37d-0e03881e8b1a",
+						"exec": [
+							"// Check headers",
+							"tests[\"Status code is 200\"] = responseCode.code === 200;",
+							"",
+							"var contentType = postman.getResponseHeader(\"Content-Type\");",
+							"tests[\"Content-Type is present\"] = contentType;",
+							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+							"",
+							"// Check data format",
+							"var jsonData = JSON.parse(responseBody);",
+							"var n = jsonData;",
+							"tests[\"Data is an array\"] = Array.isArray(jsonData);",
+							"tests[\"'n' customers were sent\"] = jsonData.length === parseInt(postman.getEnvironmentVariable(\"group_by_n\"));",
+							"",
+							"// Check required fields",
+							"var hasId = true;",
+							"var hasName = true;",
+							"var hasRegisteredAt = true;",
+							"var hasPostalCode = true;",
+							"var hasPhone = true;",
+							"var hasMoviesCheckedOutCount = true;",
+							"",
+							"jsonData.forEach(function(customer) {",
+							"  hasId = hasId && \"id\" in customer;",
+							"  hasName = hasName && \"name\" in customer;",
+							"  hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;",
+							"  hasPostalCode = hasPostalCode && \"postal_code\" in customer;",
+							"  hasPhone = hasPhone && \"phone\" in customer;",
+							"  hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;",
+							"});",
+							"",
+							"tests[\"All customers have id\"] = hasId;",
+							"tests[\"All customers have name\"] = hasName;",
+							"tests[\"All customers have registered_at\"] = hasRegisteredAt;",
+							"tests[\"All customers have postal_code\"] = hasPostalCode;",
+							"tests[\"All customers have phone\"] = hasPhone;",
+							"tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;",
+							"",
+							"// Check first customer in array is not first customer in db",
+							"tests[\"First customer is not first in db\"] = jsonData[0].id != postman.getEnvironmentVariable(\"customer_id\")"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{url}}/customers/?n={{group_by_n}}&p={{group_by_p}}",
+					"host": [
+						"{{url}}"
+					],
+					"path": [
+						"customers",
+						""
+					],
+					"query": [
+						{
+							"key": "n",
+							"value": "{{group_by_n}}"
+						},
+						{
+							"key": "p",
+							"value": "{{group_by_p}}"
+						}
+					]
+				},
+				"description": "Groups customers in subarrays of n length"
+			},
+			"response": []
+		},
+		{
+			"name": "List Overdue Rentals",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "91115dff-c924-4f8d-ad99-4d766835e4cc",
+						"exec": [
+							"// Check headers",
+							"tests[\"Status code is 200\"] = responseCode.code === 200;",
+							"",
+							"var contentType = postman.getResponseHeader(\"Content-Type\");",
+							"tests[\"Content-Type is present\"] = contentType;",
+							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+							"",
+							"// Check data format",
+							"var jsonData = JSON.parse(responseBody);",
+							"tests[\"Data is an array\"] = Array.isArray(jsonData);",
+							"",
+							"// Check required fields",
+							"var hasId = true;",
+							"var hasMovieId = true;",
+							"var hasCustomerId = true;",
+							"var hasCheckoutDate = true;",
+							"var hasDueDate = true;",
+							"var hasName = true;",
+							"var hasTitle = true;",
+							"var hasPostalCode = true;",
+							"",
+							"jsonData.forEach(function(rental) {",
+							"  hasId = hasId && \"id\" in rental;",
+							"  hasMovieId = hasMovieId && \"movie_id\" in rental;",
+							"  hasCustomerId = hasCustomerId && \"customer_id\" in rental;",
+							"  hasCheckoutDate = hasCheckoutDate && \"checkout_date\" in rental;",
+							"  hasDueDate = hasDueDate && \"due_date\" in rental;",
+							"  hasName = hasName && \"name\" in rental;",
+							"  hasTitle = hasTitle && \"title\" in rental;",
+							"  hasPostalCode = hasPostalCode && \"postal_code\" in rental;",
+							"});",
+							"",
+							"tests[\"All rentals have id\"] = hasId;",
+							"tests[\"All rentals have movie id\"] = hasMovieId;",
+							"tests[\"All rentals have customer id\"] = hasCustomerId;",
+							"tests[\"All rentals have checkout date\"] = hasCheckoutDate;",
+							"tests[\"All rentals have due date\"] = hasDueDate;",
+							"tests[\"All rentals have name\"] = hasName;",
+							"tests[\"All rentals have title\"] = hasTitle;",
+							"tests[\"All rentals have postal_code\"] = hasPostalCode;",
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{url}}/rentals/overdue",
+					"host": [
+						"{{url}}"
+					],
+					"path": [
+						"rentals",
+						"overdue"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Sort Overdue Rentals by Due Date",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "91115dff-c924-4f8d-ad99-4d766835e4cc",
+						"exec": [
+							"// Check headers",
+							"tests[\"Status code is 200\"] = responseCode.code === 200;",
+							"",
+							"var contentType = postman.getResponseHeader(\"Content-Type\");",
+							"tests[\"Content-Type is present\"] = contentType;",
+							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+							"",
+							"// Check data format",
+							"var jsonData = JSON.parse(responseBody);",
+							"tests[\"Data is an array\"] = Array.isArray(jsonData);",
+							"",
+							"// Check required fields",
+							"var hasId = true;",
+							"var hasMovieId = true;",
+							"var hasCustomerId = true;",
+							"var hasDueDate = true;",
+							"",
+							"// Set local variables",
+							"var firstRental = jsonData[0];",
+							"var secondRental = jsonData.length > 1 && jsonData[1];",
+							"",
+							"jsonData.forEach(function(rental) {",
+							"  hasId = hasId && \"id\" in rental;",
+							"  hasMovieId = hasMovieId && \"movie_id\" in rental;",
+							"  hasCustomerId = hasCustomerId && \"customer_id\" in rental;",
+							"  hasDueDate = hasDueDate && \"due_date\" in rental;",
+							"});",
+							"",
+							"tests[\"First rental due date is earlier than second rental due date\"] = firstRental.due_date < secondRental.due_date;",
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{url}}/rentals/overdue/?sort=due_date",
+					"host": [
+						"{{url}}"
+					],
+					"path": [
+						"rentals",
+						"overdue",
+						""
+					],
+					"query": [
+						{
+							"key": "sort",
+							"value": "due_date"
+						}
+					]
+				}
+			},
+			"response": []
+		}
+	],
+	"protocolProfileBehavior": {}
+}
\ No newline at end of file
diff --git a/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json b/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json
index 9f640d98c..57fc17bb6 100644
--- a/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json
+++ b/test/VideoStoreAPI_Wave_3_smoke_tests.postman_collection.json
@@ -1,482 +1,482 @@
 {
-	"info": {
-		"_postman_id": "0e4e765d-e505-4cdd-a6e0-c32f8bcb8e92",
-		"name": "VideoStoreAPI Wave 3",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "List Customers",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Check data format",
-							"var jsonData = JSON.parse(responseBody);",
-							"tests[\"Data is an array\"] = Array.isArray(jsonData);",
-							"tests[\"Many customers were sent\"] = jsonData.length > 0;",
-							"",
-							"// Save info on the first customer",
-							"postman.setEnvironmentVariable(\"customer_id\", jsonData[0].id);",
-							"postman.setEnvironmentVariable(\"customer_mcoc\", jsonData[0].movies_checked_out_count);",
-							"",
-							"// Check required fields",
-							"var hasId = true;",
-							"var hasName = true;",
-							"var hasRegisteredAt = true;",
-							"var hasPostalCode = true;",
-							"var hasPhone = true;",
-							"var hasMoviesCheckedOutCount = true;",
-							"",
-							"jsonData.forEach(function(customer) {",
-							"  hasId = hasId && \"id\" in customer;",
-							"  hasName = hasName && \"name\" in customer;",
-							"  hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;",
-							"  hasPostalCode = hasPostalCode && \"postal_code\" in customer;",
-							"  hasPhone = hasPhone && \"phone\" in customer;",
-							"  hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;",
-							"});",
-							"",
-							"tests[\"All customers have id\"] = hasId;",
-							"tests[\"All customers have name\"] = hasName;",
-							"tests[\"All customers have registered_at\"] = hasRegisteredAt;",
-							"tests[\"All customers have postal_code\"] = hasPostalCode;",
-							"tests[\"All customers have phone\"] = hasPhone;",
-							"tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/customers",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"customers"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "List Movies",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Check data format",
-							"var jsonData = JSON.parse(responseBody);",
-							"tests[\"Data is an array\"] = Array.isArray(jsonData);",
-							"tests[\"Many movies were sent\"] = jsonData.length > 0;",
-							"",
-							"// Save info on the first movie",
-							"postman.setEnvironmentVariable(\"movie_id\", jsonData[0].id);",
-							"",
-							"// Check required fields",
-							"var hasTitle = true;",
-							"var hasReleaseDate = true;",
-							"",
-							"jsonData.forEach(function(customer) {",
-							"  hasTitle = hasTitle && \"title\" in customer;",
-							"  hasReleaseDate = hasReleaseDate && \"release_date\" in customer;",
-							"});",
-							"",
-							"tests[\"All movies have title\"] = hasTitle;",
-							"tests[\"All movies have release_date\"] = hasReleaseDate;"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/movies",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"movies"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Show Movie",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Check data format",
-							"var movie = JSON.parse(responseBody);",
-							"tests[\"Data is not an array\"] = !Array.isArray(movie);",
-							"",
-							"// Check required fields",
-							"tests[\"Movie has title\"] = \"title\" in movie;",
-							"tests[\"Movie has overview\"] = \"overview\" in movie;",
-							"tests[\"Movie has release_date\"] = \"release_date\" in movie;",
-							"tests[\"Movie has inventory\"] = \"inventory\" in movie;",
-							"tests[\"Movie has available_inventory\"] = \"available_inventory\" in movie;",
-							"",
-							"// Save available inventory for later",
-							"postman.setEnvironmentVariable(\"movie_ai\", movie.available_inventory);"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/movies/{{movie_id}}",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"movies",
-						"{{movie_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check Out Movie",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "f58b2427-e72e-4c76-a830-f714e65942be",
-						"type": "text/javascript",
-						"exec": [
-							"tests[\"Status code is 200\"] = responseCode.code === 200;"
-						]
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "decbbae7-c4e7-40ad-852d-e682814daac8",
-						"type": "text/javascript",
-						"exec": [
-							""
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n\t\"movie_id\": {{movie_id}},\n\t\"customer_id\": {{customer_id}}\n}"
-				},
-				"url": {
-					"raw": "{{url}}/rentals/check-out",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"rentals",
-						"check-out"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Customer Check Out Count Increased",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Extract the customer we're interested in",
-							"var customerList = JSON.parse(responseBody);",
-							"tests[\"Data is an array\"] = Array.isArray(customerList);",
-							"",
-							"var customerId = postman.getEnvironmentVariable(\"customer_id\");",
-							"customerList = customerList.filter(function(c) { return c.id == customerId });",
-							"",
-							"tests[\"Sent back expected customer\"] = customerList.length == 1;",
-							"",
-							"// Check that the mcoc has increased",
-							"var expected = Number(postman.getEnvironmentVariable(\"customer_mcoc\")) + 1;",
-							"tests[\"Customer's movie check out count increased\"] = customerList[0].movies_checked_out_count === expected;",
-							""
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/customers",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"customers"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Movie Available Inventory Decreased",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Check data format",
-							"var movie = JSON.parse(responseBody);",
-							"tests[\"Data is not an array\"] = !Array.isArray(movie);",
-							"",
-							"var expected = Number(postman.getEnvironmentVariable(\"movie_ai\")) - 1;",
-							"tests[\"Movie available_inventory decreased\"] = movie.available_inventory === expected;"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/movies/{{movie_id}}",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"movies",
-						"{{movie_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check In Movie",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"tests[\"Status code is 200\"] = responseCode.code === 200;"
-						]
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"var today = new Date();",
-							"",
-							"// Get 1 week from today. Works at the end of the month too.",
-							"var nextWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 7);",
-							"",
-							"// toDateString produces \"Wed Jul 28 1993\", which fortunately Rails is able to parse",
-							"postman.setEnvironmentVariable(\"future_due_date\", nextWeek.toDateString());"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n\t\"customer_id\": {{customer_id}},\n\t\"movie_id\": {{movie_id}}\n}"
-				},
-				"url": {
-					"raw": "{{url}}/rentals/check-in",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"rentals",
-						"check-in"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Customer Check Out Count Decreased",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Extract the customer we're interested in",
-							"var customerList = JSON.parse(responseBody);",
-							"tests[\"Data is an array\"] = Array.isArray(customerList);",
-							"",
-							"var customerId = postman.getEnvironmentVariable(\"customer_id\");",
-							"customerList = customerList.filter(function(c) { return c.id == customerId });",
-							"",
-							"tests[\"Sent back expected customer\"] = customerList.length == 1;",
-							"",
-							"// Check that the mcoc has decreased",
-							"var expected = Number(postman.getEnvironmentVariable(\"customer_mcoc\"));",
-							"tests[\"Customer's movie check out count decreased\"] = customerList[0].movies_checked_out_count === expected;",
-							""
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/customers",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"customers"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Movie Available Inventory Increased",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"// Check headers",
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var contentType = postman.getResponseHeader(\"Content-Type\");",
-							"tests[\"Content-Type is present\"] = contentType;",
-							"tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
-							"",
-							"// Check data format",
-							"var movie = JSON.parse(responseBody);",
-							"tests[\"Data is not an array\"] = !Array.isArray(movie);",
-							"",
-							"var expected = Number(postman.getEnvironmentVariable(\"movie_ai\"));",
-							"tests[\"Movie available_inventory increased\"] = movie.available_inventory === expected;"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url}}/movies/{{movie_id}}",
-					"host": [
-						"{{url}}"
-					],
-					"path": [
-						"movies",
-						"{{movie_id}}"
-					]
-				}
-			},
-			"response": []
-		}
-	]
+  "info": {
+    "_postman_id": "0e4e765d-e505-4cdd-a6e0-c32f8bcb8e92",
+    "name": "VideoStoreAPI Wave 3",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "List Customers",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Check data format",
+              "var jsonData = JSON.parse(responseBody);",
+              "tests[\"Data is an array\"] = Array.isArray(jsonData);",
+              "tests[\"Many customers were sent\"] = jsonData.length > 0;",
+              "",
+              "// Save info on the first customer",
+              "postman.setEnvironmentVariable(\"customer_id\", jsonData[0].id);",
+              "postman.setEnvironmentVariable(\"customer_mcoc\", jsonData[0].movies_checked_out_count);",
+              "",
+              "// Check required fields",
+              "var hasId = true;",
+              "var hasName = true;",
+              "var hasRegisteredAt = true;",
+              "var hasPostalCode = true;",
+              "var hasPhone = true;",
+              "var hasMoviesCheckedOutCount = true;",
+              "",
+              "jsonData.forEach(function(customer) {",
+              "  hasId = hasId && \"id\" in customer;",
+              "  hasName = hasName && \"name\" in customer;",
+              "  hasRegisteredAt = hasRegisteredAt && \"registered_at\" in customer;",
+              "  hasPostalCode = hasPostalCode && \"postal_code\" in customer;",
+              "  hasPhone = hasPhone && \"phone\" in customer;",
+              "  hasMoviesCheckedOutCount = hasMoviesCheckedOutCount && \"movies_checked_out_count\" in customer;",
+              "});",
+              "",
+              "tests[\"All customers have id\"] = hasId;",
+              "tests[\"All customers have name\"] = hasName;",
+              "tests[\"All customers have registered_at\"] = hasRegisteredAt;",
+              "tests[\"All customers have postal_code\"] = hasPostalCode;",
+              "tests[\"All customers have phone\"] = hasPhone;",
+              "tests[\"All customers have movies_checked_out_count\"] = hasMoviesCheckedOutCount;"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/customers",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "customers"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "List Movies",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Check data format",
+              "var jsonData = JSON.parse(responseBody);",
+              "tests[\"Data is an array\"] = Array.isArray(jsonData);",
+              "tests[\"Many movies were sent\"] = jsonData.length > 0;",
+              "",
+              "// Save info on the first movie",
+              "postman.setEnvironmentVariable(\"movie_id\", jsonData[0].id);",
+              "",
+              "// Check required fields",
+              "var hasTitle = true;",
+              "var hasReleaseDate = true;",
+              "",
+              "jsonData.forEach(function(customer) {",
+              "  hasTitle = hasTitle && \"title\" in customer;",
+              "  hasReleaseDate = hasReleaseDate && \"release_date\" in customer;",
+              "});",
+              "",
+              "tests[\"All movies have title\"] = hasTitle;",
+              "tests[\"All movies have release_date\"] = hasReleaseDate;"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/movies",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "movies"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Show Movie",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Check data format",
+              "var movie = JSON.parse(responseBody);",
+              "tests[\"Data is not an array\"] = !Array.isArray(movie);",
+              "",
+              "// Check required fields",
+              "tests[\"Movie has title\"] = \"title\" in movie;",
+              "tests[\"Movie has overview\"] = \"overview\" in movie;",
+              "tests[\"Movie has release_date\"] = \"release_date\" in movie;",
+              "tests[\"Movie has inventory\"] = \"inventory\" in movie;",
+              "tests[\"Movie has available_inventory\"] = \"available_inventory\" in movie;",
+              "",
+              "// Save available inventory for later",
+              "postman.setEnvironmentVariable(\"movie_ai\", movie.available_inventory);"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/movies/{{movie_id}}",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "movies",
+            "{{movie_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check Out Movie",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "f58b2427-e72e-4c76-a830-f714e65942be",
+            "type": "text/javascript",
+            "exec": [
+              "tests[\"Status code is 200\"] = responseCode.code === 200;"
+            ]
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "decbbae7-c4e7-40ad-852d-e682814daac8",
+            "type": "text/javascript",
+            "exec": [
+              ""
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n\t\"movie_id\": {{movie_id}},\n\t\"customer_id\": {{customer_id}}\n}"
+        },
+        "url": {
+          "raw": "{{url}}/rentals/check-out",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "rentals",
+            "check-out"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Customer Check Out Count Increased",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Extract the customer we're interested in",
+              "var customerList = JSON.parse(responseBody);",
+              "tests[\"Data is an array\"] = Array.isArray(customerList);",
+              "",
+              "var customerId = postman.getEnvironmentVariable(\"customer_id\");",
+              "customerList = customerList.filter(function(c) { return c.id == customerId });",
+              "",
+              "tests[\"Sent back expected customer\"] = customerList.length == 1;",
+              "",
+              "// Check that the mcoc has increased",
+              "var expected = Number(postman.getEnvironmentVariable(\"customer_mcoc\")) + 1;",
+              "tests[\"Customer's movie check out count increased\"] = customerList[0].movies_checked_out_count === expected;",
+              ""
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/customers",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "customers"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Movie Available Inventory Decreased",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Check data format",
+              "var movie = JSON.parse(responseBody);",
+              "tests[\"Data is not an array\"] = !Array.isArray(movie);",
+              "",
+              "var expected = Number(postman.getEnvironmentVariable(\"movie_ai\")) - 1;",
+              "tests[\"Movie available_inventory decreased\"] = movie.available_inventory === expected;"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/movies/{{movie_id}}",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "movies",
+            "{{movie_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check In Movie",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "tests[\"Status code is 200\"] = responseCode.code === 200;"
+            ]
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "var today = new Date();",
+              "",
+              "// Get 1 week from today. Works at the end of the month too.",
+              "var nextWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 7);",
+              "",
+              "// toDateString produces \"Wed Jul 28 1993\", which fortunately Rails is able to parse",
+              "postman.setEnvironmentVariable(\"future_due_date\", nextWeek.toDateString());"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "PATCH",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n\t\"customer_id\": {{customer_id}},\n\t\"movie_id\": {{movie_id}}\n}"
+        },
+        "url": {
+          "raw": "{{url}}/rentals/check-in",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "rentals",
+            "check-in"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Customer Check Out Count Decreased",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Extract the customer we're interested in",
+              "var customerList = JSON.parse(responseBody);",
+              "tests[\"Data is an array\"] = Array.isArray(customerList);",
+              "",
+              "var customerId = postman.getEnvironmentVariable(\"customer_id\");",
+              "customerList = customerList.filter(function(c) { return c.id == customerId });",
+              "",
+              "tests[\"Sent back expected customer\"] = customerList.length == 1;",
+              "",
+              "// Check that the mcoc has decreased",
+              "var expected = Number(postman.getEnvironmentVariable(\"customer_mcoc\"));",
+              "tests[\"Customer's movie check out count decreased\"] = customerList[0].movies_checked_out_count === expected;",
+              ""
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/customers",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "customers"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Movie Available Inventory Increased",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "// Check headers",
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var contentType = postman.getResponseHeader(\"Content-Type\");",
+              "tests[\"Content-Type is present\"] = contentType;",
+              "tests[\"Content-Type is application/json\"] = contentType.has('application/json');",
+              "",
+              "// Check data format",
+              "var movie = JSON.parse(responseBody);",
+              "tests[\"Data is not an array\"] = !Array.isArray(movie);",
+              "",
+              "var expected = Number(postman.getEnvironmentVariable(\"movie_ai\"));",
+              "tests[\"Movie available_inventory increased\"] = movie.available_inventory === expected;"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url}}/movies/{{movie_id}}",
+          "host": [
+            "{{url}}"
+          ],
+          "path": [
+            "movies",
+            "{{movie_id}}"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
 }
\ No newline at end of file
diff --git a/test/controllers/.keep b/test/controllers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb
new file mode 100644
index 000000000..7fef90804
--- /dev/null
+++ b/test/controllers/customers_controller_test.rb
@@ -0,0 +1,83 @@
+require "test_helper"
+
+describe CustomersController do
+  
+  describe "index" do
+    CUSTOMER_KEYS = [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]
+    
+    it "responds with JSON and success" do
+      get customers_path
+      
+      check_response(expected_type: Array)
+      must_respond_with :ok
+    end
+    
+    it "responds with customer data" do
+      get customers_path
+      
+      body = check_response(expected_type: Array)
+      
+      body.each do |customer|
+        expect(customer).must_be_instance_of Hash
+        expect(customer.keys.sort).must_equal CUSTOMER_KEYS.sort
+      end
+    end
+    
+    it "will respond with an empty array when there are no customers" do
+      Customer.destroy_all
+      
+      get customers_path
+      
+      body = check_response(expected_type: Array)
+      expect(body).must_equal []
+    end
+    
+    describe "index params" do
+      before do
+        10.times do
+          Customer.create!(name: "customer", registered_at: Date.today, postal_code: "98101", phone: "111-222-3333", movies_checked_out_count: 1)
+        end
+      end
+      
+      it "will respond with JSON and success if request contains a valid n param" do
+        get customers_path, params: { sort: "name", n: "2" }
+        
+        body = check_response(expected_type: Array)
+        body.each do |subarray|
+          expect(subarray).must_be_instance_of Array
+          expect(subarray.length).must_equal 2
+        end
+      end
+      
+      it "will respond with error if given an invalid n param" do
+        get customers_path, params: { sort: "name", n: "name" }
+        
+        body = check_response(expected_type: Hash, expected_status: :bad_request)
+        expect(body["errors"]).must_include "unable to group customers"
+      end
+      
+      it "will respond with JSON and success if request contains a valid p param, regardless of value" do
+        get customers_path, params: { sort: nil, n: nil, p: "40"}
+        
+        body = check_response(expected_type: Array)
+        expect(body.length).must_equal Customer.all.length
+      end
+      
+      it "will respond with error if given an invalid p param" do
+        get customers_path, params: { sort: nil, n: "3", p: "40"}
+        
+        body = check_response(expected_type: Hash, expected_status: :not_found)
+        expect(body["errors"]).must_include "not found"
+      end
+
+      it "will respond with error if given invalid sort_type" do 
+        get customers_path, params: { sort: "banana", n: "3", p: "10"}
+      
+        body = check_response(expected_type: Hash, expected_status: :bad_request)
+        expect(body["errors"]).must_include "invalid sort category"
+      end
+    end
+    
+  end
+  
+end
diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb
new file mode 100644
index 000000000..654f78654
--- /dev/null
+++ b/test/controllers/movies_controller_test.rb
@@ -0,0 +1,98 @@
+require "test_helper"
+
+describe MoviesController do
+
+  describe "index" do
+    it "responds with JSON and success" do
+      get movies_path
+      
+      check_response(expected_type: Array)
+    end
+    
+    it "responds with an array of movie hashes" do
+      get movies_path
+      
+      body = check_response(expected_type: Array)
+      body.each do |movie|
+        expect(movie).must_be_instance_of Hash
+        expect(movie.keys.sort).must_equal ["id", "title", "release_date"]
+      end
+    end
+    
+    it "will respond with an empty array when there are no movies" do
+      Movie.destroy_all
+      
+      get movies_path
+
+      body = check_response(expected_type: Array)
+      expect(body).must_equal []
+    end
+  end
+  
+  describe "show" do
+    before do
+      Movie.create(title: "random", inventory: 10)
+    end
+    
+    let (:valid_movie_id) { Movie.all.first }
+    let (:invalid_movie_id) { -1 }
+
+    it "responds with JSON and success for valid movie" do      
+      get movie_path(valid_movie_id.id)
+      
+      check_response(expected_type: Hash)
+      body = check_response(expected_type: Hash)
+      
+      expect(body.keys.sort).must_equal ["id", "title", "release_date", "overview", "inventory", "available_inventory"].sort
+      must_respond_with :ok
+    end
+    
+    it "responds with JSON and not found error for invalid movie" do
+      get movie_path(invalid_movie_id)
+      
+      body = check_response(expected_type: Hash, expected_status: :not_found)
+      
+      expect(body["errors"]).must_equal ["not found"]
+    end
+  end
+  
+  describe "create" do
+    it "creates new movie with valid parameters" do
+      valid_movie_params = {
+        title: "new movie",
+        overview: "new movie description",
+        release_date: 2019,
+        inventory: 10
+      }
+
+      expect {
+        post movies_path, params: valid_movie_params
+      }.must_change "Movie.count", 1
+      
+      created_movie = Movie.find_by(title: valid_movie_params[:title])
+      body = check_response(expected_type: Hash)
+      
+      expect(body.keys.length).must_equal 1
+      expect(body.keys).must_equal ["id"]
+      expect(body["id"]).must_be_instance_of Integer
+      expect(body["id"]).must_equal created_movie.id
+      expect(created_movie.available_inventory).must_equal created_movie.inventory
+    end
+    
+    it "renders error if unable to save movie " do
+      invalid_movie_params = {
+        overview: "new movie description",
+        release_date: 2019,
+        inventory: 10
+      }
+      
+      expect {
+        post movies_path, params: invalid_movie_params
+      }.wont_change "Movie.count"
+      
+      body = check_response(expected_type: Hash, expected_status: :bad_request)
+      expect(body["errors"]).must_include "unable to create movie"
+    end
+  end
+  
+end
diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb
new file mode 100644
index 000000000..6a2543dd6
--- /dev/null
+++ b/test/controllers/rentals_controller_test.rb
@@ -0,0 +1,146 @@
+require "test_helper"
+
+describe RentalsController do
+  before do
+    @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10)
+    @customer = Customer.create(name: "valid customer")
+  end
+  
+  describe "create (check out)" do
+    it "can check out a movie by creating a new rental with valid input and available inventory" do
+      expect{ 
+        post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} 
+      }.must_change "Rental.count", 1
+      
+      created_rental = Rental.find_by(movie_id: @movie.id)
+      
+      expect(created_rental.checkout_date).must_be_kind_of Date
+      expect(created_rental.due_date).must_be_kind_of Date
+      
+      body = check_response(expected_type: Hash)
+      expect(body["id"]).must_equal created_rental.id
+      must_respond_with :ok
+    end
+    
+    it "will respond with error if invalid inventory" do
+      @movie.update(available_inventory: 0)
+      
+      expect{ 
+        post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id} 
+      }.wont_change "Rental.count"
+      
+      must_respond_with :bad_request
+      body = check_response(expected_type: Hash, expected_status: :bad_request)
+      expect(body["errors"]).must_include "unable to create rental"
+    end
+    it "will respond with error if invalid movie id" do      
+      expect{ 
+        post checkout_path, params: {movie_id: nil, customer_id: @customer.id} 
+      }.wont_change "Rental.count"
+      
+      must_respond_with :bad_request
+      body = check_response(expected_type: Hash, expected_status: :bad_request)
+      expect(body["errors"]).must_include "unable to create rental"
+    end
+    
+    it "will respond with error if invalid cusotmer id" do      
+      expect{ 
+        post checkout_path, params: {movie_id: @movie.id, customer_id: nil} 
+      }.wont_change "Rental.count"
+      
+      must_respond_with :bad_request
+      body = check_response(expected_type: Hash, expected_status: :bad_request)
+      expect(body["errors"]).must_include "unable to create rental"
+    end
+  end
+  
+  describe "update (check in)" do
+    it "can check in a valid rental and  by creating a new rental with valid input and available inventory" do
+      # check out rental so that it can be checked in
+      post checkout_path, params: {movie_id: @movie.id, customer_id: @customer.id}
+      
+      expect{ 
+        patch checkin_path, params: {movie_id: @movie.id, customer_id: @customer.id} 
+      }.wont_change "Rental.count"
+      
+      must_respond_with :ok
+      check_response(expected_type: Hash)
+    end
+    
+    it "will not check in a rental that doesn't exist" do
+      expect{ 
+        patch checkin_path, params: {id: -1} 
+      }.wont_change "Rental.count"
+      
+      must_respond_with :not_found
+      body = check_response(expected_type: Hash, expected_status: :not_found)
+      expect(body["errors"]).must_include "rental not found"
+    end
+  end
+  
+  describe "overdue" do
+    before do
+      @movie = Movie.first
+      @customer = Customer.first
+      @rental = Rental.create(customer_id: @customer.id, movie_id: @movie.id)
+      @rental.checkout_date = Date.today - 10
+      @rental.due_date = Date.today - 3
+      @rental.save!
+    end
+    
+    it "returns all overdue rentals" do
+      get overdue_path
+      
+      body = check_response(expected_type: Array)
+      expect(body.length).must_equal Rental.count
+      must_respond_with :ok
+    end
+    
+    it "returns an empty array if there are no overdue rentals" do
+      Rental.destroy_all
+      
+      get overdue_path
+      
+      body = check_response(expected_type: Array)
+      expect(body.length).must_equal 0 
+      must_respond_with :ok  
+    end
+
+    describe "overdue params" do
+      before do
+        5.times do
+          Rental.create!(customer_id: @customer.id, movie_id: @movie.id)
+        end
+      end
+
+      it "will respond with JSON and success if n param" do
+        get overdue_path, params: { sort: "movie_id", n: "2" }
+      
+        body = check_response(expected_type: Array)
+        body.each do |subarray|
+          expect(subarray).must_be_instance_of Array
+        end
+      end
+
+      it "will respond with JSON and success if p param without n param" do
+        get overdue_path, params: { sort: nil, n: nil, p: "40"}
+      
+        body = check_response(expected_type: Array, expected_status: :ok)
+      end
+
+      it "will respond with error if given invalid p param" do
+        get overdue_path, params: { sort: nil, n: "3", p: -10}
+      
+        body = check_response(expected_type: Hash, expected_status: :not_found)
+        expect(body["errors"]).must_include "not found"
+      end
+
+      it "will respond with error if given invalid sort_type" do 
+        get overdue_path, params: { sort: "banana", n: "3", p: "10"}
+      
+        body = check_response(expected_type: Hash, expected_status: :bad_request)
+        expect(body["errors"]).must_include "invalid sort category"
+      end
+    end
+  end
+end
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/.keep b/test/integration/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/mailers/.keep b/test/mailers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb
new file mode 100644
index 000000000..484404806
--- /dev/null
+++ b/test/models/customer_test.rb
@@ -0,0 +1,100 @@
+require "test_helper"
+
+describe Customer do
+  describe "initialize" do
+    before do
+      @new_customer = Customer.new
+    end
+
+    it "can be instantiated" do
+      expect(@new_customer.valid?).must_equal true
+    end
+  end
+  
+  describe "relationships" do
+    it "can have many rentals" do
+      movie = Movie.create(title: "valid movie", inventory: 10)
+      customer = Customer.create(name: "valid customer")
+      rental = Rental.create(movie_id: movie.id, customer_id: customer.id)
+      
+      expect(customer).must_respond_to :rentals
+      customer.rentals.each do |rental|
+        expect(rental).must_be_kind_of Rental
+      end
+      expect(customer.rentals.length).must_equal 1
+    end
+  end
+  
+  describe "custom methods" do
+    before do
+      Customer.destroy_all
+      
+      @customer_one = Customer.create(name: "b", postal_code: 00003)
+      @customer_two = Customer.create(name: "a", postal_code: 00002)
+      @customer_three = Customer.create(name: "c", postal_code: 00001)
+    end
+    
+    describe "self.sort_by_group" do
+      it "returns an array of one group of customers if n is defined but p is not defined" do
+        group = Customer.group_by_n(nil, 10, nil)
+        
+        expect(group[0].length).must_equal 3
+      end
+
+      it "returns nil if n is not defined but p is defined" do
+        group = Customer.group_by_n(nil, nil, 10)
+        
+        expect(group.length).must_equal 3
+      end
+      
+      it "returns an array of customers for that page if n and p are defined" do
+        group = Customer.group_by_n("name", 2, 2)
+        
+        expect(group.length).must_equal 1
+        
+        group = Customer.group_by_n("name", 2, 1)
+        
+        expect(group.length).must_equal 2
+      end
+      
+      it "if no type of sort is specified, customers are sorted by ID" do
+        customers = Customer.group_by_n(nil, nil, nil)
+        
+        expect(customers[0].id < customers[1].id).must_equal true
+        expect(customers[1].id < customers[2].id).must_equal true
+      end
+    end
+    
+    describe "self.sort_by_name" do
+      it "sorts customers by name" do
+        customers = Customer.sort_by_type("name")
+        
+        expect(customers[0].name < customers[1].name).must_equal true
+        expect(customers[1].name < customers[2].name).must_equal true
+      end
+    end
+    
+    describe "self.sort_by_registered_at" do
+      it "sorts customers by registration time" do
+        @customer_one.update(registered_at: @customer_one.created_at)
+        @customer_two.update(registered_at: @customer_two.created_at)
+        @customer_three.update(registered_at: @customer_three.created_at)
+        
+        customers = Customer.sort_by_type("registered_at")
+        
+        expect(customers[0].registered_at < customers[1].registered_at).must_equal true
+        expect(customers[1].registered_at < customers[2].registered_at).must_equal true
+      end
+    end
+    
+    describe "self.sort_by_postal_code" do
+      it "sorts customers by postal code" do
+        customers = Customer.sort_by_type("postal_code")
+        
+        expect(customers[0].postal_code < customers[1].postal_code).must_equal true
+        expect(customers[1].postal_code < customers[2].postal_code).must_equal true
+      end
+    end
+  end
+  
+end
diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb
new file mode 100644
index 000000000..788a8726c
--- /dev/null
+++ b/test/models/movie_test.rb
@@ -0,0 +1,58 @@
+require "test_helper"
+
+describe Movie do
+  describe "initialize" do
+    before do
+      @new_movie = Movie.new(title: "new movie", inventory: 10)
+    end
+
+    it "movie can be instantiated" do
+      expect(@new_movie.valid?).must_equal true
+    end
+
+    it "will have the required fields" do
+      expect(@new_movie).must_respond_to :title
+      expect(@new_movie).must_respond_to :inventory
+    end
+  end
+
+  describe "validation" do
+    it "will create movie if title and inventory are present" do
+      movie = Movie.new(title: "valid movie", inventory: 20)
+      
+      is_valid = movie.valid?
+
+      assert(is_valid)
+    end
+    
+    it "will not create movie if title is not present" do
+      movie = Movie.new(inventory: 10)
+      
+      is_valid = movie.valid?
+      
+      refute(is_valid)
+    end
+
+    it "will not create movie if inventory is not present" do
+      movie = Movie.new(title: "invalid movie")
+      
+      is_valid = movie.valid?
+      
+      refute(is_valid)
+    end
+  end
+  
+  describe "relationships" do
+    it "can have many rentals" do
+      movie = Movie.create(title: "valid movie", inventory: 10)
+      customer = Customer.create(name: "valid customer")
+      rental = Rental.create(movie_id: movie.id, customer_id: customer.id)
+      
+      expect(movie).must_respond_to :rentals
+      movie.rentals.each do |rental|
+        expect(rental).must_be_kind_of Rental
+      end
+      expect(movie.rentals.length).must_equal 1
+    end
+  end
+end
diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb
new file mode 100644
index 000000000..146b5e2c2
--- /dev/null
+++ b/test/models/rental_test.rb
@@ -0,0 +1,226 @@
+require "test_helper"
+
+describe Rental do
+  let (:movie) { movie = Movie.create(title: "valid movie", inventory: 10) }
+  let (:customer) { customer = Customer.create(name: "valid customer") }
+  
+  describe "initialize" do
+    before do
+      @new_rental = Rental.new(movie_id: movie.id, customer_id: customer.id)
+    end
+    
+    it "rental can be instantiated" do
+      expect(@new_rental.valid?).must_equal true
+    end
+    
+    it "will have the required fields" do
+      expect(@new_rental).must_respond_to :movie_id
+      expect(@new_rental).must_respond_to :customer_id
+    end
+    
+    it "returned will be assigned false" do
+      expect(@new_rental.returned).must_equal false
+    end
+  end
+  
+  describe "validation" do
+    before do 
+      @rental = Rental.create(movie_id: movie.id, customer_id: customer.id)
+    end
+    
+    it "must have a customer and movie" do
+      
+      is_valid = @rental.valid?
+      
+      assert(is_valid)
+    end
+    it "returns invalid if no customer is present" do
+      @rental.update(customer_id: nil)  
+      
+      is_valid = @rental.valid?
+      
+      refute(is_valid)
+    end
+    it "returns invalid if no movie is present" do
+      @rental.update(movie_id: nil) 
+      
+      is_valid = @rental.valid?
+      
+      refute(is_valid)
+    end
+  end
+  
+  describe "relationships" do
+    before do
+      @rental = Rental.create(movie_id: movie.id, customer_id: customer.id)
+    end
+    
+    it "must belong to a customer" do
+      expect(@rental).must_respond_to :customer
+      expect(@rental.customer).must_be_kind_of Customer
+    end
+    
+    it "must belong to a movie" do
+      expect(@rental).must_respond_to :movie
+      expect(@rental.movie).must_be_kind_of Movie
+    end
+  end
+  
+  describe "custom methods" do    
+    before do
+      @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10)
+      @customer = Customer.create(name: "valid customer")
+      @rental = Rental.create(movie_id: @movie.id, customer_id: @customer.id)
+    end
+    
+    describe "check out rental method" do
+      it "decrements available inventory" do
+        starting_inventory = @movie.available_inventory
+        
+        @rental.check_out_rental
+        
+        @movie.reload
+        
+        expect(@movie.available_inventory).must_equal starting_inventory - 1
+      end
+      
+      it "increments movies checkout out count" do
+        starting_checked_out = @customer.movies_checked_out_count
+        
+        @rental.check_out_rental
+        
+        @customer.reload
+        
+        expect(@customer.movies_checked_out_count
+        ).must_equal starting_checked_out + 1
+      end
+    end
+    
+    describe "check in rental method" do
+      it "increments available inventory" do
+        starting_inventory = @movie.available_inventory
+        
+        @rental.check_in_rental
+        
+        @movie.reload
+        
+        expect(@movie.available_inventory).must_equal starting_inventory + 1
+      end
+      
+      it "decrements movies checked out count" do
+        starting_checked_out = @customer.movies_checked_out_count
+        
+        @rental.check_in_rental
+        
+        @customer.reload
+        
+        expect(@customer.movies_checked_out_count
+        ).must_equal starting_checked_out - 1
+      end
+      
+      it "changes status of rental to returned: true" do
+        expect(@rental.returned).must_equal false
+        
+        @rental.check_in_rental
+        
+        expect(@rental.returned).must_equal true
+      end
+    end
+    
+    describe "overdue" do
+      before do
+        @rental.update(due_date: Date.today - 3)
+      end
+
+      it "returns all overdue rentals" do
+        expect(@rental.returned).must_equal false
+        expect(Rental.overdue).must_include @rental
+        Rental.overdue.each do |rental|
+          assert(rental.due_date < Date.today)
+        end
+      end
+      
+      it "ignores rentals that have been returned" do
+        expect(@rental.returned).must_equal false
+        
+        @rental.check_in_rental
+
+        expect(@rental.returned).must_equal true
+        assert(Rental.overdue.empty?)
+        expect(Rental.overdue).must_equal []
+      end
+    end
+
+    describe "self.group_by_n" do
+      before do
+        Rental.destroy_all
+
+        @movie = Movie.create(title: "valid movie", inventory: 10, available_inventory: 10)
+        @customer = Customer.create(name: "valid customer")
+        
+        3.times do
+          Rental.create(movie_id: @movie.id, customer_id: @customer.id)
+        end
+      end
+
+      it "returns an array of one group of customers if n is defined but p is not defined" do
+        group = Rental.group_by_n(nil, 10, nil)
+        
+        expect(group[0].length).must_equal Rental.count
+      end
+
+      it "returns nil if n is not defined but p is defined" do
+        group = Rental.group_by_n(nil, nil, 10)
+        
+        expect(group.length).must_equal Rental.count
+      end
+      
+      it "returns an array of customers for that page if n and p are defined" do
+        group = Rental.group_by_n("title", 2, 2)
+        
+        expect(group.length).must_equal 1
+        
+        group = Rental.group_by_n("title", 2, 1)
+        
+        expect(group.length).must_equal 2
+      end
+      
+      it "if no type of sort is specified, customers are sorted by ID" do
+        rentals = Rental.group_by_n(nil, nil, nil)
+        
+        expect(rentals[0].id < rentals[1].id).must_equal true
+        expect(rentals[1].id < rentals[2].id).must_equal true
+      end
+    end
+    
+    describe "self.sort_by_type" do
+      before do
+        @customer_two = Customer.create(name: "second customer", postal_code: "11111")
+        @customer.update(postal_code: "22222")
+
+        @movie_two = Movie.create(title: "second movie", inventory: 5)
+
+        Rental.create(movie_id: @movie.id, customer_id: @customer.id, checkout_date: Date.today - 10, due_date: Date.today - 3)
+        Rental.create(movie_id: @movie_two.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 2)
+        Rental.create(movie_id: @movie.id, customer_id: @customer_two.id, checkout_date: Date.today - 9, due_date: Date.today - 3)
+      end
+      
+      it "sorts rentals by any possible type" do
+        SORT_TYPES = ["movie_id", "title", "customer_id", "name", "postal_code", "checkout_date", "due_date"]
+
+        SORT_TYPES.each do |type|
+          rentals = Rental.sort_by_type(type)
+
+          if ["name", "postal_code"].include? type
+            expect(rentals[0].customer[type] <= rentals[1].customer[type]).must_equal true 
+          elsif ["title"].include? type
+            expect(rentals[0].movie[type] <= rentals[1].movie[type]).must_equal true 
+          else
+            expect(rentals[0][type] <= rentals[1][type]).must_equal true
+            expect(rentals[1][type] <= rentals[2][type]).must_equal true
+          end
+        end
+      end
+    end   
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 000000000..8e583c7f3
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,28 @@
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+require 'rails/test_help'
+require "minitest/rails"
+require "minitest/reporters" 
+require 'minitest/autorun'
+
+Minitest::Reporters.use!(
+  Minitest::Reporters::SpecReporter.new,
+  ENV,
+  Minitest.backtrace_filter
+)
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+  
+  # Add more helper methods to be used by all tests here...
+  
+  def check_response(expected_type:, expected_status: :success)
+    must_respond_with expected_status
+    expect(response.header['Content-Type']).must_include 'json'
+    
+    body = JSON.parse(response.body)
+    expect(body).must_be_kind_of expected_type
+    return body
+  end
+end
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 000000000..e69de29bb