diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 5b62df9e..fc4b6a3a 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 template: "comments/edit"
+      end
     end
   end
 
@@ -33,6 +36,9 @@ 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 do
+          render template: "comments/create"
+        end
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -46,6 +52,9 @@ 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 do
+          render template: "comments/update"
+        end
       else
         format.html { render :edit, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -59,6 +68,9 @@ 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 template: "comments/destroy"
+      end
     end
   end
 
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index 49affd3e..e98415dc 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -27,6 +27,9 @@ def create
       if @like.save
         format.html { redirect_back fallback_location: root_url, notice: "Like was successfully created." }
         format.json { render :show, status: :created, location: @like }
+        format.js do
+          render template: "likes/create"
+        end
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @like.errors, status: :unprocessable_entity }
@@ -53,6 +56,9 @@ def destroy
     respond_to do |format|
       format.html { redirect_back fallback_location: root_url, notice: "Like was successfully destroyed." }
       format.json { head :no_content }
+      format.js do
+        render template: "likes/create"
+      end
     end
   end
 
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 7b8dc14d..ae01d44e 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="d-flex">
     <div class="flex-shrink-0">
       <%= image_tag comment.author.avatar_image, class: "rounded-circle mr-2", width: 36 %>
@@ -11,11 +11,11 @@
     </div>
     <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, data: { turbo_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 4917fb32..25ad8897 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 00000000..836970d1
--- /dev/null
+++ b/app/views/comments/create.js.erb
@@ -0,0 +1,7 @@
+console.log("hi")
+var added_comment = $("<%= escape_javascript(render 'comments/comment', comment: @comment) %>");
+
+$("#<%= dom_id(@comment.photo) %>_new_comment_form").before(added_comment).val("");
+added_comment.slideDown();
+
+$("#<%= dom_id(@comment.photo) %>_new_comment_form #comment_body").val("");
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 00000000..1c5f5ed7
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1,3 @@
+$("#<%= dom_id(@comment) %>").fadeOut(500, function() {
+  $(this).remove();
+});
diff --git a/app/views/comments/edit.js.erb b/app/views/comments/edit.js.erb
new file mode 100644
index 00000000..93d4a9fc
--- /dev/null
+++ b/app/views/comments/edit.js.erb
@@ -0,0 +1,5 @@
+
+
+
+
+$("#<%= dom_id(@comment) %>").replaceWith("<%= j(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 00000000..5b2c8219
--- /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) %>");
diff --git a/app/views/likes/_form.html.erb b/app/views/likes/_form.html.erb
index 6ee11172..6880a0d9 100644
--- a/app/views/likes/_form.html.erb
+++ b/app/views/likes/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: like, class: "d-inline-block") do |form| %>
+<%= form_with(model: like, local: false, class: "d-inline-block") do |form| %>
   <%= form.hidden_field :fan_id %>
 
   <%= form.hidden_field :photo_id %>
diff --git a/app/views/likes/create.js.erb b/app/views/likes/create.js.erb
new file mode 100644
index 00000000..3a9f2662
--- /dev/null
+++ b/app/views/likes/create.js.erb
@@ -0,0 +1,3 @@
+console.log("hi")
+
+$("#<%= dom_id(@like.photo) %>_likes").replaceWith("<%= j(render "photos/likes", photo: @like.photo) %>")
diff --git a/app/views/photos/_likes.html.erb b/app/views/photos/_likes.html.erb
index 93b092e8..54fe049f 100644
--- a/app/views/photos/_likes.html.erb
+++ b/app/views/photos/_likes.html.erb
@@ -5,7 +5,7 @@
     <% like = current_user.likes.find_by(photo: photo) %>
 
     <% if like %>
-      <%= link_to like, class: "btn btn-link link-underline-dark link-underline link-underline-opacity-0 link-underline-opacity-100-hover", data: { turbo_method: :delete } do %>
+      <%= link_to like, class: "btn btn-link link-underline-dark link-underline link-underline-opacity-0 link-underline-opacity-100-hover", method: :delete, remote: true do %>
         <i class="fas fa-heart fa-fw"></i>
 
         Un-like