diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 5b62df9..2f109b3 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -21,6 +21,7 @@ def new
   def edit
     respond_to do |format|
       format.html
+      format.js {render template: "comments/edit.js.erb"}
     end
   end
 
@@ -33,6 +34,7 @@ def create
       if @comment.save
         format.html { redirect_back fallback_location: root_path, notice: "Comment was successfully created." }
         format.json { render :show, status: :created, location: @comment }
+        format.js {render template: "comments/create.js.erb"}
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -46,6 +48,7 @@ def update
       if @comment.update(comment_params)
         format.html { redirect_to root_url, notice: "Comment was successfully updated." }
         format.json { render :show, status: :ok, location: @comment }
+        format.js {render template: "comments/update.js.erb"}
       else
         format.html { render :edit, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -58,7 +61,10 @@ def destroy
     @comment.destroy
     respond_to do |format|
       format.html { redirect_back fallback_location: root_url, notice: "Comment was successfully destroyed." }
+      
       format.json { head :no_content }
+
+      format.js {render template: "comments/destroy.js.erb"}
     end
   end
 
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 25bdd33..b4c5fb9 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -1,4 +1,4 @@
-<li class="list-group-item">
+<li id="<%= dom_id(comment) %>" class="list-group-item">
   <div class="media">
     <%= image_tag comment.author.avatar_image, class: "rounded-circle mr-2", width: 36 %>
     <div class="media-body">
@@ -9,11 +9,11 @@
 
         <div>
           <% if current_user == comment.author %>
-            <%= link_to edit_comment_path(comment), class: "btn btn-link btn-sm text-muted" do %>
+            <%= link_to edit_comment_path(comment), class: "btn btn-link btn-sm text-muted", remote: true do %>
               <i class="fas fa-edit fa-fw"></i>
             <% end %>
 
-            <%= link_to comment, method: :delete, class: "btn btn-link btn-sm text-muted" do %>
+            <%= link_to comment, method: :delete, class: "btn btn-link btn-sm text-muted", remote: true do %>
               <i class="fas fa-trash fa-fw"></i>
             <% end %>
           <% end %>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index f289224..5ae0624 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,5 +1,5 @@
-<li class="list-group-item">
-  <%= form_with(model: comment) do |form| %>
+<li id="<%= dom_id(comment.photo) %>_<%= dom_id(comment) %>_form" class="list-group-item">
+  <%= form_with(model: comment, local: false) do |form| %>
     <% if comment.errors.any? %>
       <div id="error_explanation">
         <ul class="list-unstyled">
diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
new file mode 100644
index 0000000..062205d
--- /dev/null
+++ b/app/views/comments/create.js.erb
@@ -0,0 +1,11 @@
+var added_comment = $("<%= j(render 'comments/comment', comment: @comment) %>");
+
+
+added_comment.hide();
+
+$("#<%= dom_id(@comment.photo) %>_new_comment_form").before(added_comment);
+
+added_comment.slideDown();
+
+// Clear the comment text box
+$("#<%= dom_id(@comment.photo) %>_new_comment_form #comment_body").val("");
\ No newline at end of file
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 0000000..c2ab5f2
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1,5 @@
+
+console.log("Howdy")
+$("#<%= dom_id(@comment) %>").fadeOut(100, function() {
+  $(this).remove();
+});
\ No newline at end of file
diff --git a/app/views/comments/edit.js.erb b/app/views/comments/edit.js.erb
new file mode 100644
index 0000000..7fe92c7
--- /dev/null
+++ b/app/views/comments/edit.js.erb
@@ -0,0 +1,2 @@
+
+$("#<%= dom_id(@comment) %>").replaceWith("<%= j(render "comments/form", comment: @comment) %>");g a
\ No newline at end of file
diff --git a/app/views/comments/update.js.erb b/app/views/comments/update.js.erb
new file mode 100644
index 0000000..f1b93cf
--- /dev/null
+++ b/app/views/comments/update.js.erb
@@ -0,0 +1,2 @@
+
+$("#<%= dom_id(@comment.photo) %>_<%= dom_id(@comment) %>_form").replaceWith("<%= j(render @comment) %>");
\ No newline at end of file