diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9429109e3..9caf91bb2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,8 +17,12 @@ class ApplicationController < Sinatra::Base
   end
 
   post "/signup" do
-    #your code here
-
+    user = User.new(:username => params[:username], :password => params[:password])
+    if params[:username] != "" && user.save
+      redirect to "/login"
+    else 
+      redirect to "/failure"
+    end 
   end
 
   get '/account' do
@@ -32,7 +36,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 to "/account"
+    else 
+      redirect to "/failure"
+    end 
   end
 
   get "/failure" do
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a57cf079..2b616d26a 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/db/migrate/20200326185307_create_users.rb b/db/migrate/20200326185307_create_users.rb
new file mode 100644
index 000000000..1db0f99c8
--- /dev/null
+++ b/db/migrate/20200326185307_create_users.rb
@@ -0,0 +1,11 @@
+class CreateUsers < ActiveRecord::Migration[5.1]
+  def up
+    create_table :users do |t|
+      t.string :username
+      t.string :password_digest
+    end
+  end
+  def down
+    drop_table :users   
+  end 
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..1de387991
--- /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: 20200326185307) do
+
+  create_table "users", force: :cascade do |t|
+    t.string "username"
+    t.string "password_digest"
+  end
+
+end