diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..fd0838a7d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# 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
+
+.byebug_history
+
+coverage
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..bf784b0f7
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,52 @@
+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.1.6'
+# Use postgresql as the database for Active Record
+gem 'pg', '>= 0.18', '< 2.0'
+# Use Puma as the app server
+gem 'puma', '~> 3.7'
+# 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 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', 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 :test do
+  gem 'minitest-rails'
+  gem 'minitest-reporters'
+end
+
+gem 'simplecov', require: false, group: :test
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..d936cd1e6
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,162 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.6)
+      actionpack (= 5.1.6)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.6)
+      actionview (= 5.1.6)
+      activesupport (= 5.1.6)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.6)
+      activesupport (= 5.1.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.6)
+      activesupport (= 5.1.6)
+      globalid (>= 0.3.6)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)
+      arel (~> 8.0)
+    activesupport (5.1.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ansi (1.5.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    byebug (10.0.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    docile (1.3.0)
+    erubi (1.7.1)
+    ffi (1.9.23)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    json (2.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.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    minitest-rails (3.0.0)
+      minitest (~> 5.8)
+      railties (~> 5.0)
+    minitest-reporters (1.2.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pg (1.0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    puma (3.11.4)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.6)
+      actioncable (= 5.1.6)
+      actionmailer (= 5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
+      activemodel (= 5.1.6)
+      activerecord (= 5.1.6)
+      activesupport (= 5.1.6)
+      bundler (>= 1.3.0)
+      railties (= 5.1.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.6)
+      actionpack (= 5.1.6)
+      activesupport (= 5.1.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    ruby-progressbar (1.9.0)
+    ruby_dep (1.5.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    spring (2.0.2)
+      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-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  listen (>= 3.0.5, < 3.2)
+  minitest-rails
+  minitest-reporters
+  pg (>= 0.18, < 2.0)
+  pry-rails
+  puma (~> 3.7)
+  rails (~> 5.1.6)
+  simplecov
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  tzinfo-data
+
+BUNDLED WITH
+   1.16.1
diff --git a/README.md b/README.md
index 59f4e3757..7db80e4ca 100644
--- a/README.md
+++ b/README.md
@@ -1,310 +1,24 @@
-# Project: VideoStoreAPI
+# README
 
-**Due:** EOD Friday May 11
+This README would normally document whatever steps are necessary to get the
+application up and running.
 
-The goal of this project is to create a system that a video store (remember those?) could use to track their inventory of rental videos and their list of customers.
+Things you may want to cover:
 
-We will use Rails to construct a RESTful API. The purpose of this API is to quickly serve information about the store's video collection, customer information, and to update rental status. This repository provides two JSON datafiles to serve as the initial seeds for this system.
+* Ruby version
 
-This is a pair project. You and your partner should use all the techniques we've learned so far to keep yourselves organized and on track, and ensure that no requirements slip through the cracks.
+* System dependencies
 
-## Learning Goals
-Upon completing this project, students should be able to:
+* Configuration
 
-- Build an ERD and set up ActiveRecord models for a given dataset / use-case
-- Expose database contents through a web API
-- Respond reasonably to bad user data in the context of an API
-- Verify the correctness of an API using controller tests
+* Database creation
 
-This is a [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project.
+* Database initialization
 
-## Success Criteria
-Your project will be evaluated against the following requirements:
+* How to run the test suite
 
-- API conformance
-  - The provided smoke tests should pass (see the subfolder)
-  - Bad data sent to the API should result in an appropriate status code and helpful error
-- Test coverage
-  - Models: All relations, validations, and custom model methods should include at least one positive and one negative test case
-  - Controllers: Every API endpoint should include at least one positive and one negative test case
-- Style and Organization
-  - Everything we've learned so far about how to design and build a Rails app still applies!
+* Services (job queues, cache servers, search engines, etc.)
 
-## Project Baseline
-- Read the API Requirements below and create a pseudo-code "routes" file that specifies
-  - The _endpoints_ your API will need
-  - The _HTTP verbs_ each endpoint will use
-  - Any data that must be provided to the endpoint in order for it to do its work
-- Read the Seed Data description below and, bearing in mind the API Requirements, create an ERD for your database that specifies
-  - The _models_ your database will require
-  - The _attributes_ for each model
-  - Any _relationships_ between models
-- Create a new Rails app to serve as the API
-  - **Create the rails app with:** `$ rails new . --api`
-- Create a route that responds to `/zomg` that serves a json-encoded "it works!"
+* Deployment instructions
 
-## Wave 1: Database Models, Tables, & Seeds
-- Generate Rails models and associations to match your ERD
-- Use the provided seed script `db/seeds.rb` to import the provided JSON data into your database
-
-In the past, many students have spent lots of time writing and testing validations for these models. Because project time is limited and validations are not an important learning objective this week, we do not recommend this. Instead, validate only those fields that, if they are absent, will break your API.
-
-### Seed Data
-`movies.json` contains information about the videos available to rent at the store. The data is presented as an array of objects, with each object having the following key-value pairs:
-
-| Field          | Datatype | Description
-|----------------|----------|------------
-| `title`        | string   | The title of the film
-| `overview`     | string   | A short plot synopsis
-| `release_date` | date   | `YYYY-MM-DD`, Day the film was originally released
-| `inventory`    | integer  | How many copies of the film the video store owns
-
-`customers.json` contains information about the customers that have rented with the store in the past. The data is presented as, you guessed it, an array of objects, with each object have the following key-value pairs:
-
-| Field            | Datatype | Description
-|------------------|----------|------------
-| `name`           | string   | The customer's name
-| `registered_at`  | datetime   | `Wed, 29 Apr 2015 07:54:14 -0700`, When the customer first visited the store
-| `address`        | string   | Street address
-| `city`           | string   | &nbsp;
-| `state`          | string   | &nbsp;
-| `postal_code`    | string   | &nbsp;
-| `phone`          | string   | Primary contact phone number
-
-### Testing
-As with all Rails projects, model testing is a requirement. You should have _at least_ one positive and one negative test case for each relation, validation, and custom function you add to your models.
-
-Use good TDD practices, and test _before_ you code. Remember: red-green-refactor.
-
-## Waves 2 and 3: Coding The API
-In this wave, you will implement the API described below. The endpoints are described more-or-less in order of complexity, and we recommend you build them in that order. Every endpoint must serve JSON data, and must use HTTP response codes to indicate the status of the request.
-
-The schema of your database and the structure of your rails app are completely up to you, so long as the API conforms to the description and provided script.
-
-### Error Handling
-If something goes wrong, your API should return an appropriate [HTTP status code](http://billpatrianakos.me/blog/2013/10/13/list-of-rails-status-code-symbols/), as well as a list of errors. The list should be formatted like this:
-
-```json
-{
-  "errors": {
-    "title": ["Movie 'Revenge of the Gnomes' not found"]
-  }
-}
-```
-
-All errors your API can return should be covered by at least one test case.
-
-### Testing
-Because APIs are often open to the public, thorough testing is essential. For a Rails API, that means controller testing.
-
-For each API endpoint, you should have _at least_:
-- A basic test with no parameters, if applicable
-- Positive and negative tests for any URI parameters (user ID, movie title)
-- Testing around any data in the request body
-
-Use good TDD practices, and test _before_ you code. Remember: red-green-refactor.
-
-#### Smoke Tests
-Because this API will be used as the backend for a future project, there are strict requirements about how it should be structured. To this end, we have provided a set of [smoke tests](http://softwaretestingfundamentals.com/smoke-testing/) written in Postman to exercise all the endpoints.
-
-The smoke tests will verify that your API looks correct to the outside world, by sending actual HTTP requests to your running server and checking the results. They test things like:
-
-- Did I get a success response for a valid request?
-- Did the API return JSON?
-- Does the JSON contain the expected property names?
-
-**The smoke tests are not a substitute for writing your own tests!!!!!** They do **not** check that the content is _correct_, nor do they cover any negative or edge cases. Verifying correctness in these cases is **your** responsibility.
-
-The smoke tests live in the file [`test/VideoStoreAPI_smoke_tests.postman_collection.json`](test/VideoStoreAPI_smoke_tests.postman_collection.json). To run them:
-
-1. Open Postman
-1. Click `Import` in the top left
-1. Drag-and-drop the file into the box
-1. In the left sidebar, click on the `Collections` tab
-1. There should now be an entry for the smoke tests. Hover over it and click the `>` icon for a detail view.  You will notice they are in the format `{{url}}/movies`.  `{{url}}` is a key which you can give a value on your computer.
-1.  To do so go to the Gearbox in the top-right and select `Manage Environments`
-![Manage Environments](images/manage-environment.png)
-1.  Then Select `Add`
-![add button](images/add-btn.png)
-1.  Lastly add a key `url` and value `http://localhost:3000`
-![Key & Value](images/key-value.png)
-1. Click the blue `Run` button. This will launch the collection runner.
-1. In the collection runner, scroll down in the center pane and click the blue `Start Test` button
-
-## API Description
-
-### Wave 2: Customers and Movies
-
-#### `GET /customers`
-List all customers
-
-Fields to return:
-- `id`
-- `name`
-- `registered_at`
-- `postal_code`
-- `phone`
-- `movies_checked_out_count`
-  - This will be 0 unless you've completed optional requirements
-
-#### `GET /movies`
-List all movies
-
-Fields to return:
-- `id`
-- `title`
-- `release_date`
-
-#### `GET /movies/:id`
-Look a movie up by `id`
-
-URI parameters:
-- `id`: Movie identifier
-
-Fields to return:
-- `title`
-- `overview`
-- `release_date`
-- `inventory` (total)
-- `available_inventory` (not currently checked-out to a customer)
-  - This will be the same as `inventory` unless you've completed the optional endpoints.
-
-#### `POST /movies`
-Create a new movie in the video store inventory.
-
-Upon success, this request should return the `id` of the movie created.
-
-Request body:
-
-| Field         | Datatype            | Description
-|---------------|---------------------|------------
-| `title` | string             | Title of the movie
-| `overview` | string | Descriptive summary of the movie
-| `release_date` | string `YYYY-MM-DD` | Date the movie was released
-| `inventory` | integer | Quantity available in the video store
-
-### Wave 3: Rentals
-
-Wave 2 focused on working with customers and movies. With these endpoints you can extend the functionality of your API to allow managing the rental process.
-
-#### `POST /rentals/check-out`
-Check out one of the movie's inventory to the customer. The rental's check-out date should be set to today, and the due date should be set to a week from today.
-
-**Note:** Some of the fields from wave 2 should now have interesting values. Good thing you wrote tests for them, right... right?
-
-Request body:
-
-| Field         | Datatype            | Description
-|---------------|---------------------|------------
-| `customer_id` | integer             | ID of the customer checking out this film
-| `movie_id`    | integer | ID of the movie to be checked out
-
-#### `POST /rentals/check-in`
-Check in one of a customer's rentals
-
-Request body:
-
-| Field         | Datatype | Description
-|---------------|----------|------------
-| `customer_id` | integer  | ID of the customer checking in this film
-| `movie_id`    | integer | ID of the movie to be checked in
-
-## Optional Enhancements
-These really are **optional** - if you've gotten here and you have time left, that means you're moving speedy fast!
-
-### Query Parameters
-Any endpoint that returns a list should accept 3 _optional_ [query parameters](http://guides.rubyonrails.org/action_controller_overview.html#parameters):
-
-| Name   | Value   | Description
-|--------|---------|------------
-| `sort` | string  | Sort objects by this field, in ascending order
-| `n`    | integer | Number of responses to return per page
-| `p`    | integer | Page of responses to return
-
-So, for an API endpoint like `GET /customers`, the following requests should be valid:
-- `GET /customers`: All customers, sorted by ID
-- `GET /customers?sort=name`: All customers, sorted by name
-- `GET /customers?n=10&p=2`: Customers 10-19, sorted by ID
-- `GET /customers?sort=name&n=10&p=2`: Customers 10-19, sorted by name
-
-Of course, adding new features means you should be adding new controller tests to verify them.
-
-Things to note:
-- Sorting by ID is the rails default
-- Possible sort fields:
-  - Customers can be sorted by `name`, `registered_at` and `postal_code`
-  - Movies can be sorted by `title` and `release_date`
-  - Overdue rentals can be sorted by `title`, `name`, `checkout_date` and `due_date`
-- If the client requests both sorting and pagination, pagination should be relative to the sorted order
-- Check out the [will_paginate gem](https://github.com/mislav/will_paginate)
-
-### More Endpoints: Inventory Management
-All these endpoints should support all 3 query parameters. All fields are sortable.
-
-#### `GET /rentals/overdue`
-List all customers with overdue movies
-
-Fields to return:
-- `movie_id`
-- `title`
-- `customer_id`
-- `name`
-- `postal_code`
-- `checkout_date`
-- `due_date`
-
-#### `GET /movies/:id/current`
-List customers that have _currently_ checked out a copy of the film
-
-URI parameters:
-- `id`: Movie identifier
-
-Fields to return:
-- `customer_id`
-- `name`
-- `postal_code`
-- `checkout_date`
-- `due_date`
-
-#### `GET /movies/:id/history`
-List customers that have checked out a copy of the film _in the past_
-
-URI parameters:
-- `id`: Movie identifier
-
-Fields to return:
-- `customer_id`
-- `name`
-- `postal_code`
-- `checkout_date`
-- `due_date`
-
-#### `GET /customers/:id/current`
-List the movies a customer _currently_ has checked out
-
-URI parameters:
-- `id`: Customer ID
-
-Fields to return:
-- `title`
-- `checkout_date`
-- `due_date`
-
-#### `GET /customers/:id/history`
-List the movies a customer has checked out _in the past_
-
-URI parameters:
-- `id`: Customer ID
-
-Fields to return:
-- `title`
-- `checkout_date`
-- `due_date`
-
-
-## Reference
-- [Postman on Environments](https://www.getpostman.com/docs/environments)
-
-## What We're Looking For
-
-Check the [feedback template](./feedback.md) to see how we will evaluate your project.
+* ...
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..cc695e46f
--- /dev/null
+++ b/app/controllers/application_controller.rb
@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::API
+  # protect_from_forgery with: :null_session
+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..7617b9a96
--- /dev/null
+++ b/app/controllers/customers_controller.rb
@@ -0,0 +1,7 @@
+class CustomersController < ApplicationController
+
+  def index
+    customers = Customer.all
+    render(json: customers.as_json(except: [:created_at, :updated_at]))
+  end
+end
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
new file mode 100644
index 000000000..774cb12c8
--- /dev/null
+++ b/app/controllers/movies_controller.rb
@@ -0,0 +1,40 @@
+class MoviesController < ApplicationController
+
+  def index
+    movies = Movie.all
+    render json: movies.as_json(only: [:id, :title, :release_date])
+  end
+
+  def show
+    @movie = Movie.find_by(id: params[:id])
+
+    if @movie.nil?
+      render json: {
+        errors: {
+          id: ["No movie with ID #{params[:id]}"]
+        }
+      }, status: :not_found
+    else
+      render json: @movie.as_json(only: [:id, :title, :overview, :release_date, :inventory, :available_inventory])
+    end
+  end
+
+  def create
+    movie = Movie.new(movie_params)
+
+    if movie.save
+      # Success
+      render json: { id: movie.id }, status: :ok
+    else
+      # Failure
+      render json: { errors: movie.errors.messages }, status: :bad_request
+    end
+  end
+
+private
+
+  def movie_params
+    return params.permit(:id, :title, :overview, :release_date, :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..90d1aa34d
--- /dev/null
+++ b/app/controllers/rentals_controller.rb
@@ -0,0 +1,57 @@
+require 'date'
+
+class RentalsController < ApplicationController
+
+  def check_out
+    rental = Rental.new(rental_params)
+    #check movies availability - in a movie method?
+    rental.check_out = Date.today
+    rental.due_date = Date.today + 7
+    #set available_inventory to inventory in movie controller?
+
+    if rental.save
+      movie = Movie.find_by(id: rental.movie_id)
+      movie.dec_avail_inventory
+      movie.save
+
+      customer = Customer.find_by(id: rental.customer_id)
+      customer.inc_checked_out_count
+      customer.save
+
+      render json: { id: rental.id }, status: :ok
+    else
+      render json: { errors: rental.errors.messages }, status: :bad_request
+    end
+  end
+
+  def check_in
+    rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id])
+
+    if rental.nil?
+      render json: {
+        "errors": {
+          "id": ["No rental with #{params[:id]}"]
+        }
+      }, status: :not_found
+    else
+      movie = Movie.find_by(id: rental.movie_id)
+      movie.inc_avail_inventory
+      movie.save
+
+      customer = Customer.find_by(id: rental.customer_id)
+      customer.dec_checked_out_count
+      customer.save
+
+      rental.check_in = Date.today
+      rental.save
+
+      render(json: rental.as_json(only: [:customer_id, :movie_id]), status: :ok)
+    end
+  end
+
+  private
+
+  def rental_params
+    params.permit(:id, :check_in, :check_out, :due_date, :movie_id, :customer_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..d067716ee
--- /dev/null
+++ b/app/models/customer.rb
@@ -0,0 +1,23 @@
+class Customer < ApplicationRecord
+
+  has_and_belongs_to_many :movies
+  has_many :rentals
+
+  validates :name, presence: true
+  validates :movies_checked_out_count, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
+
+  after_initialize do |customer|
+      self.movies_checked_out_count ||= 0
+  end
+
+  def dec_checked_out_count
+
+    self.movies_checked_out_count -= 1
+  end
+
+  def inc_checked_out_count
+
+    self.movies_checked_out_count += 1
+  end
+
+end
diff --git a/app/models/movie.rb b/app/models/movie.rb
new file mode 100644
index 000000000..1b6779823
--- /dev/null
+++ b/app/models/movie.rb
@@ -0,0 +1,37 @@
+class Movie < ApplicationRecord
+  has_and_belongs_to_many :customers
+  has_many :rentals
+
+  validates :title, presence: true
+  validate :available_inventory_cannot_be_greater_than_inventory
+
+  validates :available_inventory, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
+
+  validates :inventory, numericality: { only_integer: true, greater_than: 0 }
+
+  after_initialize do |movie|
+    self.inventory ||= 0
+    self.available_inventory ||= self.inventory
+  end
+
+  def dec_avail_inventory
+    # this method decrements available_inventory for that movie by 1; we call this in movies_controller check_out method
+    self.available_inventory -= 1
+
+  end
+
+  def inc_avail_inventory
+    # this method increments available_inventory for that movie by 1; we call this in movies_controller check_in method
+    self.available_inventory += 1
+  end
+
+  private
+
+  # See: http://guides.rubyonrails.org/active_record_validations.html#custom-methods
+  def available_inventory_cannot_be_greater_than_inventory
+    if available_inventory > inventory
+      errors.add(:available_inventory, "Can't be greater than inventory value")
+    end
+  end
+
+end
diff --git a/app/models/rental.rb b/app/models/rental.rb
new file mode 100644
index 000000000..e001ff37c
--- /dev/null
+++ b/app/models/rental.rb
@@ -0,0 +1,4 @@
+class Rental < ApplicationRecord
+  belongs_to :customer
+  belongs_to :movie
+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..104e40c1c
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,35 @@
+#!/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..2fe7718ea
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,40 @@
+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
+  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.1
+
+    # 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..ad59bcd88
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
+  channel_prefix: VideoStoreAPI_production
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 000000000..720570700
--- /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..abc82221c
--- /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=#{2.days.seconds.to_i}"
+    }
+  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..3bd8115ea
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,83 @@
+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
+
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = 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..8e5cbde53
--- /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=#{1.hour.seconds.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
+  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..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..1e19380dc
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,56 @@
+# 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. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# If you are preloading your application and using Active Record, it's
+# recommended that you close any connections to the database before workers
+# are forked to prevent connection leakage.
+#
+# before_fork do
+#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
+# end
+
+# 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 the `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, as 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..35bfdb4f2
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,12 @@
+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 '/customers', to: 'customers#index', as: 'customers'
+
+  post '/rentals/check-out', to: 'rentals#check_out', as: 'check_out'
+
+  post '/rentals/check-in', to: 'rentals#check_in', as: 'check_in'
+
+end
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 000000000..67747dee6
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,32 @@
+# 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.
+
+# Shared secrets are available across all environments.
+
+# shared:
+#   api_key: a1B2c3D4e5F6
+
+# Environmental secrets are only available for that specific environment.
+
+development:
+  secret_key_base: 51515240bbc4859b5f6a9c44ac7a3d0765217872567fad289d20bc762e22e40ab79bc7cd410abe645bba9a9a82e79ebed17f978e3ee8a0d12c3bda42b0b59e71
+
+test:
+  secret_key_base: 427eb0301f226767815b8c5b7a7ae61c5e2f5b9ebc17d36effacbcbaaca7fad52016c40adfb7c7092de14a4c3f0f5b5342751078c45dd3d707e3ec12b1f86afc
+
+# Do not keep production secrets in the unencrypted secrets file.
+# Instead, either read values from the environment.
+# Or, use `bin/rails secrets:setup` to configure encrypted secrets
+# and move the `production:` environment over there.
+
+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/20180507223454_create_movies.rb b/db/migrate/20180507223454_create_movies.rb
new file mode 100644
index 000000000..089a884a3
--- /dev/null
+++ b/db/migrate/20180507223454_create_movies.rb
@@ -0,0 +1,13 @@
+class CreateMovies < ActiveRecord::Migration[5.1]
+  def change
+    create_table :movies do |t|
+      t.string :title
+      t.string :overview
+      t.date :release_date
+      t.integer :inventory
+      t.integer :available_inventory
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180507224416_create_customers.rb b/db/migrate/20180507224416_create_customers.rb
new file mode 100644
index 000000000..788fadd57
--- /dev/null
+++ b/db/migrate/20180507224416_create_customers.rb
@@ -0,0 +1,15 @@
+class CreateCustomers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :customers do |t|
+      t.string :name
+      t.string :address
+      t.string :city
+      t.string :state
+      t.string :postal_code
+      t.string :phone
+      t.integer :movies_checked_out_count
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180507225557_add_registered_at_column.rb b/db/migrate/20180507225557_add_registered_at_column.rb
new file mode 100644
index 000000000..6484d32bb
--- /dev/null
+++ b/db/migrate/20180507225557_add_registered_at_column.rb
@@ -0,0 +1,5 @@
+class AddRegisteredAtColumn < ActiveRecord::Migration[5.1]
+  def change
+    add_column :customers, :registered_at, :datetime
+  end
+end
diff --git a/db/migrate/20180507231810_create_customers_movies_join.rb b/db/migrate/20180507231810_create_customers_movies_join.rb
new file mode 100644
index 000000000..f145ce613
--- /dev/null
+++ b/db/migrate/20180507231810_create_customers_movies_join.rb
@@ -0,0 +1,8 @@
+class CreateCustomersMoviesJoin < ActiveRecord::Migration[5.1]
+  def change
+    create_table :customers_movies_joins do |t|
+       t.belongs_to :customer, index: true
+       t.belongs_to :movie, index: true
+    end
+  end
+end
diff --git a/db/migrate/20180508000000_rename_join_table.rb b/db/migrate/20180508000000_rename_join_table.rb
new file mode 100644
index 000000000..399f5efa5
--- /dev/null
+++ b/db/migrate/20180508000000_rename_join_table.rb
@@ -0,0 +1,5 @@
+class RenameJoinTable < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :customers_movies_joins, :customers_movies
+  end
+end
diff --git a/db/migrate/20180508221622_create_rentals.rb b/db/migrate/20180508221622_create_rentals.rb
new file mode 100644
index 000000000..2de04800d
--- /dev/null
+++ b/db/migrate/20180508221622_create_rentals.rb
@@ -0,0 +1,12 @@
+class CreateRentals < ActiveRecord::Migration[5.1]
+  def change
+    create_table :rentals do |t|
+      t.belongs_to :customer, index: true
+      t.belongs_to :movie, index: true
+      t.date :due_date
+      t.date :check_in
+      t.date :check_out
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..3078c703d
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,60 @@
+# 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: 20180508221622) 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.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.datetime "registered_at"
+    t.integer "movies_checked_out_count"
+  end
+
+  create_table "customers_movies", force: :cascade do |t|
+    t.bigint "customer_id"
+    t.bigint "movie_id"
+    t.index ["customer_id"], name: "index_customers_movies_on_customer_id"
+    t.index ["movie_id"], name: "index_customers_movies_on_movie_id"
+  end
+
+  create_table "movies", force: :cascade do |t|
+    t.string "title"
+    t.string "overview"
+    t.date "release_date"
+    t.integer "inventory"
+    t.integer "available_inventory"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "rentals", force: :cascade do |t|
+    t.bigint "customer_id"
+    t.bigint "movie_id"
+    t.date "due_date"
+    t.date "check_in"
+    t.date "check_out"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["customer_id"], name: "index_rentals_on_customer_id"
+    t.index ["movie_id"], name: "index_rentals_on_movie_id"
+  end
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 5322340ba..0e8274fca 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,3 +1,11 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
+#
+# Examples:
+#
+#   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
+#   Character.create(name: 'Luke', movie: movies.first)
+
 JSON.parse(File.read('db/seeds/customers.json')).each do |customer|
   Customer.create!(customer)
 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/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..901f6a54c
--- /dev/null
+++ b/test/controllers/customers_controller_test.rb
@@ -0,0 +1,44 @@
+require "test_helper"
+
+describe CustomersController do
+  describe 'index' do
+    it 'can list all customers' do
+      get customers_path
+      must_respond_with :success
+
+      response.header['Content-Type'].must_include 'json'
+
+      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
+      keys = %w(id name address city state postal_code phone registered_at movies_checked_out_count)
+      keys = keys.sort
+      get customers_path
+      body = JSON.parse(response.body)
+      body.each do |customer|
+        customer.keys.sort.must_equal keys
+      end
+    end
+  end
+
+  # describe 'show' do
+    # it 'can get one customer' do
+    #   keys = %w(id name address city state postal_code phone registered_at)
+    #
+    #   get customer_path
+    #   must_respond_with :success
+    #
+    #   response.header['Content-Type'].must_include 'json'
+    #
+    #   body = JSON.parse(response.body)
+    #   body.must_be_kind_of Hash
+    #   body.keys.sort.must_equal keys
+    #   body["id"].must_equal customer.id
+    # 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..84d24198b
--- /dev/null
+++ b/test/controllers/movies_controller_test.rb
@@ -0,0 +1,103 @@
+require "test_helper"
+
+describe MoviesController do
+  describe 'index' do
+    it 'can get list of movies' do
+      keys = %w(id title release_date)
+
+      get movies_path
+
+      must_respond_with :success
+      response.header['Content-Type'].must_include 'json'
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Array
+      body.length.must_equal Movie.count
+    end
+
+    it 'returns movies with exactly the required fields' do
+      keys = %w(id title release_date).sort
+      get movies_path
+      body = JSON.parse(response.body)
+      body.each do |movie|
+        movie.keys.sort.must_equal keys
+      end
+    end
+  end
+
+  describe 'show' do
+    it 'can get one movie' do
+      movie = movies(:beautiful)
+      keys = %w(id title release_date inventory overview available_inventory).sort
+
+      get movie_path(movie.id)
+      must_respond_with :success
+
+      response.header['Content-Type'].must_include 'json'
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.keys.sort.must_equal keys
+      body["id"].must_equal movie.id
+    end
+
+    it 'returns movie with exactly the required fields' do
+      movie = Movie.first
+      keys = %w(id title release_date inventory overview available_inventory).sort
+      get movie_path(movie)
+      body = JSON.parse(response.body)
+
+      body.keys.sort.must_equal keys
+    end
+
+    it "yields a not_found status if the movie DNE and returns an error" do
+      movie_id = Movie.last.id + 1
+      get movie_path(movie_id)
+
+      must_respond_with :not_found
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.must_include "errors"
+      body["errors"].must_include "id"
+    end
+  end
+
+  describe 'create' do
+    let(:movie_data) {
+      {
+        title: "Secret Life of Walter Mitty",
+        overview: "An employee at Life Mag that daydreams a lot",
+        release_date: 2013-12-25, inventory: 5
+      }
+    }
+    it "Creates a new movie" do
+      before_movie_count = Movie.count
+
+      post movies_path, params: movie_data 
+      assert_response :success
+
+      Movie.count.must_equal before_movie_count + 1
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.must_include "id"
+
+      # Check that the ID matches
+      Movie.find(body["id"]).title.must_equal movie_data[:title]
+    end
+
+    it "Returns an error for an invalid movie" do
+      bad_data = movie_data.clone()
+      bad_data.delete(:title)
+      assert_no_difference "Movie.count" do
+        post movies_path, params: { movie: bad_data }
+        assert_response :bad_request
+      end
+
+      body = JSON.parse(response.body)
+      body.must_be_kind_of Hash
+      body.must_include "errors"
+      body["errors"].must_include "title"
+    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..035642693
--- /dev/null
+++ b/test/controllers/rentals_controller_test.rb
@@ -0,0 +1,74 @@
+require "test_helper"
+require 'pry'
+
+describe RentalsController do
+
+  describe 'check_out' do
+    before do
+      @customer = Customer.first
+      @movie = Movie.first
+      @params = { customer_id: @customer.id, movie_id: @movie.id }
+    end
+
+    it 'can create a rental with valid info' do
+      before_rental_count = Rental.count
+      post check_out_path, params: @params
+      assert_response :success
+
+      puts @params
+      Rental.count.must_equal before_rental_count + 1
+
+      Rental.last.movie_id.must_equal @params[:movie_id]
+
+      Rental.last.customer_id.must_equal @params[:customer_id]
+      #check that it decreases available_inventory by 1
+      # check that it increases customer movie count by 1
+    end
+
+    it "won't create a rental when movie_id DNE" do
+      params = { customer_id: @customer.id, movie_id: nil }
+
+      post check_out_path, params: params
+      assert_response :bad_request
+    end
+
+    it "won't create a rental when customer_id DNE" do
+
+      params = { customer_id: nil, movie_id: @movie.id }
+      post check_out_path, params: params
+      assert_response :bad_request
+    end
+  end
+
+
+  describe 'check_in' do
+    before do
+      @customer = Customer.first
+      @movie = Movie.first
+      @params = { customer_id: @customer.id, movie_id: @movie.id }
+    end
+
+    it 'can find and update a valid rental' do
+      post check_out_path, params: @params
+
+      post check_in_path, params: @params
+
+      assert_response :success
+
+      rental = Rental.find_by(@params)
+      # binding.pry
+      rental.check_in.must_equal Date.today
+
+      # decreases customer movies by 1
+      # increases available_inventory by 1
+    end
+
+    it 'returns status not_found if rental DNE' do
+      bad_params = { customer_id: 21394, movie_id: 4208422 }
+      post check_in_path, params: bad_params
+
+      assert_response :not_found
+    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..7ce682869
--- /dev/null
+++ b/test/fixtures/customers.yml
@@ -0,0 +1,28 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+jane:
+  name: Jane Campion
+  address: 123 Main St
+  city: New York
+  state: NY
+  postal_code: 10463
+  phone: (212) 555-5555
+  movies_checked_out_count: 4
+
+ava:
+  name: Ava DuVernay
+  address: 456 Main Str
+  city: New York
+  state: NY
+  postal_code: 10462
+  phone: (212) 555-5556
+  movies_checked_out_count: 3
+
+no_name:
+  name: Name
+  address: 455 Main Dr
+  city: New York
+  state: NY
+  postal_code: 12462
+  phone: (212) 595-5556
+  movies_checked_out_count: 2
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..fd93ae539
--- /dev/null
+++ b/test/fixtures/movies.yml
@@ -0,0 +1,22 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+beautiful:
+  title: She's Beautiful When She's Angry
+  overview: A documentary film about the birth of the women's liberation movement in the 1960s.
+  release_date: 2014-12-05
+  inventory: 5
+  available_inventory: 5
+
+gijane:
+  title: G.I. Jane
+  overview: In response to political pressure from Senator Lillian DeHaven (Anne Bancroft), the U.S. Navy begins a program that would allow for the eventual integration of women into its services.
+  release_date: 1997-08-22
+  inventory: 3
+  available_inventory: 2
+
+purple:
+  title: The Color Purple
+  overview: An epic tale spanning forty years in the life of Celie (Whoopi Goldberg), an African-American woman living in the South who survives incredible abuse and bigotry.
+  release_date: 1985-12-18
+  inventory: 3
+  available_inventory:
diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml
new file mode 100644
index 000000000..e6e97552f
--- /dev/null
+++ b/test/fixtures/rentals.yml
@@ -0,0 +1,12 @@
+# 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
+one:
+  customer_id: 1
+  movie_id: 3
+
+two:
+  customer_id: 2
+  movie_id: 1
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..1f23bb7d1
--- /dev/null
+++ b/test/models/customer_test.rb
@@ -0,0 +1,65 @@
+require "test_helper"
+
+describe Customer do
+  let(:jane) {customers(:jane)}
+  let(:ava) {customers(:ava)}
+
+  describe 'relations' do
+    it 'checks that a customer already exists' do
+      customer = Customer.find_by(name: "ava")
+      customer.must_be_nil
+    end
+
+    it "connects customer and rental customer_id" do
+      movie = Movie.first
+      customer = Customer.first
+      rental = Rental.new(movie_id: movie.id, customer_id: customer.id)
+      rental.customer_id.must_equal customer.id
+    end
+  end
+
+  describe 'validations' do
+    it "can be created with valid info" do
+      customer = Customer.new(name: "test customer")
+
+      result = customer.valid?
+
+      result.must_equal true
+    end
+
+    it "must have a name to be valid" do
+      jane.name = nil
+      jane.valid?.must_equal false
+    end
+
+    it 'is invalid if movies_checked_out_count is less than zero' do
+      customer = customers(:no_name)
+
+      customer.dec_checked_out_count
+      customer.dec_checked_out_count
+      customer.dec_checked_out_count
+
+      customer.wont_be :valid?
+    end
+  end
+
+  describe 'checked_out_count methods' do
+    it 'decreases customer check out count by 1' do
+      customer = Customer.first
+      before_count = customer.movies_checked_out_count
+
+      customer.dec_checked_out_count
+
+      customer.movies_checked_out_count.must_equal before_count - 1
+    end
+
+    it 'increases available inventory of a movie by 1' do
+      customer = Customer.first
+      before_count = customer.movies_checked_out_count
+
+      customer.inc_checked_out_count
+
+      customer.movies_checked_out_count.must_equal before_count + 1
+    end
+  end
+end
diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb
new file mode 100644
index 000000000..937290bd6
--- /dev/null
+++ b/test/models/movie_test.rb
@@ -0,0 +1,111 @@
+require "test_helper"
+
+describe Movie do
+  describe 'relations' do
+    before do
+      # @customer = Customer.create!(name: "test customer")
+      @customer = Customer.first
+
+      @movie = Movie.new(title: "test movie")
+    end
+
+    it "connects customer and rental customer_id" do
+      movie = Movie.first
+      rental = Rental.new(movie_id: movie.id, customer_id: @customer.id)
+      rental.movie_id.must_equal movie.id
+    end
+
+    it 'has a list of customers' do
+      @movie.must_respond_to :customers
+      second_cust = Customer.create!(name: "fake name")
+      @movie.customers << second_cust
+
+      @movie.customers.each do |customer|
+        customer.must_be_kind_of Customer
+      end
+    end
+  end
+
+  describe 'validations' do
+
+    it "can be created with all valid fields" do
+      movie = Movie.new(title: "test movie", inventory: 4)
+
+      result = movie.valid?
+
+      result.must_equal true
+    end
+
+    it 'is invalid without a title' do
+      movie = Movie.new
+
+      result = movie.valid?
+
+      result.must_equal false
+    end
+
+    it 'is invalid if available inventory greater than inventory' do
+      movie= movies(:gijane)
+
+      # this will increment available_inventory value to 4
+      movie.inc_avail_inventory
+      movie.inc_avail_inventory
+
+      movie.wont_be :valid?
+    end
+
+    it 'is invalid if available_inventory is negative' do
+      movie= movies(:gijane)
+
+      movie.dec_avail_inventory
+      movie.dec_avail_inventory
+      movie.dec_avail_inventory
+
+      movie.wont_be :valid?
+    end
+  end
+
+  describe 'attributes' do
+    it 'available_inventory defaults to the inventory amount' do
+      movie = movies(:purple)
+
+      movie.available_inventory.must_equal 3
+    end
+  end
+
+  describe 'describe available inventory methods' do
+    # the next two tests uses the yml 'purple' which has available_inventory set to nil as a default
+    it 'decreases available inventory of a movie by 1' do
+      movie = movies(:purple)
+      before_count = movie.available_inventory
+
+      movie.dec_avail_inventory
+
+      after_count = movie.available_inventory
+
+      after_count.must_equal before_count - 1
+    end
+
+    it 'increases available inventory of a movie by 1' do
+      movie = movies(:purple)
+      before_count = movie.available_inventory
+
+      movie.inc_avail_inventory
+
+      after_count = movie.available_inventory
+
+      after_count.must_equal before_count + 1
+
+    end
+
+    it 'invalid if available_inventory is greater than inventory' do
+      movie = Movie.first
+      stock = movie.inventory
+
+      movie.available_inventory = stock + 2
+      result = movie.valid?
+
+      result.must_equal false
+    end
+  end
+end
diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb
new file mode 100644
index 000000000..d09b21f54
--- /dev/null
+++ b/test/models/rental_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+describe Rental do
+
+  it "must be valid" do
+    # rental = rentals(:one)
+    movie = Movie.first
+    customer = Customer.first
+    rental = Rental.new(movie_id: movie.id, customer_id: customer.id)
+
+    value(rental).must_be :valid?
+  end
+
+  it "will be invalid without customer_id" do
+    movie = Movie.first
+    rental = Rental.new(movie_id: movie.id)
+
+    result = rental.valid?
+
+    result.must_equal false
+  end
+
+  it "will be invalid without movie_id" do
+    customer = Customer.first
+    rental = Rental.new(customer_id: customer.id)
+
+    result = rental.valid?
+
+    result.must_equal false
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 000000000..597d04043
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,29 @@
+require 'simplecov'
+SimpleCov.start
+
+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
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 000000000..e69de29bb