diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index 99ab901..28d795a 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -3,7 +3,6 @@
 end
 
 get '/' do
-
   @questions = Question.all.reverse
   erb :index
 end
@@ -26,6 +25,7 @@
 
 post '/users' do
   @user = User.new(params['user'])
+  p @user
   if @user.save
     login(@user)
     redirect '/'
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index fd1185c..d82bb04 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -16,6 +16,15 @@
   end
 end
 
+post '/questions/:question_id/answers' do
+  @answer = Answer.create(params[:answer])
+  @question = Question.find(params[:question_id])
+  @question.answers << @answer
+  if request.xhr?
+    erb :'answers/_new', layout: false
+  end
+end
+
 get '/questions/:id' do
 	@question = Question.find_by(id: params[:id])
   @answers = @question.answers
@@ -23,15 +32,10 @@
 end
 
 
-#RESPOND TO A QUESTION ROUTES
-get '/questions/:id/responses/new' do
-end
-
 post '/questions/:id/responses' do
-	@response = Response.new()
+	@response = Response.new(user_id: session[:user_id], respondable_id: params[:id], respondable_type: "Question")
   @question = Question.find_by(id: params[:id])
   @question.responses << @response
-  # @question.save DO WE NEED THIS?
   @response.save
   redirect "/questions/#{@question.id}"
 end
@@ -40,28 +44,23 @@
 #ANSWER A QUESTION ROUTES
 get '/questions/:id/answers/new' do
 
+  @question = Question.find(params[:id])
+  erb :'answers/new', layout: false
+
 end
 
 post '/questions/:id/answers' do
-	@answer = Answer.new()
+	@answer = Answer.new(user_id: session[:user_id], question_id: params[:id])
   @question = Question.find_by(id: params[:id])
   @question.answers << @answer
-  # @question.save DO WE NEED THIS?
   @answer.save
   redirect "/questions/#{@question.id}"
 end
 
-
-#RESPOND TO A QUESTION'S ANSWER ROUTES
-get '/questions/:question_id/answers/:id/responses/new' do
-
-end
-
 post '/questions/:question_id/answers/:id/responses' do
-  @response = Response.new()
+  @response = Response.new(user_id: session[:user_id], respondable_id: params[:id], respondable_type: "Answer")
   @answer = Answer.find_by(id: params[:id])
   @answer.responses << @response
-  # @answer.save DO WE NEED THIS?
   @response.save
   @question = Question.find_by(id: params[:question_id])
   redirect "/questions/#{@question.id}"
diff --git a/app/controllers/users.rb b/app/controllers/users.rb
index 1addf0f..991f36b 100644
--- a/app/controllers/users.rb
+++ b/app/controllers/users.rb
@@ -1,28 +1,28 @@
-get '/' do
-  erb :'index'
-end
+# get '/' do
+#   erb :'index'
+# end
 
-get '/users/new' do
+# get '/users/new' do
 
-  erb :'/users/new'
-end
+#   erb :'/users/new'
+# end
 
-post '/users' do
-  user = User.new(params[:user_info])
-  if user.save
-    session[:user_id] = user.id
-    redirect "/users/#{user.id}"
-  else
-    redirect '/users/new'
-  end
-end
+# # post '/users' do
+# #   user = User.new(params['user'])
+# #   if user.save
+# #     session[:user_id] = user.id
+# #     redirect "/users/#{user.id}"
+# #   else
+# #     redirect '/users/new'
+# #   end
+# # end
 
-get '/users/:id' do
-  @user = User.find_by(id: params[:id])
-  # @decks = Deck.find_by(user_id: @user.id)
-  if current_user == @user
-    erb :'/users/show'
-  else
-    redirect '/'
-  end
-end
+# get '/users/:id' do
+#   @user = User.find_by(id: params[:id])
+#   # @decks = Deck.find_by(user_id: @user.id)
+#   if current_user == @user
+#     erb :'/users/show'
+#   else
+#     redirect '/'
+#   end
+# end
diff --git a/app/views/_login.erb b/app/views/_login.erb
index f10e662..ba385bd 100644
--- a/app/views/_login.erb
+++ b/app/views/_login.erb
@@ -16,7 +16,7 @@
 
             <!-- Modal Body -->
             <div class="modal-body">
-              <form id="question-form" role="form" action="https://github.com/login" method="post">
+              <form id="login-form" role="form" action="https://github.com/login" method="post">
                 <div class="form-group">
                   <label for="email">Email</label>
                   <input type="text" name="user[email]" class="form-control"
diff --git a/app/views/_register.erb b/app/views/_register.erb
index ea5ea2d..2b32480 100644
--- a/app/views/_register.erb
+++ b/app/views/_register.erb
@@ -16,7 +16,7 @@
 
             <!-- Modal Body -->
             <div class="modal-body">
-              <form id="question-form" role="form" action="https://github.com/users" method="post">
+              <form id="register-form" role="form" action="https://github.com/users" method="post">
                 <div class="form-group">
                   <label for="username">Username</label>
                     <input type="text" name="user[username]" class="form-control"
diff --git a/app/views/answers/_new.erb b/app/views/answers/_new.erb
index e69de29..f4b7514 100644
--- a/app/views/answers/_new.erb
+++ b/app/views/answers/_new.erb
@@ -0,0 +1 @@
+<h5><br><%= @answer.text %></h5>
diff --git a/app/views/answers/new.erb b/app/views/answers/new.erb
index af5116d..6fec42f 100644
--- a/app/views/answers/new.erb
+++ b/app/views/answers/new.erb
@@ -1,4 +1,4 @@
-<form action="https://github.com/questions/%3C%=%20@question.question_id%20%%3E/answer" method="post">
+<form id="answer-form" action="https://github.com/questions/%3C%=%20@question.id%20%%3E/answers" method="post">
   <fieldset>
     <legend>Your answer here</legend>
     Content: <textarea class="form-control" name="answer[text]" placeholder="Your Answer Here"></textarea><br>
diff --git a/app/views/questions/show.erb b/app/views/questions/show.erb
index 5b6cb6c..b4a8807 100644
--- a/app/views/questions/show.erb
+++ b/app/views/questions/show.erb
@@ -1,25 +1,30 @@
 
 <h3><%= @question.title %></h3>
-<div>
+<div id="question-show-page">
 <div class="up-down-buttons">
 <form method="post" action='https://github.com/questions/%3C%=%20@question.id%20%%3E/vote' class="inline">
   <button id="upvote-button" type="submit" name="submit_upvote" value="submit_up_value" class="glyphicon glyphicon-arrow-up" aria-hidden="true"><%= @question.up_vote_sum %></button>
 
   <button id="downvote-button" type="submit" name="submit_downvote" value="submit_down_value" class="glyphicon glyphicon-arrow-down" aria-hidden="true"><%= @question.down_vote_sum %></button>
 </form>
-
 </div>
-<h5><%= @question.text %></h5>
+<h5>Description: <br><%= @question.text %></h5>
 <% @question.responses.each do |response| %>
-  <p><%= response %></p>
+  <p><%= response.text %></p>
 <% end %>
-</div>
 
-<div>
+
+<button id="answer-form-show"  type="button" class"btn btn-warning" method="get" action='https://github.com/questions/%3C%=@question.id%%3E/answers/new'>Answer</button>
+<br>
+<br>
+
+<div id="answers-list">
+Answers:
 <% @answers.each do |answer|  %>
-  <h5><%= answer %></h5><br
+  <h5><br><%= answer.text %></h5>
   <% answer.responses.each do |response| %>
-    <p><%= response %></p>
+    <p><%= response.text %></p>
   <% end %>
 <% end %>
 </div>
+</div>
diff --git a/public/js/application.js b/public/js/application.js
index f5e1c47..604ad73 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -16,6 +16,8 @@ $(document).ready(function() {
   });
 
 
+
+
   $("#upvote-button").on('click', function(event){
     event.preventDefault();
     console.log(this)
@@ -30,6 +32,34 @@ $(document).ready(function() {
     })
   })
 
+
+  $("#answer-form-show").on('click', function(event){
+    event.preventDefault();
+    var url = $(this).attr("action");
+    $.ajax({
+      method: "get",
+      url: url,
+    }).done(function(response){
+      $("#answers-list").prepend(response);
+    })
+  })
+
+   $("#question-show-page").on("submit", "#answer-form", function(ev){
+    ev.preventDefault();
+    var data = $("#answer-form").serialize();
+    var url = $("#answer-form").attr("action");
+    $.ajax({
+      url: url,
+      method: 'post',
+      data: data
+    }).done(function(answer) {
+      $("#answers-list").append(answer);
+      $("#answer-form").remove();
+
+  })
+  });
+
+
   $("#downvote-button").on('click', function(event){
     event.preventDefault();
     console.log(this)
@@ -43,4 +73,5 @@ $(document).ready(function() {
       $("#downvote-button").html(result);
     })
   })
+
 });