diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..ca5d0e6e7
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..48fb168f6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+# 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 Byebug command history file.
+.byebug_history
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..e79223552
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,56 @@
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.0.2'
+# Use postgresql as the database for Active Record
+gem 'pg', '~> 0.18'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
+# 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', '~> 3.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# 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', platform: :mri
+end
+
+group :development do
+  gem 'listen', '~> 3.0.5'
+  # 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 do
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'pry-rails'
+end
+
+gem 'awesome_print'
+gem 'foundation-rails'
+gem 'chronic'
+
+group :test do
+  gem 'minitest-rails'
+  gem 'minitest-reporters'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..eaee83688
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,181 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ansi (1.5.0)
+    arel (7.1.4)
+    awesome_print (1.7.0)
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
+    better_errors (2.1.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (9.0.6)
+    chronic (0.10.2)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    debug_inspector (0.0.3)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    ffi (1.9.18)
+    foundation-rails (6.3.1.0)
+      railties (>= 3.1.0)
+      sass (>= 3.3.0, < 3.5)
+      sprockets-es6 (>= 0.9.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.1)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.5)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    minitest-rails (3.0.0)
+      minitest (~> 5.8)
+      railties (~> 5.0)
+    minitest-reporters (1.1.14)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
+    pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    puma (3.8.2)
+    rack (2.0.2)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    ruby-progressbar (1.8.1)
+    sass (3.4.23)
+    slop (3.6.0)
+    spring (2.0.1)
+      activesupport (>= 4.2)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-es6 (0.9.2)
+      babel-source (>= 5.8.11)
+      babel-transpiler
+      sprockets (>= 3.0.0)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  better_errors
+  binding_of_caller
+  byebug
+  chronic
+  foundation-rails
+  listen (~> 3.0.5)
+  minitest-rails
+  minitest-reporters
+  pg (~> 0.18)
+  pry-rails
+  puma (~> 3.0)
+  rails (~> 5.0.2)
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  tzinfo-data
+
+BUNDLED WITH
+   1.14.6
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..bf46fe5f6
--- /dev/null
+++ b/app/controllers/customers_controller.rb
@@ -0,0 +1,13 @@
+class CustomersController < ApplicationController
+
+  def index
+    if ["name", "registered_at", "postal_code"].include?(params[:sort])
+      customers = Customer.order(params[:sort])
+    else
+      customers = Customer.all
+    end
+
+    render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone],
+    methods: :movies_checked_out_count), status: :ok
+  end
+end
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
new file mode 100644
index 000000000..a67224ec2
--- /dev/null
+++ b/app/controllers/movies_controller.rb
@@ -0,0 +1,26 @@
+class MoviesController < ApplicationController
+
+  # before_action :find_movie, :only => [:show]
+
+  def index
+    movies = Movie.all
+    render json: movies.as_json(only: [:title, :release_date]), status: :ok
+  end
+
+  def show
+    movie = Movie.find_by(title: params[:title])
+    if movie.nil?
+      render json: { nothing: true }, status: :not_found
+    else
+      render json: movie.as_json(except: [:id, :updated_at, :created_at],
+      methods: :available_inventory), status: :ok
+    end
+  end
+end
+
+# private
+#
+# def find_movie
+#   movie = Movie.find_by(title: params[:title])
+#   return movie
+# end
diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb
new file mode 100644
index 000000000..e64cfc5d2
--- /dev/null
+++ b/app/controllers/rentals_controller.rb
@@ -0,0 +1,75 @@
+class RentalsController < ApplicationController
+
+  def create
+    movie = Movie.find_by_title(params[:title])
+
+    if movie.nil? || movie.available_inventory < 1
+      id = 0
+    else
+      id = movie.id
+    end
+
+    @rental = Rental.new(movie_id: id, customer_id: rental_params[:customer_id], due_date: rental_params[:due_date] )
+
+    if @rental.save
+      # movie.inventory -= 1
+      # movie.save
+      render status: :ok, json: @rental.as_json
+    else
+      render status: :error, json: { error: @rental.errors.full_messages }
+    end
+  end
+
+
+  def update
+    movie = find_movie(params[:title])
+    customer = find_customer(params[:customer_id])
+    if movie.nil?
+      # if movie title not found
+      render status: :bad_request, json: { error: "no movie found with that title"}
+    elsif customer.nil?
+      # if customer id not valid
+      render status: :bad_request, json: { error: "no customer found"}
+    else
+      # find the rental in question based on params[:title] and params[:customer_id]
+      rental = Rental.find_by(customer_id: customer.id, movie_id: movie.id)
+      # if found, set checkin_date to today's date
+      if rental
+        rental.checkin_date = Date.today
+        rental.save
+        # movie.inventory += 1
+        # movie.save
+        render status: :ok, json: { nothing: true }
+      else
+        # if rental doesn't exist (customer id and movie id valid but movie never checked out)
+        render status: :bad_request, json: { error: "that movie is not checked out to that customer"}
+      end
+    end
+  end
+
+
+  def overdue
+    overdue_rentals = Rental.over_due_rentals
+    if overdue_rentals.length == 0
+      render json: { overdue: "none" }, status: :ok
+    else
+      render json: overdue_rentals.as_json(only: [:customer_id, :checkout_date, :due_date], methods: [:customer_name, :customer_postal_code, :movie_title]), status: :ok
+    end
+  end
+
+  private
+
+  def rental_params
+    params.permit(:customer_id, :due_date)
+  end
+
+
+  def find_movie(title)
+    Movie.find_by_title(title)
+  end
+
+  def find_customer(id)
+    Customer.find_by_id(id)
+  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..3b7e35283
--- /dev/null
+++ b/app/models/customer.rb
@@ -0,0 +1,23 @@
+class Customer < ApplicationRecord
+
+  # has_many :movies
+
+  validates :name, presence: true
+  validates :address, presence: true
+  validates :city, presence: true
+  validates :state, presence: true
+  validates :postal_code, presence: true
+  validates :phone, presence: true
+  validates :account_credit, presence: true, numericality: { greater_than_or_equal_to: 0 }
+
+
+
+  validates :name, uniqueness: { scope: [:address, :city, :state, :postal_code, :phone] }
+
+  def movies_checked_out_count
+    #rentals with this customer id and checkin_date = nil
+    rentals = Rental.where(customer_id: self.id, checkin_date: nil)
+    return rentals.size
+  end
+
+end
diff --git a/app/models/movie.rb b/app/models/movie.rb
new file mode 100644
index 000000000..dd115e8e5
--- /dev/null
+++ b/app/models/movie.rb
@@ -0,0 +1,15 @@
+class Movie < ApplicationRecord
+  validates :title, presence: true
+  validates_uniqueness_of :title, scope: :release_date
+  validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0}
+  validates :release_date, presence: true
+
+  has_many :rentals
+
+  def available_inventory
+    #should subtract from the inventory the number of copies out in active rentals (checkin_date = nil)
+    rentals = Rental.where(movie_id: self.id, checkin_date: nil)
+    return self.inventory - rentals.size
+  end
+
+end
diff --git a/app/models/rental.rb b/app/models/rental.rb
new file mode 100644
index 000000000..ecc64e5ec
--- /dev/null
+++ b/app/models/rental.rb
@@ -0,0 +1,55 @@
+class Rental < ApplicationRecord
+  belongs_to :movie
+  belongs_to :customer
+  after_initialize :set_defaults
+
+  validates :due_date, presence: true
+  # validate :due_date_not_in_past
+  # validate :enough_inventory
+
+  validates :customer_id, presence: true
+
+
+  # def due_date_not_in_past
+  #   if due_date < Date.today
+  #     errors.add(:due_date, "can't be in the past")
+  #   end
+  # end
+
+  # def enough_inventory
+  #   inventory = movie.inventory
+  #   if inventory < 1
+  #     errors.add(:inventory, "not enough inventory")
+  #   end
+  # end
+
+  def set_defaults
+    self.checkout_date ||= Date.today
+    self.due_date ||= Chronic.parse('two weeks from today')
+  end
+
+  def self.over_due_rentals #returns array of Customer objects
+    rentals = Rental.where("due_date < ?", Date.today)
+    overdue_rentals = rentals.where('checkin_date': nil)
+    return overdue_rentals
+
+  end
+
+  def customer_name
+    return self.customer.name
+  end
+
+  def customer_postal_code
+    return self.customer.postal_code
+  end
+
+  def movie_title
+    return self.movie.title
+  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..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+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..e620b4dad
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+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..fb2ec2ebb
--- /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..a8e4462f2
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+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..54782d010
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,34 @@
+require_relative 'boot'
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+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
+    # Force new test files to be generated in the minitest-spec style
+    config.generators do |g|
+      g.test_framework :minitest, spec: true
+    end
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # 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..30f5120df
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 000000000..0bbde6f74
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,9 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 000000000..aead51124
--- /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: VideoStoreAPI_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: VideoStoreAPI
+
+  # 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: VideoStoreAPI_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: VideoStoreAPI_production
+  username: VideoStoreAPI
+  password: <%= ENV['VIDEOSTOREAPI_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..082a013ab
--- /dev/null
+++ b/config/environments/development.rb
@@ -0,0 +1,47 @@
+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.
+  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=172800'
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # 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
+
+
+  # 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..49275a9d6
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,78 @@
+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
+
+  # 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
+
+  # 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 = "VideoStoreAPI_#{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..30587ef6d
--- /dev/null
+++ b/config/environments/test.rb
@@ -0,0 +1,42 @@
+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=3600'
+  }
+
+  # 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
+  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/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..51639b67a
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,6 @@
+# Be sure to restart your server when you modify this file.
+
+# ApplicationController.renderer.defaults.merge!(
+#   http_host: 'example.org',
+#   https: false
+# )
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/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
new file mode 100644
index 000000000..d859e4bea
--- /dev/null
+++ b/config/initializers/new_framework_defaults.rb
@@ -0,0 +1,18 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.0 upgrade.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
+# Previous versions had false.
+ActiveSupport.to_time_preserves_timezone = true
+
+# Require `belongs_to` associations by default. Previous versions had false.
+Rails.application.config.active_record.belongs_to_required_by_default = true
+
+# Do not halt callback chains when a callback returns false. Previous versions had true.
+ActiveSupport.halt_callback_chains_on_return_false = false
+
+# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
+Rails.application.config.ssl_options = { hsts: { subdomains: true } }
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..065395716
--- /dev/null
+++ b/config/locales/en.yml
@@ -0,0 +1,23 @@
+# 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.
+#
+# 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..c7f311f81
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,47 @@
+# 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 }.to_i
+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. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted this block will be run, if you are using `preload_app!`
+# option you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, Ruby
+# cannot share connections between processes.
+#
+# on_worker_boot do
+#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+# end
+
+# 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..28f73fb79
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,18 @@
+Rails.application.routes.draw do
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  get "/rentals/overdue", to: "rentals#overdue"
+
+  get "/customers", to: "customers#index"
+
+  get "/movies", to: "movies#index"
+  #
+  get "/movies/:title", to: "movies#show", as: "movie"
+
+  #
+  post "/rentals/:title/check-out", to: "rentals#create", as: "checkout"
+  # [post customer_id and due_date]
+  #
+  post "/rentals/:title/check-in", to: "rentals#update", as: "checkin"
+  # [post customer_id]
+  #
+end
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 000000000..abdac3545
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rails secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: df155bf0d4a6b976d3353d144d683fe2cc4a813adb6be6677373df15a64e12f4c269ef434ae3c1c3ecaf5232beb500d448ba39b72a9bab543ff1408ef864eec3
+
+test:
+  secret_key_base: 236cae61252377e43ff3970928975cab4400d0cb64e4f277f26d6417de2c2528ab632bc02f75d0897867bebe4b837d0b25e1c6be93e6f07caa076e5d7d034d44
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..c9119b40c
--- /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/db/migrate/20170509202653_create_movies.rb b/db/migrate/20170509202653_create_movies.rb
new file mode 100644
index 000000000..6e5d1cad0
--- /dev/null
+++ b/db/migrate/20170509202653_create_movies.rb
@@ -0,0 +1,11 @@
+class CreateMovies < ActiveRecord::Migration[5.0]
+  def change
+    create_table :movies do |t|
+      t.string :title
+      t.string :overview
+      t.datetime :release_date
+      t.integer :inventory
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170509202844_create_customers.rb b/db/migrate/20170509202844_create_customers.rb
new file mode 100644
index 000000000..ba079c631
--- /dev/null
+++ b/db/migrate/20170509202844_create_customers.rb
@@ -0,0 +1,15 @@
+class CreateCustomers < ActiveRecord::Migration[5.0]
+  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/20170509203433_create_rentals.rb b/db/migrate/20170509203433_create_rentals.rb
new file mode 100644
index 000000000..92b53cc5c
--- /dev/null
+++ b/db/migrate/20170509203433_create_rentals.rb
@@ -0,0 +1,13 @@
+class CreateRentals < ActiveRecord::Migration[5.0]
+  def change
+    create_table :rentals do |t|
+      t.references :movie, foreign_key: true
+      t.references :customer, foreign_key: true
+      t.datetime :checkout_date
+      t.datetime :due_date
+      t.datetime :checkin_date
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170509203810_add_account_creditto_customer.rb b/db/migrate/20170509203810_add_account_creditto_customer.rb
new file mode 100644
index 000000000..d4de21308
--- /dev/null
+++ b/db/migrate/20170509203810_add_account_creditto_customer.rb
@@ -0,0 +1,5 @@
+class AddAccountCredittoCustomer < ActiveRecord::Migration[5.0]
+  def change
+    add_column :customers, :account_credit, :float
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..9969686c8
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,54 @@
+# 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: 20170509203810) 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.float    "account_credit"
+  end
+
+  create_table "movies", force: :cascade do |t|
+    t.string   "title"
+    t.string   "overview"
+    t.datetime "release_date"
+    t.integer  "inventory"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
+  end
+
+  create_table "rentals", force: :cascade do |t|
+    t.integer  "movie_id"
+    t.integer  "customer_id"
+    t.datetime "checkout_date"
+    t.datetime "due_date"
+    t.datetime "checkin_date"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+    t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree
+    t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree
+  end
+
+  add_foreign_key "rentals", "customers"
+  add_foreign_key "rentals", "movies"
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 5322340ba..e938c60b8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,18 @@
 JSON.parse(File.read('db/seeds/movies.json')).each do |movie|
   Movie.create!(movie)
 end
+
+Rental.create (
+  {
+      movie: Movie.first,
+      customer: Customer.first
+  })
+
+Rental.create (
+  {
+      movie: Movie.first,
+      customer: Customer.last,
+      due_date: Chronic.parse('yesterday')
+
+  }
+)
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..3c9c7c01f
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-agent: *
+# Disallow: /
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..134727374
--- /dev/null
+++ b/test/controllers/customers_controller_test.rb
@@ -0,0 +1,63 @@
+require "test_helper"
+
+describe "CustomersController" do
+CUSTOMER_KEYS = %w(id movies_checked_out_count name phone postal_code registered_at)
+
+  describe "index" do
+    before do
+      get customers_url
+    end
+
+    it "is an actual route" do
+      must_respond_with :success
+    end
+
+    it "returns json" do
+      response.header['Content-Type'].must_include 'json'
+    end
+
+    it "returns an array of all the customers" do
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Array
+      body.length.must_equal Customer.count
+    end
+
+    it "returns customers with exactly the required fields" do
+      body = JSON.parse(response.body)
+      body.each do |customer|
+        customer.keys.sort.must_equal CUSTOMER_KEYS
+      end
+    end
+  end
+
+  describe "index with sort parameter" do
+    it "sorts customers by name" do
+        get customers_path(sort: "name")
+        # check first and last against sorted db
+        body = JSON.parse(response.body)
+        customers = Customer.order(:name)
+        body.first["name"].must_equal customers.first[:name]
+        body.last["name"].must_equal customers.last[:name]
+    end
+
+    it "sorts customers by date registered" do
+      get customers_path(sort: "registered_at")
+      # check first and last against sorted db
+      body = JSON.parse(response.body)
+      customers = Customer.order(:registered_at)
+      body.first["registered_at"].must_equal customers.first[:registered_at]
+      body.last["registered_at"].must_equal customers.last[:registered_at]
+    end
+
+    it "sorts customers by postal code" do
+      get customers_path(sort: "postal_code")
+      # check first and last against sorted db
+      body = JSON.parse(response.body)
+      customers = Customer.order(:postal_code)
+      body.first["postal_code"].must_equal customers.first[:postal_code]
+      body.last["postal_code"].must_equal customers.last[:postal_code]
+    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..6660216cd
--- /dev/null
+++ b/test/controllers/movies_controller_test.rb
@@ -0,0 +1,71 @@
+require "test_helper"
+
+describe MoviesController do
+
+  MOVIE_INDEX_KEYS = %w(release_date title) #if we loop through this, we can see whether the keys and values work/exist
+  MOVIE_SHOW_KEYS = %w(available_inventory inventory overview release_date title)
+
+  describe 'index' do
+    before do
+      get movies_url
+    end
+
+    it "is a real working route" do
+      must_respond_with :success
+    end
+
+    it "returns json" do
+      response.header['Content-Type'].must_include 'json'
+    end
+
+    it "returns an array" do
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Array
+    end
+
+    it "returns all of the movies" do
+      body = JSON.parse(response.body)
+      body.length.must_equal Movie.count
+    end
+
+    it "returns movies with the required fields" do
+      body = JSON.parse(response.body)
+      body.each do |movie|
+        movie.keys.sort.must_equal MOVIE_INDEX_KEYS
+      end
+    end
+  end
+
+  describe "show" do
+    let(:arabia) { movies(:arabia) }
+
+    before do
+      get movie_path(arabia.title)
+    end
+
+    it "should find a movie given a title" do
+      must_respond_with :success
+
+      body = JSON.parse(response.body)
+      body.must_be_instance_of Hash
+      body.keys.sort.must_equal MOVIE_SHOW_KEYS
+    end
+
+    it "should return a movie with the right information" do
+      body = JSON.parse(response.body)
+
+      MOVIE_SHOW_KEYS.each do |key|
+        next if key == "available_inventory"
+        body[key].must_equal arabia[key]
+      end
+    end
+
+    it "should return status not found if the movie is not found" do
+      get movie_path("xqrt99")
+      must_respond_with :not_found
+      body = JSON.parse(response.body)
+      body.must_equal "nothing" => true
+    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..c465124bf
--- /dev/null
+++ b/test/controllers/rentals_controller_test.rb
@@ -0,0 +1,228 @@
+require "test_helper"
+
+describe RentalsController do
+
+  describe "Create (checkout)" do
+    let(:customer) { customers(:good_data) }
+    let(:movie) { movies(:psycho) }
+    let(:customer2) { customers(:no_rentals)}
+
+    it "given valid customer id and movie title, can checkout movie (increase rental record by 1)" do
+      proc {
+        post checkout_path("Psycho"), params: {
+          customer_id: Customer.all.first.id, #this is going to AR to get the actual record but is talkign to the fixtures
+          due_date: Chronic.parse("two weeks from today")
+
+        }
+      }.must_change 'Rental.count', 1
+      must_respond_with :success
+    end
+
+    it "given invalid customer_id, cannot checkout movie" do
+      proc {
+        post checkout_path("Psycho"), params: {
+          customer_id: Customer.all.last.id+1,
+          due_date: Chronic.parse("two weeks from today")
+        }
+      }.must_change 'Rental.count', 0
+      must_respond_with :error
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.must_include "error"
+    end
+
+    it "given invalid movie_title, cannot checkout movie" do
+      proc {
+        post checkout_path("Psychosss"), params: {
+          customer_id: Customer.all.first.id,
+          due_date: Chronic.parse("two weeks from today")
+        }
+      }.must_change 'Rental.count', 0
+      must_respond_with 500
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.must_include "error"
+    end
+
+    it "can checkout a movie with enough inventory" do
+      proc {
+        post checkout_path("Psycho"), params: {
+          customer_id: Customer.all.first.id,
+          due_date: Chronic.parse("two weeks from today")
+        }
+      }.must_change 'Rental.count', 1
+      must_respond_with :success
+    end
+
+    it "cannot checkout movie with no inventory" do
+      proc {
+        post checkout_path("Bring it On"), params: {
+          customer_id: Customer.all.first.id,
+          due_date: Chronic.parse("two weeks from today")
+        }
+      }.must_change 'Rental.count', 0
+      must_respond_with 500
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.must_include "error"
+    end
+
+    it "cannot checkout movie with no available inventory" do
+      post checkout_path("Lawrence of Arabia"), params: {
+        customer_id: customer.id,
+        due_date: Chronic.parse("two weeks from today")}
+        proc {
+          post checkout_path("Lawrence of Arabia"), params: {
+            customer_id: customer.id,
+            due_date: Chronic.parse("two weeks from today")}
+          }.must_change 'Rental.count', 0
+          must_respond_with 500
+
+
+        end
+
+        # it "returns error when due date is in the past" do
+        #   proc {
+        #     post checkout_path("Psycho"), params: {
+        #       customer_id: Customer.all.first.id,
+        #       due_date: Chronic.parse("yesterday")
+        #     }
+        #   }.must_change 'Rental.count', 0
+        #   must_respond_with 500
+        #
+        #   body = JSON.parse(response.body)
+        #   body.must_be_kind_of Hash
+        #   body.must_include "error"
+        # end
+
+        it "decreases inventory of movie by 1" do
+          proc {
+            post checkout_path("Psycho"), params: {
+              customer_id: Customer.all.first.id,
+              due_date: Chronic.parse("two weeks from today")
+            }
+          }.must_change 'Movie.find_by_title("Psycho").available_inventory', -1
+
+        end
+
+
+        it "increases the customer's movies_checked_out_count by 1" do
+          proc {
+            post checkout_path(movie.title), params: {
+              customer_id: customer.id,
+              due_date: Chronic.parse("two weeks from today")
+            }
+          }.must_change 'customer.movies_checked_out_count', 1
+        end
+
+      end
+
+
+      describe "check_in" do
+        let(:rental) { rentals(:one) }
+        let(:customer) { customers(:good_data) }
+        let(:movie) { movies(:psycho) }
+        let(:customer2) { customers(:no_rentals)}
+
+        it "succeeds for valid title and customer id" do
+          #valid means: rental exists [and therefore movie and customer exist]
+          post checkin_path(movie.title), params: { customer_id: customer.id }
+          must_respond_with :success
+        end
+
+        it "modifies the db with today's date as checkin date" do
+          post checkin_path(movie.title), params: { customer_id: customer.id }
+          rental.checkin_date.must_equal Date.today
+        end
+
+        it "modifies the db" do
+          proc {
+            post checkin_path(movie.title), params: { customer_id: customer.id }
+          }.must_change rental.checkin_date
+        end
+
+        it "decreases the customer's movies_checked_out_count by 1" do
+          proc {
+            post checkin_path(movie.title), params: { customer_id: customer.id }
+          }.must_change 'customer.movies_checked_out_count', -1
+        end
+
+        it "increases the movie's available inventory count by 1" do
+          proc {
+            post checkin_path(movie.title), params: { customer_id: customer.id }
+          }.must_change 'Movie.find_by_title("Psycho").available_inventory', 1
+        end
+
+        it "renders bad request for invalid customer id data" do
+          post checkin_path(movie.title), params: { customer_id: (Customer.last.id + 1)}
+          must_respond_with :bad_request
+          body = JSON.parse(response.body)
+          body["error"].must_include "customer"
+        end
+
+        it "does not change the customer's movies_checked_out_count with invalid data" do
+          proc {
+            post checkin_path(movie.title), params: { customer_id: (Customer.last.id + 1)}
+          }.must_change 'customer.movies_checked_out_count', 0
+        end
+
+        it "renders bad request if movie not found" do
+          post checkin_path("totally made up title"), params: { customer_id: customer.id }
+          must_respond_with :bad_request
+          body = JSON.parse(response.body)
+          body["error"].must_include "movie"
+        end
+
+        it "renders a different message if rental does not exist" do
+          #rental does not exist (customer does not actually have that movie checked out)
+          post checkin_path(movie.title), params: { customer_id: customer2.id}
+          must_respond_with :bad_request
+          body = JSON.parse(response.body)
+          body["error"].must_include "not checked out"
+        end
+
+        it "renders bad request for invalid customer id data" do
+          post checkin_path(movie.title), params: { customer_id: (Customer.last.id + 1)}
+          must_respond_with :bad_request
+          body = JSON.parse(response.body)
+          body["error"].must_include "customer"
+        end
+
+
+
+        it "renders bad request if movie not found" do
+          post checkin_path("totally made up title"), params: { customer_id: customer.id }
+          must_respond_with :bad_request
+          body = JSON.parse(response.body)
+          body["error"].must_include "movie"
+        end
+
+        it "renders a different message if rental does not exist" do
+          #rental does not exist (customer does not actually have that movie checked out)
+          post checkin_path(movie.title), params: { customer_id: customer2.id}
+          must_respond_with :bad_request
+          body = JSON.parse(response.body)
+          body["error"].must_include "not checked out"
+        end
+      end
+
+
+      describe "overdue" do
+
+        it "should list customers with overdue titles" do
+          get rentals_overdue_path
+          must_respond_with :success
+        end
+
+        it "response  should be in json" do
+          get rentals_overdue_path
+          response.header['Content-Type'].must_include 'json'
+        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/customers.yml b/test/fixtures/customers.yml
new file mode 100644
index 000000000..326dfe21a
--- /dev/null
+++ b/test/fixtures/customers.yml
@@ -0,0 +1,62 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+good_data:
+  name: John
+  registered_at: 2017-05-09 13:28:44
+  address: 1111 19th Ave South
+  city: Seattle
+  state: WA
+  postal_code: "98122"
+  phone: 701-306-7504
+  account_credit: 100.00
+
+good_data_dupe:
+  name: John
+  registered_at: 2017-05-09 13:28:44
+  address: 1111 19th Ave South
+  city: Seattle
+  state: WA
+  postal_code: "98122"
+  phone: 701-306-7504
+  account_credit: 100.00
+
+good_data_unique:
+  name: Amy
+  registered_at: 2017-05-09 13:28:44
+  address: 1111 19th Ave South
+  city: Seattle
+  state: WA
+  postal_code: "98122"
+  phone: 701-306-7504
+  account_credit: 100.00
+
+
+bad_data:
+  name: Bob
+  registered_at: 2017-05-09 13:28:44
+  address: 1759 19th Ave
+  # city: Seattle
+  state: WA
+  postal_code: "98144"
+  phone: 701-306-7504
+  account_credit: 100.00
+
+negative_account:
+  name: Ann
+  registered_at: 2017-05-09 13:28:44
+  address: 1111 19th Ave South
+  city: Seattle
+  state: WA
+  postal_code: "98122"
+  phone: 701-306-7504
+  account_credit: -100.00
+
+no_rentals:
+  name: Ethelbert
+  registered_at: 2017-05-09 13:28:44
+  address: 1111 19th Ave South
+  city: Seattle
+  state: WA
+  postal_code: "98122"
+  phone: 701-306-7504
+  account_credit: 0
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml
new file mode 100644
index 000000000..aa4894c99
--- /dev/null
+++ b/test/fixtures/movies.yml
@@ -0,0 +1,25 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the "{}" from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+psycho:
+  title: "Psycho"
+  overview: "When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower."
+  release_date: 1960-06-16
+  inventory: 8
+
+
+bringit:
+  title: "Bring it On"
+  overview: "Cheerleading drama"
+  release_date: 1960-06-16
+  inventory: 0
+
+
+arabia:
+  title: "Lawrence of Arabia"
+  overview: "Lawrence of Arabia is the classic film from David Lean starring Peter O’Toole and based on the autobiography from Thomas Edward Lawrence who during the first World War was on assignment by the British Empire in Arabia. The film would become a cult classic and is known today as a masterpiece."
+  release_date: 1962-12-10
+  inventory: 1
diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml
new file mode 100644
index 000000000..35edb2879
--- /dev/null
+++ b/test/fixtures/rentals.yml
@@ -0,0 +1,17 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  movie: psycho
+  customer: good_data
+  checkout_date: 2017-05-09 13:34:33
+
+two:
+  movie: arabia
+  customer: good_data
+  checkout_date: 2017-05-09 13:34:33
+
+three:
+  movie: arabia
+  customer: good_data
+  checkout_date: 2017-05-09 13:34:33
+  due_date: 2017-05-09 13:34:33
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..2f5fc34a7
--- /dev/null
+++ b/test/models/customer_test.rb
@@ -0,0 +1,47 @@
+require "test_helper"
+
+
+describe Customer do
+  let(:good_data) {customers(:good_data) }
+  let(:good_data_dupe) {customers(:good_data_dupe) }
+  let(:good_data_unique) {customers(:good_data_unique) }
+  let(:bad_data) {customers(:bad_data) }
+  let(:negative_account) {customers(:negative_account) }
+
+
+  describe "validations" do
+
+    it "must be able to create valid customer" do
+      # Customer.new(new_customer).save.must_equal true
+      good_data_unique.save!.must_equal true
+    end
+
+    it "must be able to create valid customer and return corresponding data" do
+      good_data.save
+      good_data.name.must_equal "John"
+    end
+
+    it 'invalid without all parameters' do
+      bad_data.save.must_equal false
+      bad_data.errors.messages.must_include :city
+    end
+
+    # it 'invalid without all parameters' do
+    #   customer_missing_name = good_data
+    #   customer_missing_name[:name].must_be nil
+    #   # customer_missing_name.save.must_equal false
+    # end
+
+    it 'customer requires a unique username and address (w/ city, state, zip) combo' do
+      good_data.save
+      good_data_dupe.save.must_equal false
+      good_data_dupe.errors.messages.must_include :name
+
+    end
+
+    it 'cannot create customer with negative account credit' do
+      negative_account.save.must_equal false
+      negative_account.errors.messages.must_include :account_credit
+    end
+  end
+end
diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb
new file mode 100644
index 000000000..3db7ed87e
--- /dev/null
+++ b/test/models/movie_test.rb
@@ -0,0 +1,74 @@
+require "test_helper"
+
+describe Movie do
+  let(:movie) { Movie.new }
+  let(:psycho) { movies(:psycho) }
+  let(:sample_rental) { rentals(:one) }
+  let(:sample_customer) { customers(:one) }
+
+  #at least one positive and one neg case
+  # for each relation
+  # for each validation
+  describe "validations" do
+    it "must have a title, release date, and inventory count" do
+      movie.title = "North by Northwest"
+      movie.inventory = 8
+      movie.release_date = "1959-07-17"
+      movie.save.must_equal true
+    end
+
+    it "must not allow a movie without a title, release date and inventory" do
+      movie.overview = "Nothing happens."
+      movie.save.must_equal false
+      movie.errors.messages.must_include :title
+      movie.errors.messages.must_include :inventory
+      movie.errors.messages.must_include :release_date
+    end
+
+    it "must not allow just a title but no inventory or release date" do
+      movie.title = "Whatevs"
+      movie.save.must_equal false
+      movie.errors.messages.must_include :inventory
+      movie.errors.messages.must_include :release_date
+    end
+
+    it "must permit a unique combination of title and release date" do
+      movie.title = psycho.title
+      movie.overview = "The animated children's version of the Hitchcock classic"
+      movie.release_date = "2015-09-01"
+      movie.inventory = 3
+      movie.save.must_equal true
+    end
+
+    it "must not allow a movie with a duplicate title/release date pair" do
+      movie.title = psycho.title
+      movie.release_date = psycho.release_date
+      movie.inventory = 1
+      movie.save.must_equal false
+      movie.errors.messages.must_include :title
+    end
+
+    it "must have an inventory that is an integer" do
+      movie.title = "North by Northwest"
+      movie.inventory = "cheezits"
+      movie.release_date = "1959-07-17"
+      movie.save.must_equal false
+      movie.errors.messages.must_include :inventory
+    end
+
+    it "must have an inventory greater than or equal to zero" do
+      movie.title = "North by Northwest"
+      movie.inventory = -7
+      movie.release_date = "1959-07-17"
+      movie.save.must_equal false
+      movie.errors.messages.must_include :inventory
+    end
+  end
+
+  describe "relations" do
+    it "may have zero or more rentals" do
+      psycho.rentals.must_include sample_rental
+    end
+
+  end
+end
diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb
new file mode 100644
index 000000000..9a500e632
--- /dev/null
+++ b/test/models/rental_test.rb
@@ -0,0 +1,45 @@
+require "test_helper"
+
+describe Rental do
+  let(:rental) { Rental.new }
+  let(:sample_customer) {customers(:good_data)}
+  let(:sample_movie) {movies(:psycho)}
+
+  it "can be created with an associated movie and customer" do
+    rental.movie = Movie.first
+    rental.customer = Customer.last
+    rental.save.must_equal true
+
+  end
+
+  it "cannot be created without a movie" do
+    rental.customer_id = sample_customer.id
+    rental.checkout_date = Date.current
+    rental.due_date = Date.current
+    rental.save.must_equal false
+    rental.errors.messages.must_include :movie
+
+  end
+
+  it "also cannot be created without a customer" do
+    rental.movie = Movie.first
+    rental.customer = nil
+    rental.save.must_equal false
+
+  end
+
+  it "should be assigned today's date as default for checkout_date" do
+    rental.customer_id = sample_customer.id
+    rental.movie_id = sample_movie.id
+    rental.save.must_equal true
+    rental.checkout_date.must_equal Date.today
+
+  end
+
+  it "should be assigned a default due date of two weeks from today" do
+    rental.movie = Movie.first
+    rental.customer = Customer.last
+    rental.due_date.must_equal Chronic.parse('two weeks from today')
+  end
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 000000000..10594a324
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,26 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path("../../config/environment", __FILE__)
+require "rails/test_help"
+require "minitest/rails"
+require "minitest/reporters"  # for Colorized output
+
+#  For colorful output!
+Minitest::Reporters.use!(
+  Minitest::Reporters::SpecReporter.new,
+  ENV,
+  Minitest.backtrace_filter
+)
+
+
+# To add Capybara feature tests add `gem "minitest-rails-capybara"`
+# to the test group in the Gemfile and uncomment the following:
+# require "minitest/rails/capybara"
+
+# Uncomment for awesome colorful output
+# require "minitest/pride"
+
+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...
+end
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 000000000..e69de29bb