diff --git a/Gemfile b/Gemfile
index f4b5c425..9843d133 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,3 +5,4 @@ gem 'rspec', '~> 2.14.1'
 gem 'pry-byebug'
 gem 'sinatra', '~> 1.4.5'
 gem 'pg'
+gem 'sinatra-contrib'
diff --git a/Gemfile.lock b/Gemfile.lock
index 180a130e..ccfc3065 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    backports (3.6.4)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
@@ -10,6 +11,7 @@ GEM
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     method_source (0.8.2)
+    multi_json (1.10.1)
     pg (0.17.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -21,6 +23,8 @@ GEM
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -33,6 +37,13 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.2)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
     slop (3.6.0)
     tilt (1.4.1)
 
@@ -44,3 +55,4 @@ DEPENDENCIES
   pry-byebug
   rspec (~> 2.14.1)
   sinatra (~> 1.4.5)
+  sinatra-contrib
diff --git a/lib/library_plus.rb b/lib/library_plus.rb
index 9148018a..2527246f 100644
--- a/lib/library_plus.rb
+++ b/lib/library_plus.rb
@@ -2,7 +2,7 @@
 
 module Library
   def self.create_db_connection(dbname)
-    PG.connect(host: 'localhost', dbname: dbname)
+    PG.connect(host: 'localhost', dbname: dbname )
   end
 
   def self.clear_db(db)
@@ -14,11 +14,21 @@ def self.clear_db(db)
 
   def self.create_tables(db)
     db.exec <<-SQL
-      CREATE TABLE users(
+      CREATE TABLE IF NOT EXISTS users(
         id SERIAL PRIMARY KEY,
         name VARCHAR
       );
       /* TODO: Create rest of the tables (books, etc.) */
+      CREATE TABLE IF NOT EXISTS books(
+        title VARCHAR,
+        author VARCHAR,
+        id SERIAL PRIMARY KEY
+        );
+      CREATE TABLE IF NOT EXISTS checkout(
+        book_id INTEGER,
+        user_id INTEGER,
+        status VARCHAR
+        );
     SQL
   end
 
@@ -26,6 +36,7 @@ def self.drop_tables(db)
     db.exec <<-SQL
       DROP TABLE users;
       /* TODO: Drop rest of the tables (books, etc.) */
+      DROP TABLE books;
     SQL
   end
 end
diff --git a/lib/library_plus/book_repo.rb b/lib/library_plus/book_repo.rb
index 46409041..2d728b79 100644
--- a/lib/library_plus/book_repo.rb
+++ b/lib/library_plus/book_repo.rb
@@ -1 +1,26 @@
 # TODO
+module Library
+  class BookRepo
+
+    def self.all(db)
+      db.exec("select * from books").to_a
+    end
+
+    def self.save(db, title, author)
+      db.exec("INSERT into books (title, author) values ($1, $2)", [title, author])
+    end
+
+    def self.check_out(db, book_id, user_id)
+      db.exec("INSERT into checkout (book_id, user_id, status) values ($1, $2, $3)", [book_id, user_id, 'checked out'])
+    end
+
+    def self.check_in(book_id)
+      db.exec("DELETE FROM checkout WHERE id = #{book_id}")
+    end
+
+    def self.all_check_out(db)
+      db.exec("SELECT * FROM checkout")
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/lib/library_plus/user_repo.rb b/lib/library_plus/user_repo.rb
index f293fe6a..9023092e 100644
--- a/lib/library_plus/user_repo.rb
+++ b/lib/library_plus/user_repo.rb
@@ -9,18 +9,26 @@ def self.all(db)
 
     def self.find(db, user_id)
       # TODO: Insert SQL statement
+      db.exec("SELECT * from users WHERE id = #{user_id}")[0]
     end
 
+    #Library::UserRepo.save(db, { 'name' => "alice"})
+    #Library::UserRepo.save(db, {'id' => 1, 'name => "Alice"})
+
     def self.save(db, user_data)
       if user_data['id']
         # TODO: Update SQL statement
+        db.exec("UPDATE users SET name = $1 WHERE id = $2 returning *", [user_data['name'], user_data['id']])[0]
       else
         # TODO: Insert SQL statement
+        db.exec("INSERT into users (name) values ($1) returning *", [user_data['name']])[0]
+        # result = db.exec("INSERT into users (name) values ($1) returning *", [user_data['name']])
       end
     end
 
     def self.destroy(db, user_id)
       # TODO: Delete SQL statement
+      # db.exec("DELETE FROM users WHERE id = #{user_id}")
     end
 
   end
diff --git a/server.rb b/server.rb
index 91a87bcd..1314027c 100644
--- a/server.rb
+++ b/server.rb
@@ -1,8 +1,84 @@
 require 'sinatra'
 require './lib/library_plus'
+require 'bundler/setup'
+require 'sinatra/reloader'
+require './lib/library_plus/user_repo'
+require './lib/library_plus/book_repo'
 
-# set :bind, '0.0.0.0' # This is needed for Vagrant
+set :bind, '0.0.0.0' # This is needed for Vagrant
 
 get '/' do
   erb :index
 end
+
+get '/users' do
+  db = Library.create_db_connection('library_dev')
+  @users = Library::UserRepo.all(db)
+  erb :"users/index"
+end
+
+post '/users' do
+  @new_user = {'name' => params[:user_name]}
+  db = Library.create_db_connection('library_dev')
+  Library::UserRepo.save(db, @new_user)
+  redirect to ('/users')
+end
+
+get '/books' do
+  db = Library.create_db_connection('library_dev')
+  @books = Library::BookRepo.all(db)
+  erb :"books/index"
+end
+
+post '/books' do
+  db = Library.create_db_connection('library_dev')
+  @title = params[:title]
+  @author = params[:author]
+  Library::BookRepo.save(db, @title, @author)
+  redirect to ('/books')
+end
+
+get '/books/:id' do
+  # @id = params[:id]
+  db = Library.create_db_connection('library_dev')
+  @books = Library::BookRepo.all(db)
+  @books.each do |book|
+    if book['id'] == params[:id]
+      @showbook = book
+    end
+  end
+  z = false
+  @checkedbook = Library::BookRepo.all_check_out(db)
+  @checkedbook.each do |book|
+    if @showbook['id'] == book['book_id']
+      @status = 'checked out'
+      z = true
+    end
+  end
+  if z == false
+    @status = 'available'
+  end
+  @users = Library::UserRepo.all(db)
+  erb :"books/show"
+end
+
+post '/books/:id/checkout' do
+  y = params[:id]
+  @x = params[:userid]
+  # z = false
+  # @error = ""
+  db = Library.create_db_connection('library_dev')
+  # @checkedbooks = Library::BookRepo.all_check_out(db)
+  # @checkedbooks.each do |book|
+  #   if params[:id] == book['id']
+  #     @error = "That book is already checked out."
+  #   else
+  #     z = true
+  #   end
+  # end
+  # if z == false
+    Library::BookRepo.check_out(db, y, @x)
+  # end
+  redirect to ('/books')
+end
+
diff --git a/spec/repos/user_repo_spec.rb b/spec/repos/user_repo_spec.rb
index dc810e5d..9c447d2b 100644
--- a/spec/repos/user_repo_spec.rb
+++ b/spec/repos/user_repo_spec.rb
@@ -24,6 +24,7 @@ def user_count(db)
     expect(names).to include "Alice", "Bob"
   end
 
+describe "self.save" do
   it "creates users" do
     expect(user_count(db)).to eq 0
 
@@ -37,14 +38,18 @@ def user_count(db)
     user = db.exec("SELECT * FROM users")[0]
     expect(user['name']).to eq "Alice"
   end
+end
 
-  xit "finds users" do
+describe "self.find" do
+  it "finds users" do
     user = Library::UserRepo.save(db, { 'name' => "Alice" })
     retrieved_user = Library::UserRepo.find(db, user['id'])
     expect(retrieved_user['name']).to eq "Alice"
   end
+end
 
-  xit "updates users" do
+describe "self.save" do
+  it "updates users" do
     user1 = Library::UserRepo.save(db, { 'name' => "Alice" })
     user2 = Library::UserRepo.save(db, { 'id' => user1['id'], 'name' => "Alicia" })
     expect(user2['id']).to eq(user1['id'])
@@ -54,7 +59,9 @@ def user_count(db)
     user3 = Library::UserRepo.find(db, user1['id'])
     expect(user3['name']).to eq "Alicia"
   end
+end
 
+describe "self.destroy" do
   xit "destroys users" do
     user = Library::UserRepo.save(db, { 'name' => "Alice" })
     expect(user_count(db)).to eq 1
@@ -63,3 +70,74 @@ def user_count(db)
     expect(user_count(db)).to eq 0
   end
 end
+end
+
+
+
+# require 'spec_helper'
+
+# describe Library::UserRepo do
+
+#   def user_count(db)
+#     db.exec("SELECT COUNT(*) FROM users")[0]["count"].to_i
+#   end
+
+#   let(:db) { Library.create_db_connection('library_test') } #instance variable inside each it block
+
+#   before(:each) do
+#     Library.clear_db(db) #clears each database before each it block.
+#   end
+
+
+#   it "gets all users" do
+#     db.exec("INSERT INTO users (name) VALUES ($1)", ["Alice"])
+#     db.exec("INSERT INTO users (name) VALUES ($1)", ["Bob"])
+
+#     users = Library::UserRepo.all(db)
+#     expect(users).to be_a Array
+#     expect(users.count).to eq 2
+
+#     names = users.map {|u| u['name'] }
+#     expect(names).to include "Alice", "Bob"
+#   end
+
+
+#   it "creates users" do
+#     expect(user_count(db)).to eq 0
+
+#     user = Library::UserRepo.save(db, :name => "Alice")
+#     expect(user['id']).to_not be_nil
+#     expect(user['name']).to eq "Alice"
+
+#     # Check for persistence
+#     expect(user_count(db)).to eq 1
+
+#     user = db.exec("SELECT * FROM users")[0]
+#     expect(user['name']).to eq "Alice"
+#   end
+
+#   xit "finds users" do
+#     user = Library::UserRepo.save(db, :name => "Alice")
+#     retrieved_user = Library::UserRepo.find(db, user['id'])
+#     expect(retrieved_user['name']).to eq "Alice"
+#   end
+
+#   xit "updates users" do
+#     user1 = Library::UserRepo.save(db, :name => "Alice")
+#     user2 = Library::UserRepo.save(db, :name => "Alicia")
+#     expect(user2['id']).to eq(user1['id'])
+#     expect(user2['name']).to eq "Alicia"
+
+#     # Check for persistence
+#     user3 = Library::UserRepo.find(db, user1['id'])
+#     expect(user3['name']).to eq "Alicia"
+#   end
+
+#   xit "destroys users" do
+#     user = Library::UserRepo.save(db, :name => "Alice")
+#     expect(user_count(db)).to eq 1
+
+#     Library::UserRepo.destroy(db, user['id'])
+#     expect(user_count(db)).to eq 0
+#   end
+# end
diff --git a/views/books/index.erb b/views/books/index.erb
new file mode 100644
index 00000000..52e06632
--- /dev/null
+++ b/views/books/index.erb
@@ -0,0 +1,31 @@
+<style>
+div {
+	border: 2px solid red;
+	border-radius: 10px;
+	width: 300px;
+}
+</style>
+
+<center>
+	<h1>Books</h1>
+	<% @books.each do |book| %>
+	<h2><a href='/books/<%= book['id'] %>'><%= book['title'] %></a></h2>
+
+	<% end %>
+
+	<div>
+	<form method="post" action="/books">
+		<h3>Regiser New Book</h3>
+		<label>Title:</label>
+		<input type="text" name="title"/>
+		<br>
+		<label>Author:</label>
+		<input type='text' name='author'/>
+
+		<button>Register</button>
+	</form>
+	</div>
+	<br>
+	<a href='/'>HOME</a>
+
+</center>
\ No newline at end of file
diff --git a/views/books/show.erb b/views/books/show.erb
new file mode 100644
index 00000000..4596414b
--- /dev/null
+++ b/views/books/show.erb
@@ -0,0 +1,26 @@
+<center>
+	<h1><%= @showbook['title'] %></h1>
+	<br>
+	BY
+	<br>
+	<h2><%= @showbook['author'] %><h2>
+	<br>
+	<h3>Book ID: <%= @showbook['id'] %></h3><br>
+	<%= @status %><br>
+
+	<form method='post' action='/books/<%= @showbook['id'] %>/checkout'>
+		<label>Checkout this book to:</label>
+		<select name='userid'>
+		<% if @status == 'available' %>
+			<% @users.each do |user| %>
+			<option value='<%= user['id'] %>'><%= user['name'] %></option>
+			<% end %>
+		<% else %>
+			<option>Not Available</option>
+		<% end %>
+		</select>
+		<button type="submit" name="checkout">Checkout</button>
+
+	</form><br>
+	<a href='/'>HOME</a>
+</center>
\ No newline at end of file
diff --git a/views/error.erb b/views/error.erb
new file mode 100644
index 00000000..b36760d9
--- /dev/null
+++ b/views/error.erb
@@ -0,0 +1 @@
+<h1>This book is not available for checkout!</h1>
\ No newline at end of file
diff --git a/views/index.erb b/views/index.erb
index aba3235d..a188e520 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -1,3 +1,11 @@
-<h1>The Library Plus System</h1>
+<center>
 
-<p>Welcome to your freedom!</p>
+	<h1>The Library Plus System</h1>
+
+	<p>Welcome to your freedom!</p>
+
+	<a href='/users'>Manage Users</a>
+	<br>
+	<br>
+	<a href='/books'>Manage Books</a>
+</center>
\ No newline at end of file
diff --git a/views/users/index.erb b/views/users/index.erb
new file mode 100644
index 00000000..e1f69ddb
--- /dev/null
+++ b/views/users/index.erb
@@ -0,0 +1,18 @@
+<center>
+
+	<h1>All Users</h1>
+	<% @users.each do |user| %>
+	<%= user['name'] %><br>
+	<% end %>
+
+	<form method="post" action="/users">
+		<h3>Regiser New User</h3>
+		<label>Name:</label>
+		<input type="text" name="user_name"/>
+
+		<button>Register</button>
+	</form>
+	<br>
+	<a href='/'>HOME</a>
+
+</center>
\ No newline at end of file