diff --git a/.gitignore b/.gitignore
index 48fb168f..1a67917a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,8 @@
 !/log/.keep
 !/tmp/.keep
 
+# ignoring the env file
+.env
+
 # Ignore Byebug command history file.
 .byebug_history
diff --git a/Gemfile b/Gemfile
index 42f4bb2c..a81c670b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,11 @@ group :development do
   # 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'
+  gem 'dotenv-rails'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem "omniauth"
+gem "omniauth-github"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b407e7e..e1aa6665 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,11 +70,18 @@ GEM
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     debug_inspector (0.0.3)
+    dotenv (2.5.0)
+    dotenv-rails (2.5.0)
+      dotenv (= 2.5.0)
+      railties (>= 3.2, < 6.0)
     erubi (1.7.1)
     execjs (2.7.0)
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    hashie (3.5.7)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
@@ -84,6 +91,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jwt (2.1.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -113,9 +121,26 @@ GEM
       minitest (~> 5.0)
       rails (>= 4.1)
     multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
     pg (0.21.0)
     popper_js (1.14.3)
     pry (0.11.3)
@@ -207,6 +232,7 @@ DEPENDENCIES
   bootstrap (~> 4.1.3)
   byebug
   coffee-rails (~> 4.2)
+  dotenv-rails
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
@@ -214,6 +240,8 @@ DEPENDENCIES
   minitest-reporters
   minitest-skip
   minitest-spec-rails
+  omniauth
+  omniauth-github
   pg (~> 0.18)
   pry-rails
   puma (~> 3.0)
@@ -227,4 +255,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.16.5
+   1.16.6
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5bce99e6..ca67fedc 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,30 +1,67 @@
 class SessionsController < ApplicationController
-  def login_form
-  end
-
-  def login
-    username = params[:username]
-    if username and user = User.find_by(username: username)
-      session[:user_id] = user.id
+  def create
+    auth_hash = request.env['omniauth.auth']
+    user = User.find_by(uid: auth_hash[:uid], provider: 'github')
+    if user
+      # User was found in the database
       flash[:status] = :success
-      flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+      flash[:messages] = user.errors.messages
+      flash[:result_text] = "Logged in as returning user #{user.name}"
+
     else
-      user = User.new(username: username)
+      # User doesn't match anything in the DB
+      # TODO: Attempt to create a new user
+      user = User.new(username: auth_hash[:info][:nickname], uid: auth_hash[:uid], provider: 'github')
+
       if user.save
-        session[:user_id] = user.id
         flash[:status] = :success
-        flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+        flash[:messages] = user.errors.messages
+        flash[:result_text] = "Successfully created username #{user.username}"
       else
-        flash.now[:status] = :failure
-        flash.now[:result_text] = "Could not log in"
-        flash.now[:messages] = user.errors.messages
-        render "login_form", status: :bad_request
+        flash[:status] = :error
+        flash[:messages] = user.errors.messages
+        flash[:result_text] = "Could not create new user #{user.username}"
         return
       end
+
+      session[:user_id] = user.id
+      redirect_to root_path
     end
+  end
+
+  def destroy
+    session[:user_id] = nil
+    flash[:success] = "Successfully logged out!"
+
     redirect_to root_path
   end
 
+  def login_form
+  end
+  #
+  # def login
+  #   username = params[:username]
+  #   if username and user = User.find_by(username: username)
+  #     session[:user_id] = user.id
+  #     flash[:status] = :success
+  #     flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+  #   else
+  #     user = User.new(username: username)
+  #     if user.save
+  #       session[:user_id] = user.id
+  #       flash[:status] = :success
+  #       flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+  #     else
+  #       flash.now[:status] = :failure
+  #       flash.now[:result_text] = "Could not log in"
+  #       flash.now[:messages] = user.errors.messages
+  #       render "login_form", status: :bad_request
+  #       return
+  #     end
+  #   end
+  #   redirect_to root_path
+  # end
+
   def logout
     session[:user_id] = nil
     flash[:status] = :success
diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb
index 2020bee4..6084055c 100644
--- a/app/controllers/works_controller.rb
+++ b/app/controllers/works_controller.rb
@@ -50,7 +50,7 @@ def update
       flash.now[:status] = :failure
       flash.now[:result_text] = "Could not update #{@media_category.singularize}"
       flash.now[:messages] = @work.errors.messages
-      render :edit, status: :not_found
+      render :edit, status: :bad_request
     end
   end
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e7b07ce4..7bc635ca 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -33,19 +33,19 @@
         </li>
       </ul>
       <ul class="nav app-header__user-nav-container">
-        <% if @login_user %>
+        <% if session[:user_id] %>
 
         <li class="nav-item app-header__nav_item">
           <%= link_to "Logged in as #{@login_user.username}", user_path(@login_user), class: "btn btn-primary" %>
         </li>
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log Out", logout_path, method: :post, class: "btn btn-primary" %>
+          <%= link_to "Log Out", logout_path, method: "delete", class: "btn btn-primary" %>
         </li>
 
         <% else %>
 
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
+           <%= link_to "Login with Github", "/auth/github" %>
         </li>
         <% end %>
 
diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb
index 02c89da0..6f8d028f 100644
--- a/app/views/works/new.html.erb
+++ b/app/views/works/new.html.erb
@@ -1,2 +1,3 @@
 <h2>Add a new work</h2>
+
 <%= render partial: "form" %>
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 00000000..fd441612
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,3 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email"
+end
diff --git a/config/routes.rb b/config/routes.rb
index a7e8af1d..96ae456a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,11 +2,14 @@
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   root 'works#root'
   get '/login', to: 'sessions#login_form', as: 'login'
-  post '/login', to: 'sessions#login'
-  post '/logout', to: 'sessions#logout', as: 'logout'
+  # post '/login', to: 'sessions#login'
+  # post '/logout', to: 'sessions#logout', as: 'logout'
+  delete '/logout', to: 'sessions#destroy', as: 'logout'
 
   resources :works
   post '/works/:id/upvote', to: 'works#upvote', as: 'upvote'
 
   resources :users, only: [:index, :show]
+
+  get '/auth/:provider/callback', to: 'sessions#create'
 end
diff --git a/db/migrate/20181016185838_add_name_to_users.rb b/db/migrate/20181016185838_add_name_to_users.rb
new file mode 100644
index 00000000..af421932
--- /dev/null
+++ b/db/migrate/20181016185838_add_name_to_users.rb
@@ -0,0 +1,5 @@
+class AddNameToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :name, :string
+  end
+end
diff --git a/db/migrate/20181016190535_add_uid_to_users.rb b/db/migrate/20181016190535_add_uid_to_users.rb
new file mode 100644
index 00000000..a932d53e
--- /dev/null
+++ b/db/migrate/20181016190535_add_uid_to_users.rb
@@ -0,0 +1,7 @@
+class AddUidToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :email, :string
+    add_column :users, :uid, :integer, null: false
+    add_column :users, :provider, :string, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6bc8ba5c..555f767a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,35 +10,39 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170407164321) do
+ActiveRecord::Schema.define(version: 2018_10_16_190535) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "users", force: :cascade do |t|
-    t.string   "username"
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "username"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "name"
+    t.string "email"
+    t.integer "uid", null: false
+    t.string "provider", null: false
   end
 
-  create_table "votes", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "work_id"
+  create_table "votes", id: :serial, force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "work_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["user_id"], name: "index_votes_on_user_id", using: :btree
-    t.index ["work_id"], name: "index_votes_on_work_id", using: :btree
+    t.index ["user_id"], name: "index_votes_on_user_id"
+    t.index ["work_id"], name: "index_votes_on_work_id"
   end
 
-  create_table "works", force: :cascade do |t|
-    t.string   "title"
-    t.string   "creator"
-    t.string   "description"
-    t.string   "category"
-    t.datetime "created_at",                   null: false
-    t.datetime "updated_at",                   null: false
-    t.integer  "vote_count",       default: 0
-    t.integer  "publication_year"
+  create_table "works", id: :serial, force: :cascade do |t|
+    t.string "title"
+    t.string "creator"
+    t.string "description"
+    t.string "category"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "vote_count", default: 0
+    t.integer "publication_year"
   end
 
   add_foreign_key "votes", "users"
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index d2c5cfbb..0be27856 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,5 +1,39 @@
 require 'test_helper'
 
 describe UsersController do
+  describe "index" do
+    it "goes to index view" do
 
+      get users_path
+
+      assert_response :success
+    end
+
+    it "renders users" do
+      users = User.all
+
+      get users_path
+
+      expect( response.body ).must_include("dan")
+      expect( response.body ).must_include("kari")
+    end
+
+    it "response with success with no users" do
+      count = User.all.count
+      users = User.all
+      users.each do |user|
+        user.votes.destroy_all
+        user.destroy
+      end
+
+      get users_path
+
+      assert_response :success
+    end
+  end
+
+  describe "show" do
+
+
+  end
 end
diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb
index 0945ca47..b9e29dcc 100644
--- a/test/controllers/works_controller_test.rb
+++ b/test/controllers/works_controller_test.rb
@@ -1,56 +1,103 @@
 require 'test_helper'
+require 'pry'
 
 describe WorksController do
   describe "root" do
+
     it "succeeds with all media types" do
-      # Precondition: there is at least one media of each category
 
+      # get root_path
+
+      # Precondition: there is at least one media of each category
+      # must_respond_with :success
     end
 
     it "succeeds with one media type absent" do
       # Precondition: there is at least one media in two of the categories
-
+      # Work.where(category: "book").destroy_all
+      #
+      # get root_path
+      #
+      # must_respond_with :success
     end
 
     it "succeeds with no media" do
-
+      # works = Work.all
+      # works.each do |work|
+      #   work.destroy
+      # end
+      #
+      # get root_path
+      #
+      # expect{ get root_path }.must_change 'Work.count', 0
+      #
+      # must_respond_with :success
     end
   end
 
-  CATEGORIES = %w(albums books movies)
-  INVALID_CATEGORIES = ["nope", "42", "", "  ", "albumstrailingtext"]
+  # CATEGORIES = %w(albums books movies)
+  # INVALID_CATEGORIES = ["nope", "42", "", "  ", "albumstrailingtext"]
 
   describe "index" do
     it "succeeds when there are works" do
-
+      # work = Work.all
+      #
+      # get works_path
+      #
+      # must_respond_with :success
     end
 
     it "succeeds when there are no works" do
-
+      # works = Work.all
+      #
+      # works.each do |work|
+      #   work.destroy
+      # end
+      #
+      # get works_path
+      #
+      # expect {
+      #   get works_path
+      # }.must_change 'Work.count', 0
     end
   end
 
+
   describe "new" do
     it "succeeds" do
-
+      # get new_work_path
+      # must_respond_with :success
     end
   end
 
   describe "create" do
-    it "creates a work with valid data for a real category" do
+    # work_data = {
+    #   work: {
+    #     title: "new test work",
+    #     category: "movies"
+    #   }
+    # }
 
-    end
+    # Assumptions
 
-    it "renders bad_request and does not update the DB for bogus data" do
 
-    end
+    # Act
+    # expect {
+    #   post works_path, params: work_data
+    # }.must_change('Work.count', +1)
 
-    it "renders 400 bad_request for bogus categories" do
+    # Assert
+    # must_redirect_to book_path(Work.last)
+  end
 
-    end
+  it "renders bad_request and does not update the DB for bogus data" do
+  end
 
+  it "renders 400 bad_request for bogus categories" do
   end
 
+
+
   describe "show" do
     it "succeeds for an extant work ID" do
 
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index e2968d78..d50dc376 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -2,6 +2,12 @@
 
 dan:
   username: dan
+  uid: 12345
+  provider: github
+  email: ada@adadevelopersacademy.org
 
 kari:
   username: kari
+  uid: 13371337
+  provider: github
+  email: grace@hooper.net
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5b4fb667..ab88740e 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,7 @@
 require "minitest/rails"
 require "minitest/skip_dsl"
 require "minitest/reporters"  # for Colorized output
+require "pry"
 
 #  For colorful output!
 Minitest::Reporters.use!(