diff --git a/Observable.js b/Observable.js
index 03545cd..2c80950 100644
--- a/Observable.js
+++ b/Observable.js
@@ -3,6 +3,7 @@
  * @Date: 2018-02-01 17:41:25 
  * @Last Modified by: kael
  * @Last Modified time: 2018-02-02 17:38:36
+ * 觀察者
  */
 
 class ObserverList {
@@ -11,12 +12,20 @@ class ObserverList {
   }
   add(observer) {
     // todo add observer to list
+    this.observerList.push(observer);
   }
   remove(observer) {
     // todo remove observer from list
+    this.observerList.forEach((item,index)=>{
+      item== observer &&  this.observerList.splice(index,1);
+    })
+  }
+  get(i){
+    return this.observerList[i];
   }
   count() {
     // return observer list size
+    return this.observerList.length;
   }
 }
 
@@ -26,12 +35,18 @@ class Subject {
   }
   addObserver(observer) {
     // todo add observer
+    this.observers.add(observer)
   }
   removeObserver(observer) {
     // todo remove observer
+    this.observers.remove(observer)
   }
   notify(...args) {
     // todo notify
+    let length = this.observers.count();
+    for(var i =0; i<length;i++){
+      this.observers.get(i).update(...args)
+    }
   }
 }
 
diff --git a/PubSub.js b/PubSub.js
index 0c7999e..a925934 100644
--- a/PubSub.js
+++ b/PubSub.js
@@ -3,6 +3,7 @@
  * @Date: 2018-02-01 17:41:25 
  * @Last Modified by: kael
  * @Last Modified time: 2018-02-02 17:39:45
+ * 發佈/訂閲模式
  */
 
 module.exports = class PubSub {
@@ -13,14 +14,27 @@ module.exports = class PubSub {
 
   subscribe(type, fn) {
     // todo subscribe
+    // if (!this.subscribers[type]) {
+    //     this.subscribers[type] = [];
+    // }
+    // this.subscribers[type]
+    this.subscribers[type] = fn
   }
 
   unsubscribe(type, fn) {
     // todo unsubscribe
+    if (!this.subscribers[type]) {
+      return false
+    }
+    this.subscribers[type] = undefined
   }
 
   publish(type, ...args) {
     // todo publish
+    if (!this.subscribers[type]) {
+      return false
+    }
+    this.subscribers[type](...args)
   }
 
 }
diff --git a/package.json b/package.json
index a7933a0..b1030e2 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "mocha"
+    "test": "mocha -g Observable"
   },
   "repository": {
     "type": "git",
diff --git a/test/test.js b/test/test.js
index aab05a3..6734c93 100644
--- a/test/test.js
+++ b/test/test.js
@@ -34,6 +34,11 @@ describe('PubSub', () => {
     ob.unsubscribe('add', add);
     ob.publish('add', val);
     assert.ok(sum !== val);
+
+    ob.subscribe('add', (val)=> val++);
+    ob.publish('add', val);
+    assert.ok( ++val === val);
+
   });
 });