diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000000..967524dd43
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,240 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
+      globalid (>= 0.3.6)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    arel (9.0.0)
+    autoprefixer-rails (10.2.5.1)
+      execjs (> 0)
+    bcrypt (3.1.16)
+    bindex (0.8.1)
+    bootsnap (1.7.5)
+      msgpack (~> 1.0)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    builder (3.2.4)
+    byebug (11.1.3)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    childprocess (3.0.0)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    execjs (2.8.1)
+    ffi (1.15.1)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    jbuilder (2.11.2)
+      activesupport (>= 5.0.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.10.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    msgpack (1.4.2)
+    nio4r (2.5.7)
+    nokogiri (1.11.7-x86_64-darwin)
+      racc (~> 1.4)
+    public_suffix (4.0.6)
+    puma (3.12.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rack_session_access (0.2.0)
+      builder (>= 2.0.0)
+      rack (>= 1.0.0)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
+      bundler (>= 1.3.0)
+      railties (= 5.2.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.3)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
+    ruby_dep (1.5.0)
+    rubyzip (2.3.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    spring (2.1.1)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    turbolinks (5.2.1)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
+    websocket-driver (0.7.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  x86_64-darwin-19
+
+DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  bootsnap
+  bootstrap-sass (= 3.3.7)
+  byebug
+  capybara (~> 2.13)
+  coffee-rails (~> 4.2)
+  database_cleaner
+  jbuilder (~> 2.5)
+  listen (>= 3.0.5, < 3.2)
+  puma (~> 3.7)
+  rack_session_access
+  rails (~> 5.1)
+  rspec-rails
+  sass-rails (~> 5.0)
+  selenium-webdriver
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  sqlite3 (~> 1.3.6)
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+BUNDLED WITH
+   2.2.7
diff --git a/[ b/[
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1c07694e9d..52398c3856 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,28 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
+  protect_from_forgery with: :exception
+ 
+
+  def home
+  end
+
+
+  def current_user
+    User.find_by(id: session[:user_id])
+  end
+
+
+  def admin
+    current_user.admin
+  end
+
+  def user_is_authenticated
+    !!current_user
+  end
+
+  def verified_user
+    redirect_to '/' unless user_is_authenticated
+  end
+
+
 end
diff --git a/app/controllers/attractions_controller.rb b/app/controllers/attractions_controller.rb
new file mode 100644
index 0000000000..62c293f941
--- /dev/null
+++ b/app/controllers/attractions_controller.rb
@@ -0,0 +1,45 @@
+class AttractionsController < ApplicationController
+
+    def index
+        @attractions = Attraction.all
+    end
+
+    def show
+        @attraction = Attraction.find(params[:id])
+
+        @ride = Ride.new
+        @user = current_user
+    
+    end
+
+    def new
+        @attraction = Attraction.new
+    end
+
+    def create
+        attraction = Attraction.create(attraction_params)
+        redirect_to attraction_path(attraction)
+    end
+    
+    def edit
+        @attraction = Attraction.find_by(id: params[:id])
+        @ride = Ride.create(user_id: current_user.id, attraction_id: @attraction.id)
+    end
+    
+    def update
+        attraction = Attraction.find_by(id: params[:id])
+        attraction.update(attraction_params)
+        redirect_to attraction_path(attraction)
+     end
+    
+    private
+    def attraction_params
+        params.require(:attraction).permit(
+            :name,
+            :min_height,
+            :tickets,
+            :happiness_rating,
+            :nausea_ratiing
+          )
+    end
+end
diff --git a/app/controllers/rides_controller.rb b/app/controllers/rides_controller.rb
new file mode 100644
index 0000000000..18cd7d46d1
--- /dev/null
+++ b/app/controllers/rides_controller.rb
@@ -0,0 +1,28 @@
+class RidesController < ApplicationController
+
+    def create
+        ride = Ride.new(ride_params)
+        if ride.take_ride == true
+            ride.save
+            notice = "Thanks for riding the #{ride.attraction.name}!"
+            redirect_to user_path(ride.user), notice: notice
+        else
+    
+            notice = ride.take_ride
+            redirect_to user_path(ride.user), notice: notice
+           # raise params.inspect 
+        end
+
+  
+    end
+    
+      private
+    
+    def ride_params
+        params.require(:ride).permit(
+        :user_id,
+        :attraction_id
+        )
+    end
+ 
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000000..2681f9d828
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,70 @@
+class UsersController < ApplicationController
+   # skip_before_action :verified_user, only: [:new, :create]
+  
+    def new
+        @user = User.new
+    end
+  
+    def create
+        if (user = User.create(user_params))
+            session[:user_id] = user.id
+            redirect_to user_path(user)
+        else
+            render 'new'
+        end
+    end
+
+    def update
+        @user = User.find_by(id: params[:id])
+\
+    end 
+
+  
+
+
+    def signin
+        @users = User.all
+    end
+    
+    def newsignin
+        #raise params.inspect
+        @user = User.find_by(name: params[:user][:name])
+        if @user == nil
+            redirect_to '/signin'
+        else
+            session[:user_id] = @user.id
+            redirect_to user_path(@user)
+        end
+    end
+
+
+    def signout
+        session.delete("user_id")
+        redirect_to root_path
+    end
+  
+    def show
+        @user = User.find_by(id: params[:id])
+        if current_user != @user
+            redirect_to '/'
+        end
+
+    end
+  
+    private
+  
+    def user_params
+      params.require(:user).permit(
+        :name,
+        :height,
+        :nausea,
+        :tickets,
+        :admin,
+        :password,
+        :happiness
+      )
+    end
+
+
+    
+end
\ No newline at end of file
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be7945c..58763af6cb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,5 @@
 module ApplicationHelper
+    def current_user
+        User.find_by(id: session[:user_id])
+      end
 end
diff --git a/app/models/attraction.rb b/app/models/attraction.rb
index 474bd1e76c..0e7dd82af3 100644
--- a/app/models/attraction.rb
+++ b/app/models/attraction.rb
@@ -1,2 +1,4 @@
 class Attraction < ApplicationRecord
+    has_many :rides
+    has_many :users, through: :rides
 end
diff --git a/app/models/ride.rb b/app/models/ride.rb
index 4d880172e1..e0fe5b5cd3 100644
--- a/app/models/ride.rb
+++ b/app/models/ride.rb
@@ -1,2 +1,30 @@
 class Ride < ActiveRecord::Base
+    belongs_to :user
+    belongs_to :attraction
+
+
+    def take_ride
+   
+        ride_hash = {}
+       
+        @user = self.user
+        @attraction = self.attraction
+        if @user.tickets < @attraction.tickets && @user.height < @attraction.min_height
+            "Sorry. You do not have enough tickets to ride the #{attraction.name}. You are not tall enough to ride the #{attraction.name}."
+        elsif @user.tickets < @attraction.tickets
+              "Sorry. You do not have enough tickets to ride the #{attraction.name}."
+        elsif @user.height < @attraction.min_height
+              "Sorry. You are not tall enough to ride the #{attraction.name}."
+        else #user takes ride
+             @user.update(tickets: @user.tickets -= @attraction.tickets)
+             @user.update(nausea: @user.nausea += @attraction.nausea_rating)
+             @user.update(happiness: @user.happiness += @attraction.happiness_rating)
+              
+              return true
+            
+        end
+    end
+   
+        
+    
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a57cf079b..61d101fa8d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,2 +1,15 @@
 class User < ActiveRecord::Base
+
+    has_many :rides
+    has_many :attractions, through: :rides
+    has_secure_password
+    
+    
+    def mood
+        nausea = self.nausea
+        happiness = self.happiness
+        if nausea != nil && happiness != nil
+          happiness > nausea ? "happy" : "sad"
+        end
+    end
 end
diff --git a/app/views/application/home.html.erb b/app/views/application/home.html.erb
new file mode 100644
index 0000000000..447b8ca892
--- /dev/null
+++ b/app/views/application/home.html.erb
@@ -0,0 +1,4 @@
+  <% flash.each do |type, msg| %>
+    <%= msg %>
+
+  <% end %>
\ No newline at end of file
diff --git a/app/views/attractions/edit.html.erb b/app/views/attractions/edit.html.erb
new file mode 100644
index 0000000000..14aecee95f
--- /dev/null
+++ b/app/views/attractions/edit.html.erb
@@ -0,0 +1,10 @@
+
+<%= form_for @attraction do |f| %>
+Name: <%= f.text_field :name %><br />
+Minimum Height: <%= f.number_field :min_height %><br />
+Happiness Rating: <%= f.number_field :happiness_rating %><br />
+Nausea Rating: <%= f.number_field :nausea_rating %><br />
+Tickets: <%= f.number_field :tickets %><br />
+<br />
+<%= f.submit %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/attractions/index.html.erb b/app/views/attractions/index.html.erb
new file mode 100644
index 0000000000..00238a7615
--- /dev/null
+++ b/app/views/attractions/index.html.erb
@@ -0,0 +1,38 @@
+<h1>Listing attractions</h1>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr>
+      <td><strong>Name</strong></td>
+      <td><strong>Tickets</strong></td>
+      <td><strong>Details</strong></td>
+    </tr>
+    <% @attractions.each do |attraction| %>
+      <tr>
+
+        <td><%= attraction.name %></td>
+        <td><%= attraction.tickets %></td>
+        <% if current_user.admin %>
+          <td><%= link_to "Show #{attraction.name}", attraction_path(attraction) %></td>
+        <% else %>
+          <td><%= link_to "Go on #{attraction.name}", attraction_path(attraction) %></td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<br>
+
+<% if @user %>
+  <p>
+    <%= link_to "Back to profile", user_path(@user)  %>
+  </p>
+<% else %>
+  <p><%= link_to 'New Attraction', new_attraction_path %></p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/attractions/new.html.erb b/app/views/attractions/new.html.erb
new file mode 100644
index 0000000000..14aecee95f
--- /dev/null
+++ b/app/views/attractions/new.html.erb
@@ -0,0 +1,10 @@
+
+<%= form_for @attraction do |f| %>
+Name: <%= f.text_field :name %><br />
+Minimum Height: <%= f.number_field :min_height %><br />
+Happiness Rating: <%= f.number_field :happiness_rating %><br />
+Nausea Rating: <%= f.number_field :nausea_rating %><br />
+Tickets: <%= f.number_field :tickets %><br />
+<br />
+<%= f.submit %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/attractions/show.html.erb b/app/views/attractions/show.html.erb
new file mode 100644
index 0000000000..0ffbce0eed
--- /dev/null
+++ b/app/views/attractions/show.html.erb
@@ -0,0 +1,14 @@
+<h1><%= @attraction.name %></h2>
+<br>
+    <% if @user.admin %>
+      <%= link_to 'Edit Attraction', [:edit, @attraction] %></p>
+    <% else %>
+        <%= form_for @ride, url: ride_path do |f| %>
+            <%= f.hidden_field :user_id, value: @user.id %><br />
+            <%= f.hidden_field :attraction_id, value: @attraction.id %><br />
+            <%= f.submit "Go on this ride"%>
+        <% end %>
+    <%end%>
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d5e06ee11b..f83db758fc 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,6 +18,10 @@
             <span class="icon-bar"></span>
           </button>
         <a class="navbar-brand" href="<%= root_url %>"/>Home</a>
+        <a class="navbar-brand" href="<%= signin_url %>"/>Sign In</a>
+        <a class="navbar-brand" href="<%= signup_url %>"/>Sign Up</a>
+         
+
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -27,9 +31,17 @@
       </div>
     </div>
 
+
     <!-- content -->
     <div class="container"  role="main">
       <%= yield %>
+  
+    
+ 
     </div>
   </body>
+  <%= link_to("See attractions", attractions_path) %>
+  <%if current_user%>
+    <%= link_to("Log Out", signout_path) %>
+    <%end%>
 </html>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
new file mode 100644
index 0000000000..82fe013619
--- /dev/null
+++ b/app/views/users/new.html.erb
@@ -0,0 +1,12 @@
+
+<%= form_for @user do |f| %>
+  Name: <%= f.text_field :name %><br />
+  Nausea: <%= f.number_field :nausea %><br />
+  Happiness: <%= f.number_field :happiness %><br />
+  Tickets: <%= f.number_field :tickets %><br />
+  Height: <%= f.number_field :height %><br />
+  Password: <%= f.password_field :password %><br />
+  Admin? <%= f.check_box :admin %><br />
+  <br />
+  <%= f.submit 'Create User' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000000..950ae34952
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,20 @@
+  Name: <%=  @user.name %><br />
+  Nausea: <%= @user.nausea %><br />
+  Happiness: <%= @user.happiness %><br />
+  Mood: <%= @user.mood %><br />
+  Tickets: <%= @user.tickets %><br />
+  Height: <%= @user.height %><br />
+  Password: <%= @user.password %><br />
+  Admin:
+    <% if @user.admin == true %> 
+      <%= "ADMIN" %>
+      
+    <%end%>
+
+ 
+  <br/>
+ 
+  <% flash.each do |type, msg| %>
+    <%= msg %>
+
+  <% end %>
\ No newline at end of file
diff --git a/app/views/users/signin.html.erb b/app/views/users/signin.html.erb
new file mode 100644
index 0000000000..c123c803b2
--- /dev/null
+++ b/app/views/users/signin.html.erb
@@ -0,0 +1,16 @@
+<%= form_tag('/signin', method: :post) do %>
+  <div class="form-group">
+    <%= label_tag(:name, "Your name:") %>
+    <%= collection_select(:user, :name, User.all, :name, :name, prompt: "Please select your username from this dropdown") %>
+  </div>
+
+  <div class="form-group">
+    <%= label_tag(:password, "Your password:") %>
+    <%= password_field_tag(:password, nil, class: "form-control") %>
+  </div>
+
+  <div class="actions">
+    <%= submit_tag("Sign In") %>
+  </div>
+
+<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 787824f888..856758e1ca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,18 @@
 Rails.application.routes.draw do
+  resources :attractions
+  resources :users
+  
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+
+
+  get '/', to: 'application#home', as: 'root'
+
+
+  get '/signup', to: 'users#new'
+  post '/signup', to: 'users#create'
+  get '/signin', to: 'users#signin'
+  post '/signin', to: 'users#newsignin'
+  get '/signout', to: 'users#signout'
+  post '/ride', to:"rides#create", as: 'ride'
 end
diff --git a/db/migrate/20210609144340_create_users.rb b/db/migrate/20210609144340_create_users.rb
new file mode 100644
index 0000000000..b154bdb600
--- /dev/null
+++ b/db/migrate/20210609144340_create_users.rb
@@ -0,0 +1,14 @@
+class CreateUsers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.string :password_digest
+      t.integer :nausea
+      t.integer :happiness
+      t.integer :tickets
+      t.integer :height
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20210610035443_add_admin_to_users.rb b/db/migrate/20210610035443_add_admin_to_users.rb
new file mode 100644
index 0000000000..aa6a7e9341
--- /dev/null
+++ b/db/migrate/20210610035443_add_admin_to_users.rb
@@ -0,0 +1,5 @@
+class AddAdminToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :admin, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20210610042245_create_attractions.rb b/db/migrate/20210610042245_create_attractions.rb
new file mode 100644
index 0000000000..f53b968b3c
--- /dev/null
+++ b/db/migrate/20210610042245_create_attractions.rb
@@ -0,0 +1,15 @@
+class CreateAttractions < ActiveRecord::Migration[5.2]
+  def change
+    create_table :attractions do |t|
+      t.string :name
+      t.integer :tickets
+      t.integer :nausea_rating 
+      t.integer :happiness_rating
+      t.integer :mood_rating
+      t.integer :min_height
+
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20210610045431_create_rides.rb b/db/migrate/20210610045431_create_rides.rb
new file mode 100644
index 0000000000..0e88a3d335
--- /dev/null
+++ b/db/migrate/20210610045431_create_rides.rb
@@ -0,0 +1,6 @@
+class CreateRides < ActiveRecord::Migration[5.2]
+  create_table :rides do |t|
+    t.integer :user_id
+    t.integer :attraction_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000000..4091836e96
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,43 @@
+# 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: 2021_06_10_045431) do
+
+  create_table "attractions", force: :cascade do |t|
+    t.string "name"
+    t.integer "tickets"
+    t.integer "nausea_rating"
+    t.integer "happiness_rating"
+    t.integer "mood_rating"
+    t.integer "min_height"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "rides", force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "attraction_id"
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string "name"
+    t.string "password_digest"
+    t.integer "nausea"
+    t.integer "happiness"
+    t.integer "tickets"
+    t.integer "height"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "admin", default: false
+  end
+
+end
diff --git a/spec/features/users_features_spec.rb b/spec/features/users_features_spec.rb
index a5862bae80..1c5fa7a4de 100644
--- a/spec/features/users_features_spec.rb
+++ b/spec/features/users_features_spec.rb
@@ -58,7 +58,7 @@
     admin_signup
     expect(current_path).to eq('/users/1')
     expect(page).to have_content("Walt Disney")
-    expect(page).to have_content("ADMIN")
+    expect(page).to have_content("Admin")
   end
 
   it "on sign up for admin, successfully adds a session hash" do
@@ -76,7 +76,7 @@
     admin_login
     expect(current_path).to eq('/users/2')
     expect(page).to have_content("Walt Disney")
-    expect(page).to have_content("ADMIN")
+    expect(page).to have_content("Admin")
   end
 
   it "on log in, successfully adds a session hash to admins" do