diff --git a/README.md b/README.md
index 43e1e1c..8c0ef6a 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,17 @@ This assignment will give you practice implementing AJAX requests with jQuery. Y
 **To get started, you can fork the Twitmaker repository here: https://github.com/bitmakerlabs/twitmaker**
 
 
+
+
 ## Part 1: jQuery AJAX request with HTML response
 
 Our first step will be to take our normal request-response cycle and update it to use an AJAX request. The benefit of doing this is that rather than re-rendering the entire page, including the head section, JavaScript, stylesheets and full layout, we'll only have to render the part of the page that changes.
 
 This makes your app snappier and more interactive for your users!
 
-#### It's Coding Time!
+
+
+#### It's Coding Time!!
 Start by making a branch called `jquery-ajax-html`.
 
 Use jQuery to send your AJAX request to the server (using [`$.ajax`](http://api.jquery.com/jQuery.ajax/)).
@@ -27,12 +31,15 @@ When the server receives the request to create a new Tweet, instead of redirecti
 Finally, use jQuery DOM manipulation to update the list of tweets by adding the HTML response from the server to the top.
 
 
+
+
 ## Part 2: jQuery AJAX request with JSON response
 
 Receiving HTML from the server is fine when you're the one writing the code on both the client and the server, since you know exactly what markup is required.
 
 When we're dealing with more generic situations where we want to present the same data in different views or we're requesting data from a third-party service, receiving HTML as a response is really limiting. We may want to present the data differently than how the server is sending it to us!
 
+
 #### It's Coding Time!
 Start by making a branch called `jquery-ajax-json`.
 
@@ -43,6 +50,8 @@ On the server you'll have to refactor your action so that it returns JSON rather
 
 ---
 
+
+
 ## Stretch Assignments
 
 1. Submit the form when pressing `return`, but not when pressing `option-return`
diff --git a/app/assets/javascripts/tweets.js b/app/assets/javascripts/tweets.js
index dee720f..cbf6c4f 100644
--- a/app/assets/javascripts/tweets.js
+++ b/app/assets/javascripts/tweets.js
@@ -1,2 +1,49 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
+$(function(){   //doc readyy
+
+//link enter key with submit
+	$('#new_tweet').keyup(function(event){
+		if(event.keyCode == 13){
+			$('#create-tweet').click();
+		}
+	});
+
+//Submit tweet
+	$('#new_tweet').on('submit', function(event){
+		event.preventDefault();
+		var btn = $('<button>').addClass('delete-btn').text('Delete')
+
+
+		$.ajax({
+				url: $(this).attr('action'),
+				method: 'POST',
+				data: $(this).serialize(),
+				dataType: 'json'
+			}).done(function(responseData){
+				var twit = $('<li>').addClass('tweet')
+														.append('<p>' + responseData.message + '</p>')
+														.append('<time>' + responseData.created_at + '</time><br>')
+														.append(btn);
+				$(twit).prependTo('.tweets');
+				$('#tweet_message').val('');
+			});
+	});// end of on submit
+
+//Delete Tweet
+	$('.delete-btn').on('click', function(){
+		var self = $(this)
+		$.ajax({
+				url: '/tweets/' + self.attr('id'),
+				method: 'delete',
+				data: {},
+				dataType: 'html'
+			}).done(function(){
+				console.log('YO');
+				self.parent().remove();
+			});
+
+	}); //end of delete
+
+
+}); //end doc ready
diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb
index 2da1958..aefa874 100644
--- a/app/controllers/tweets_controller.rb
+++ b/app/controllers/tweets_controller.rb
@@ -1,25 +1,38 @@
 class TweetsController < ApplicationController
-  def index
-    @tweets = Tweet.all.order(created_at: :desc)
-    @tweet = Tweet.new
-  end
+	def index
+		@tweets = Tweet.all.order(created_at: :desc)
+		@tweet = Tweet.new
+	end
 
-  def create
-    @tweet = Tweet.new(tweet_params)
+	def show
+		@tweet = Tweet.find(params[:id])
+	end
 
-    if @tweet.save
-      redirect_to tweets_path
-    else
-      render :index
-    end
-  end
+	def create
+		@tweet = Tweet.new(tweet_params)
 
-  def destroy
-  end
+		if @tweet.save
+			respond_to do |format|
+				format.html {redirect_to tweets_path}
+				format.json { render json: @tweet }
+			end
+		else
+			render :index
+		end
+	end
 
-  private
 
-  def tweet_params
-    params.require(:tweet).permit(:message)
-  end
+	def destroy
+		@tweet = Tweet.find(params[:id])
+		@tweet.destroy
+		flash[:success] = "Tweet Deleted"
+		render partial: @tweet
+	end
+
+
+	private
+
+	def tweet_params
+		params.require(:tweet).permit(:message)
+	end
 end
diff --git a/app/views/tweets/_tweet.html.erb b/app/views/tweets/_tweet.html.erb
new file mode 100644
index 0000000..5f717ed
--- /dev/null
+++ b/app/views/tweets/_tweet.html.erb
@@ -0,0 +1,5 @@
+	<li class="tweet">
+		<p><%= tweet.message %></p>
+		<time><%= tweet.created_at.strftime('%b %e, %l:%M %p') %></time> <br />
+		<!-- <button class="btn"> Delete </button> -->
+	</li>
diff --git a/app/views/tweets/index.html.erb b/app/views/tweets/index.html.erb
index 16b0a94..f6f0ead 100644
--- a/app/views/tweets/index.html.erb
+++ b/app/views/tweets/index.html.erb
@@ -1,13 +1,11 @@
 <ul class="tweets">
-  <% @tweets.each do |tweet| %>
-    <li class="tweet">
-      <p><%= tweet.message %></p>
-      <time><%= tweet.created_at.strftime('%b %e, %l:%M %p') %></time>
-    </li>
-  <% end %>
+	<% @tweets.each do |tweet| %>
+		<%= render tweet %>
+	<% end %>
+
 </ul>
 
 <%= form_for @tweet do |f| %>
-  <%= f.text_area :message, placeholder: "What did you learn today?" %>
-  <%= f.submit "Tweet", id: "create-tweet" %>
+	<%= f.text_area :message, placeholder: "What did you learn today?" %>
+	<%= f.submit "Tweet", id: "create-tweet" %>
 <% end %>