diff --git a/Gemfile b/Gemfile
index bde2f2e..5c160b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,8 @@ gem 'coffee-rails', '~> 4.1.0'
 gem 'devise'
 gem 'kaminari'
 gem 'faker'
+gem "turbolinks"
+gem 'nested_form_fields'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index e1b93b6..f593ffb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,6 +86,10 @@ GEM
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.1)
+    nested_form_fields (0.7.8)
+      coffee-rails (>= 3.2.1)
+      jquery-rails
+      rails (>= 3.2.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
@@ -147,7 +151,7 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    spring (1.3.6)
+    spring (1.7.2)
     sprockets (3.2.0)
       rack (~> 1.0)
     sprockets-rails (2.3.2)
@@ -184,6 +188,7 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   kaminari
+  nested_form_fields
   rails (= 4.2.2)
   rspec-rails
   sass-rails (~> 5.0)
@@ -195,4 +200,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.10.5
+   1.12.5
diff --git a/app/assets/javascripts/api_v1/messages.coffee b/app/assets/javascripts/api_v1/messages.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/api_v1/messages.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/api_v1/messages.scss b/app/assets/stylesheets/api_v1/messages.scss
new file mode 100644
index 0000000..db6f927
--- /dev/null
+++ b/app/assets/stylesheets/api_v1/messages.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the api_v1::messages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
new file mode 100644
index 0000000..75bb517
--- /dev/null
+++ b/app/controllers/api_controller.rb
@@ -0,0 +1,2 @@
+class ApiController < ActionController::Base
+end
\ No newline at end of file
diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb
new file mode 100644
index 0000000..cb7e611
--- /dev/null
+++ b/app/controllers/api_v1/messages_controller.rb
@@ -0,0 +1,7 @@
+class ApiV1::MessagesController < ApiController
+  def index
+    @messages = Message.all
+  end
+end
+
+
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e9d6aaa..637f4d1 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -16,7 +16,10 @@ def destroy
     @comment = current_user.comments.find( params[:id] )
     @comment.destroy
 
-    redirect_to :back
+    respond_to do |format|
+        format.html { redirect_to :back }
+        format.js
+    end
   end
 
   protected
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 96f65e5..6e894ba 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -4,19 +4,16 @@ class MessagesController < ApplicationController
 
   def index
     # TODO: fix N+1 queries for user and comments
-    @messages = Message.order("id DESC").page( params[:page] )
+    @messages = Message.includes(:user, :comments).order("id DESC").page( params[:page] )
 
     if params[:status] == "pending"
-      # TODO: @messages = @messages.pending
-      @messages = @messages.where( :status => "pending" )
+      @messages = @messages.pending
     elsif params[:status] == "completed"
-      # TODO: @messages = @messages.completed
-      @messages = @messages.where( :status => "completed" )
+      @messages = @messages.completed
     end
 
-    if params[:days]
-      # TODO: @messages = @messages.within_days(params[:days].to_i)
-      @messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] )
+    if params[:time]
+      @messages = @messages.within_days(params[:time])
     end
   end
 
diff --git a/app/helpers/api_v1/messages_helper.rb b/app/helpers/api_v1/messages_helper.rb
new file mode 100644
index 0000000..21af019
--- /dev/null
+++ b/app/helpers/api_v1/messages_helper.rb
@@ -0,0 +1,2 @@
+module ApiV1::MessagesHelper
+end
diff --git a/app/models/like.rb b/app/models/like.rb
new file mode 100644
index 0000000..a8a243f
--- /dev/null
+++ b/app/models/like.rb
@@ -0,0 +1,4 @@
+class Like < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :message
+end
diff --git a/app/models/message.rb b/app/models/message.rb
index e24a8b2..483e443 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -4,8 +4,20 @@ class Message < ActiveRecord::Base
 
   has_many :comments, :dependent => :destroy
 
+  has_many :likes
+  has_many :liked_users, :through => :likes, :source => :message
+
+  has_many :subscriptions
+  has_many :subscribed_users, :through => :subscriptions, :source => :message
+
+
   def last_comment_summary
     self.comments.last.try(:content).try(:truncate, 20)
   end
 
+  scope :pending, -> { where :status => "pending" }
+  scope :completed, -> { where :status => "completed" }
+  scope :within_days, -> (time) { where "created_at >= ?", Time.now - time.to_i.days }
+
+
 end
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
new file mode 100644
index 0000000..b431527
--- /dev/null
+++ b/app/models/subscription.rb
@@ -0,0 +1,4 @@
+class Subscription < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :message
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6d01aa9..e930639 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,12 +7,18 @@ class User < ActiveRecord::Base
   has_many :messages
   has_many :comments
 
+  has_many :likes
+  has_many :liked_messages, :through => :likes, :source => :message
+
+  has_many :subscriptions
+  has_many :subscribed_messages, :through => :subscriptions, :source => :message
+
   def display_name
     self.email.split("@").first
   end
 
   def posts_count
-    # TODO: 請完成我
+    Comment.count
   end
 
   def words_count
diff --git a/app/views/api_v1/index.json.jbuilder b/app/views/api_v1/index.json.jbuilder
new file mode 100644
index 0000000..81ea4e6
--- /dev/null
+++ b/app/views/api_v1/index.json.jbuilder
@@ -0,0 +1,13 @@
+json.data @messages do |msg|
+
+  json.id msg.id
+  json.status msg.status
+  json.category_name msg.category_name
+  json.title msg.title
+  json.content msg.content
+  json.created_at msg.created_at
+
+end
+
+
+
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 0000000..ec85530
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1,2 @@
+$("#comment-<%= @comment.id %>").remove();
+alert("刪除成功!");
\ No newline at end of file
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 41401f6..fc2cf27 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -4,6 +4,24 @@
 
 <h2>Comments list</h2>
 
+<h4>Likes</h4>
+
+<% @message.liked_users.each do |user| %>
+  <p><%= user.email %></p>
+<% end %>
+
+<hr>
+
+<h4>Subscriptions</h4>
+
+<% @message.subscribed_users.each do |user| %>
+  <p><%= user.email %></p>
+<% end %>
+
+<% @message.liked_users.each do |user| %>
+  <p><%= user.email %></p>
+<% end %>
+
 <%= form_for [@message, @comment] do |f| %>
 
   <p>
@@ -18,14 +36,14 @@
 <% end %>
 
 <% @message.comments.each do |comment| %>
+  <div id="comment-<%= comment.id %>">
+    <%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %>
 
-  <p><%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %>
+      <% if comment.user == current_user %>
+        <%= link_to "Delete", message_comment_path(@message, comment), :method => :delete,:remote => true %>
+      <% end %>
+  </div>
+<% end %>
 
-    <% if comment.user == current_user %>
-      <%# TODO: 修改成 AJAX 版本的刪除 %>
-      <%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, :data => { :confirm => "Are u sure?"} %>
-    <% end %>
-  </p>
 
-<% end %>
 
diff --git a/bin/rails b/bin/rails
index 4d608ed..0138d79 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
diff --git a/bin/rake b/bin/rake
index 8017a02..d87d5f5 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 require_relative '../config/boot'
 require 'rake'
diff --git a/bin/spring b/bin/spring
index 7b45d37..7fe232c 100755
--- a/bin/spring
+++ b/bin/spring
@@ -4,12 +4,12 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
+  require 'rubygems'
+  require 'bundler'
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
-    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
-    gem "spring", match[1]
-    require "spring/binstub"
+  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
+    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
+    gem 'spring', match[1]
+    require 'spring/binstub'
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 74d4dbf..1b53084 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,10 @@
     resources :comments
   end
 
+  scope :path => '/api/v1/', :module => "api_v1", :as => 'v1', :defaults => { :format => :json } do
+    resources :messages, only: [:index]
+  end
+
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 
diff --git a/db/migrate/20160722095429_create_subscriptions.rb b/db/migrate/20160722095429_create_subscriptions.rb
new file mode 100644
index 0000000..ea84f0b
--- /dev/null
+++ b/db/migrate/20160722095429_create_subscriptions.rb
@@ -0,0 +1,10 @@
+class CreateSubscriptions < ActiveRecord::Migration
+  def change
+    create_table :subscriptions do |t|
+      t.references :user, index: true, foreign_key: true
+      t.references :message, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20160722095612_create_likes.rb b/db/migrate/20160722095612_create_likes.rb
new file mode 100644
index 0000000..c95dcc7
--- /dev/null
+++ b/db/migrate/20160722095612_create_likes.rb
@@ -0,0 +1,10 @@
+class CreateLikes < ActiveRecord::Migration
+  def change
+    create_table :likes do |t|
+      t.references :user, index: true, foreign_key: true
+      t.references :message, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ef7b5c0..947bd15 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150728165437) do
+ActiveRecord::Schema.define(version: 20160722095612) do
 
   create_table "comments", force: :cascade do |t|
     t.text     "content"
@@ -23,6 +23,16 @@
 
   add_index "comments", ["message_id"], name: "index_comments_on_message_id"
 
+  create_table "likes", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "likes", ["message_id"], name: "index_likes_on_message_id"
+  add_index "likes", ["user_id"], name: "index_likes_on_user_id"
+
   create_table "messages", force: :cascade do |t|
     t.string   "title"
     t.text     "content"
@@ -36,6 +46,16 @@
   add_index "messages", ["status"], name: "index_messages_on_status"
   add_index "messages", ["user_id"], name: "index_messages_on_user_id"
 
+  create_table "subscriptions", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "subscriptions", ["message_id"], name: "index_subscriptions_on_message_id"
+  add_index "subscriptions", ["user_id"], name: "index_subscriptions_on_user_id"
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 4673e72..73e8c72 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -5,6 +5,9 @@ namespace :dev do
     Message.delete_all
     Comment.delete_all
 
+    Subscription.delete_all
+    Like.delete_all
+
     users = []
     10.times do
       users << User.create!( :email => Faker::Internet.email,
@@ -17,6 +20,11 @@ namespace :dev do
                            :content => Faker::Lorem.paragraph,
                            :user => users.sample,
                            :created_at => Time.now - rand(30).days )
+      users.sample(3).each do |u|
+        Subscription.create!(:user => u, :message => m)
+        Like.create!(:user => u, :message => m)
+      end
+
       5.times do
         m.comments.create!( :content => Faker::Lorem.paragraph,
                             :user => users.sample )
diff --git a/spec/controllers/api_v1/messages_controller_spec.rb b/spec/controllers/api_v1/messages_controller_spec.rb
new file mode 100644
index 0000000..e1f1525
--- /dev/null
+++ b/spec/controllers/api_v1/messages_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ApiV1::MessagesController, type: :controller do
+
+end
diff --git a/spec/helpers/api_v1/messages_helper_spec.rb b/spec/helpers/api_v1/messages_helper_spec.rb
new file mode 100644
index 0000000..e078b0d
--- /dev/null
+++ b/spec/helpers/api_v1/messages_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the ApiV1::MessagesHelper. For example:
+#
+# describe ApiV1::MessagesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe ApiV1::MessagesHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb
new file mode 100644
index 0000000..76ea93d
--- /dev/null
+++ b/spec/models/like_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Like, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
new file mode 100644
index 0000000..d40bf0b
--- /dev/null
+++ b/spec/models/subscription_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Subscription, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 528cc38..c92457d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -24,11 +24,15 @@
 
   describe "#words_count" do
     before do
-      # TODO: 加 Message 和 Comment 測試資料
+
+      m1 = Message.create!( :user => @user)
+      Comment.create!( :user => @user,
+                       :content => "Aut voluptatem illum fugit ut sit.",
+                       :message => m1 )
     end
 
     it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do
-      # TODO: 測試 words_count 方法
+      expect( @user.words_count ).to eq(6)
 
     end
   end