diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 5b62df9..b7fe8c0 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -21,6 +21,9 @@ def new
   def edit
     respond_to do |format|
       format.html
+      format.js do
+        render("comments/edit.js.erb")
+      end
     end
   end
 
@@ -33,9 +36,14 @@ 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 "create" }
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
+
+        format.js
+        
       end
     end
   end
@@ -46,6 +54,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("comments/update")}
       else
         format.html { render :edit, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -59,6 +68,10 @@ def 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 do
+        render("comments/destroy.js.erb")
+      end
     end
   end
 
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 25bdd33..c4532fa 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..134a5d6 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..b55caf9
--- /dev/null
+++ b/app/views/comments/create.js.erb
@@ -0,0 +1,9 @@
+var added_comment = $("<%= escape_javascript(render('comments/comment', comment: @comment)) %>");
+var form_id = "#<%= dom_id(@comment.photo) %>_new_comment_form"
+
+$(form_id).before(added_comment);
+
+added_comment.hide();
+added_comment.slideDown();
+
+$(form_id+" #comment_body").val("");
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 0000000..978a83c
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1,3 @@
+console.log("howdy from comments#destroy");
+
+$("#comment_<%= @comment.id %>").slideUp();
diff --git a/app/views/comments/edit.js.erb b/app/views/comments/edit.js.erb
new file mode 100644
index 0000000..7701f06
--- /dev/null
+++ b/app/views/comments/edit.js.erb
@@ -0,0 +1,2 @@
+$("#<%= dom_id(@comment) %>").hide(0);
+$("#<%= dom_id(@comment) %>").before("<%= escape_javascript(render('comments/form', comment: @comment)) %>");
diff --git a/app/views/comments/update.js.erb b/app/views/comments/update.js.erb
new file mode 100644
index 0000000..fe91d90
--- /dev/null
+++ b/app/views/comments/update.js.erb
@@ -0,0 +1,5 @@
+var form_id = "#<%= dom_id(@comment.photo) +"_"+ dom_id(@comment) %>_form"
+var updated_comment = $("<%= escape_javascript(render('comments/comment', comment: @comment)) %>");
+
+$(form_id).hide(0);
+$(form_id).before(updated_comment);