diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9429109e3..47baa13e2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,7 +17,15 @@ class ApplicationController < Sinatra::Base
   end
 
   post "/signup" do
-    #your code here
+    if params[:username] == "" || params[:password] == ""
+      redirect "/failure"
+    else
+      # !usparams[:username] == "") && !(params[:password] == "")
+      # binding.pry
+      user = User.new(username: params[:username], password: params[:password])
+      user.save
+			redirect "/login"
+		end
 
   end
 
@@ -32,7 +40,13 @@ class ApplicationController < Sinatra::Base
   end
 
   post "/login" do
-    ##your code here
+    user = User.find_by(username: params[:username])
+    if user && user.authenticate(params[:password])
+      session[:user_id] = user.id
+      redirect "/account"
+    else
+      redirect "/failure"
+    end
   end
 
   get "/failure" do
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a57cf079..40f070579 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,2 +1,3 @@
 class User < ActiveRecord::Base
+  has_secure_password
 end
diff --git a/app/views/login.erb b/app/views/login.erb
index a43e6ec70..46b8f7b3f 100644
--- a/app/views/login.erb
+++ b/app/views/login.erb
@@ -1,3 +1,4 @@
+
 <h3>Login</h3>
 <form action="/login" method="POST">
   <input type="text" name="username" placeholder="Username:">
diff --git a/db/migrate/20200425012654_users.rb b/db/migrate/20200425012654_users.rb
new file mode 100644
index 000000000..096112310
--- /dev/null
+++ b/db/migrate/20200425012654_users.rb
@@ -0,0 +1,8 @@
+class Users < ActiveRecord::Migration[5.1]
+  def change
+    create_table :users do |t|
+      t.string :username
+      t.string :password_digest
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..70b51a9cd
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,20 @@
+# 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: 20200425012654) do
+
+  create_table "users", force: :cascade do |t|
+    t.string "username"
+    t.string "password_digest"
+  end
+
+end