diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 42a7cf3..6e75dfa 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -11,7 +11,7 @@ def new
   def edit
     respond_to do |format|
       format.html
-      format.js
+      format.turbo_stream
     end
   end
 
@@ -24,7 +24,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
+        format.turbo_stream
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -38,7 +38,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
+        format.turbo_stream
       else
         format.html { render :edit, status: :unprocessable_entity }
         format.json { render json: @comment.errors, status: :unprocessable_entity }
@@ -52,7 +52,7 @@ 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
+      format.turbo_stream
     end
   end
 
diff --git a/app/controllers/follow_requests_controller.rb b/app/controllers/follow_requests_controller.rb
index 951ecfb..bb8cac1 100644
--- a/app/controllers/follow_requests_controller.rb
+++ b/app/controllers/follow_requests_controller.rb
@@ -10,7 +10,7 @@ def create
       if @follow_request.save
         format.html { redirect_back fallback_location: root_url, notice: "Follow request was successfully created." }
         format.json { render :show, status: :created, location: @follow_request }
-        format.js
+        format.turbo_stream
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @follow_request.errors, status: :unprocessable_entity }
@@ -37,7 +37,7 @@ def destroy
     respond_to do |format|
       format.html { redirect_back fallback_location: root_url, notice: "Follow request was successfully destroyed." }
       format.json { head :no_content }
-      format.js
+      format.turbo_stream
     end
   end
 
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index 062f218..c435c91 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -9,7 +9,7 @@ def create
       if @like.save
         format.html { redirect_back fallback_location: @like.photo, notice: "Like was successfully created." }
         format.json { render :show, status: :created, location: @like }
-        format.js
+        format.turbo_stream
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @like.errors, status: :unprocessable_entity }
@@ -23,7 +23,7 @@ def destroy
     respond_to do |format|
       format.html { redirect_back fallback_location: @like.photo, notice: "Like was successfully destroyed." }
       format.json { head :no_content }
-      format.js
+      format.turbo_stream
     end
   end
 
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 4acad89..45cb4a4 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -11,11 +11,11 @@
 
         <div>
           <% if comment.author == current_user %>
-            <%= link_to edit_comment_path(comment), class: "btn btn-link btn-sm text-muted", remote: true do %>
+            <%= link_to edit_comment_path(comment), class: "btn btn-link btn-sm text-muted", data: { turbo_stream: true } do %>
               <i class="fas fa-edit fa-fw"></i>
             <% end %>
 
-            <%= button_to comment, method: :delete, class: "btn btn-link btn-sm text-muted", form_class: "btn btn-sm btn-link", remote: true do %>
+            <%= button_to comment, method: :delete, class: "btn btn-link btn-sm text-muted", form_class: "btn btn-sm btn-link" 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 fd593a0..f515fb3 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,5 +1,5 @@
 <li id="<%= dom_id(comment.photo) %>_<%= dom_id(comment) %>_form" class="list-group-item">
-  <%= form_with(model: comment, local: false) do |form| %>
+  <%= form_with(model: comment) 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
deleted file mode 100644
index 120b538..0000000
--- a/app/views/comments/create.js.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-var added_comment = $("<%= j(render @comment) %>");
-
-added_comment.hide();
-
-$("#<%= dom_id(@comment.photo) %>_new_comment_form").before(added_comment);
-
-added_comment.slideDown();
-
-$("#<%= dom_id(@comment.photo) %>_new_comment_form #comment_body").val("");
diff --git a/app/views/comments/create.turbo_stream.erb b/app/views/comments/create.turbo_stream.erb
new file mode 100644
index 0000000..54d0c62
--- /dev/null
+++ b/app/views/comments/create.turbo_stream.erb
@@ -0,0 +1,7 @@
+<%= turbo_stream.before "#{dom_id(@comment.photo)}_new_comment_form" do %>
+  <%= render @comment %>
+<% end %>
+
+<%= turbo_stream.replace "#{dom_id(@comment.photo)}_new_comment_form" do %>
+  <%= render "form", comment: @comment.photo.comments.build %>
+<% end %>
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
deleted file mode 100644
index c6742e1..0000000
--- a/app/views/comments/destroy.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-$("#<%= dom_id(@comment) %>").fadeOut(function() {
-  $(this).remove();
-});
diff --git a/app/views/comments/destroy.turbo_stream.erb b/app/views/comments/destroy.turbo_stream.erb
new file mode 100644
index 0000000..f90713c
--- /dev/null
+++ b/app/views/comments/destroy.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.remove dom_id(@comment) %>
diff --git a/app/views/comments/edit.js.erb b/app/views/comments/edit.js.erb
deleted file mode 100644
index fa5edd4..0000000
--- a/app/views/comments/edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#<%= dom_id(@comment) %>").replaceWith("<%= j(render "comments/form", comment: @comment) %>");
diff --git a/app/views/comments/edit.turbo_stream.erb b/app/views/comments/edit.turbo_stream.erb
new file mode 100644
index 0000000..06a8024
--- /dev/null
+++ b/app/views/comments/edit.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace dom_id(@comment) do %>
+  <%= render "comments/form", comment: @comment %>
+<% end %>
diff --git a/app/views/comments/update.js.erb b/app/views/comments/update.js.erb
deleted file mode 100644
index 06a1388..0000000
--- a/app/views/comments/update.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#<%= dom_id(@comment.photo) %>_<%= dom_id(@comment) %>_form").replaceWith("<%= j(render @comment) %>");
diff --git a/app/views/comments/update.turbo_stream.erb b/app/views/comments/update.turbo_stream.erb
new file mode 100644
index 0000000..70c2a0a
--- /dev/null
+++ b/app/views/comments/update.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "#{dom_id(@comment.photo)}_#{dom_id(@comment)}_form" do %>
+  <%= render @comment %>
+<% end %>
diff --git a/app/views/follow_requests/_follow_unfollow.html.erb b/app/views/follow_requests/_follow_unfollow.html.erb
index 0ee4e5f..9e9611e 100644
--- a/app/views/follow_requests/_follow_unfollow.html.erb
+++ b/app/views/follow_requests/_follow_unfollow.html.erb
@@ -3,11 +3,11 @@
 
   <% if follow_request %>
     <% if follow_request.pending? %>
-      <%= link_to follow_request, remote: true, method: :delete, class: "#{dom_id(follow_request)} btn btn-outline-secondary" do %>
+      <%= button_to follow_request, method: :delete, form_class: dom_id(follow_request), class: "btn btn-outline-secondary" do %>
         Un-request
       <% end %>
     <% elsif follow_request.accepted? %>
-      <%= link_to follow_request, remote: true, method: :delete, class: "#{dom_id(follow_request)} btn btn-outline-secondary" do %>
+      <%= button_to follow_request, method: :delete, form_class: dom_id(follow_request), class: "btn btn-outline-secondary" do %>
         Un-follow
       <% end %>
     <% end %>
diff --git a/app/views/follow_requests/_form.html.erb b/app/views/follow_requests/_form.html.erb
index 386ed76..10b3717 100644
--- a/app/views/follow_requests/_form.html.erb
+++ b/app/views/follow_requests/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: follow_request, local: false, class: "#{dom_id(follow_request.recipient)} d-inline-block") do |form| %>
+<%= form_with(model: follow_request, class: "#{dom_id(follow_request.recipient)} d-inline-block") do |form| %>
   <% if follow_request.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(follow_request.errors.count, "error") %> prohibited this follow_request from being saved:</h2>
diff --git a/app/views/follow_requests/create.js.erb b/app/views/follow_requests/create.js.erb
deleted file mode 100644
index 83a65d4..0000000
--- a/app/views/follow_requests/create.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-var existingFollowRequest = $(".<%= dom_id(@follow_request.recipient)%>");
-
-var unRequestLink = $("<%= j(render "follow_requests/follow_unfollow", sender: @follow_request.sender, recipient: @follow_request.recipient) %>" );
-
-existingFollowRequest.replaceWith(unRequestLink);
diff --git a/app/views/follow_requests/create.turbo_stream.erb b/app/views/follow_requests/create.turbo_stream.erb
new file mode 100644
index 0000000..a831d2d
--- /dev/null
+++ b/app/views/follow_requests/create.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace_all ".#{dom_id(@follow_request.recipient)}" do %>
+  <%= render "follow_requests/follow_unfollow", sender: @follow_request.sender, recipient: @follow_request.recipient %>
+<% end %>
diff --git a/app/views/follow_requests/destroy.js.erb b/app/views/follow_requests/destroy.js.erb
deleted file mode 100644
index 3f212aa..0000000
--- a/app/views/follow_requests/destroy.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-var existingFollowRequest = $(".<%= dom_id(@follow_request) %>");
-
-var followForm = $("<%= j(render "follow_requests/form", follow_request: @follow_request.recipient.received_follow_requests.build) %>");
-
-existingFollowRequest.replaceWith(followForm);
diff --git a/app/views/follow_requests/destroy.turbo_stream.erb b/app/views/follow_requests/destroy.turbo_stream.erb
new file mode 100644
index 0000000..f47b250
--- /dev/null
+++ b/app/views/follow_requests/destroy.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace_all ".#{dom_id(@follow_request)}" do %>
+  <%= render "follow_requests/form", follow_request: @follow_request.recipient.received_follow_requests.build %>
+<% end %>
diff --git a/app/views/likes/_form.html.erb b/app/views/likes/_form.html.erb
index 5fe097e..b8c7c06 100644
--- a/app/views/likes/_form.html.erb
+++ b/app/views/likes/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: like, local: false,) do |form| %>
+<%= form_with(model: like) 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
deleted file mode 100644
index 4987257..0000000
--- a/app/views/likes/create.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-var existingPhoto = $("#<%= dom_id(@like.photo) %>_likes");
-
-var updatedLikeVal = $("<%= j(render "photos/likes", photo: @like.photo) %>");
-
-existingPhoto.replaceWith(updatedLikeVal);
diff --git a/app/views/likes/create.turbo_stream.erb b/app/views/likes/create.turbo_stream.erb
new file mode 100644
index 0000000..e1f44f3
--- /dev/null
+++ b/app/views/likes/create.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "#{dom_id(@like.photo)}_likes" do %>
+  <%= render "photos/likes", photo: @like.photo %>
+<% end %>
diff --git a/app/views/likes/destroy.js.erb b/app/views/likes/destroy.js.erb
deleted file mode 100644
index 3f65df0..0000000
--- a/app/views/likes/destroy.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-var existingLikes = $("#<%= dom_id(@like.photo) %>_likes");
-
-var updatedLikes = $("<%= j(render "photos/likes", photo: @like.photo) %>");
-
-existingLikes.replaceWith(updatedLikes);
diff --git a/app/views/likes/destroy.turbo_stream.erb b/app/views/likes/destroy.turbo_stream.erb
new file mode 100644
index 0000000..e1f44f3
--- /dev/null
+++ b/app/views/likes/destroy.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "#{dom_id(@like.photo)}_likes" do %>
+  <%= render "photos/likes", photo: @like.photo %>
+<% end %>
diff --git a/app/views/photos/_likes.html.erb b/app/views/photos/_likes.html.erb
index b06bdba..2df5f82 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-opacity-0 link-underline-opacity-100-hover", method: :delete, remote: true do %>
+      <%= button_to like, method: :delete, class: "btn btn-link link-underline-dark link-underline-opacity-0 link-underline-opacity-100-hover" do %>
         <i class="fas fa-heart fa-fw"></i>
 
         Un-like