diff --git a/homework/content.js b/homework/content.js
index 710be28..0d881fd 100644
--- a/homework/content.js
+++ b/homework/content.js
@@ -1,37 +1,45 @@
 'use strict';
 
-(function() {
-  var _wrapper = document.querySelector('#note-content-wrapper');
+(function(exports) {
+  
+  var ToDoContentManager = function () {
+      this._wrapper = null;  
+  };
+  ToDoContentManager.prototype = {
+    start(){
+        /*
+         *Initiate wrapper.
+         *To do bind(this)
+         */
+        this._wrapper = document.querySelector('note-content-wrapper');
+        window.addEventListener('note-open',(function(event){
+          var note = event.detail;
+          this.resetWrapper();
+          this.drawNote(note);
+        }).bind(this));
+    },
+      
+    resetWrapper() {
+      this._wrapper.innerHTML = '';
+    },
+    
+    drawNote(note) {
+      var title = note.title;
+      var h = document.createElement('h2');
+      h.textContent = title;
+      var passages = note.passages;
+      var buff = document.createDocumentFragment();
+      passages.forEach(function(passage) {
+        var p = document.createElement('p');
+        p.classList.add('note-passage');
+        p.textContent = passage;
+        buff.appendChild(p);
+      });
+      this._wrapper.appendChild(h);
+      this._wrapper.appendChild(buff);
+    }
+  };
 
-  function start() {
-    window.addEventListener('note-open', function(event) {
-      var note = event.detail;
-      resetWrapper();
-      drawNote(note);
-    });
-  }
-
-  function resetWrapper() {
-    _wrapper.innerHTML = '';
-  }
-
-  function drawNote(note) {
-    var title = note.title;
-    var h = document.createElement('h2');
-    h.textContent = title;
-    var passages = note.passages;
-    var buff = document.createDocumentFragment();
-    passages.forEach(function(passage) {
-      var p = document.createElement('p');
-      p.classList.add('note-passage');
-      p.textContent = passage;
-      buff.appendChild(p);
-    });
-    _wrapper.appendChild(h);
-    _wrapper.appendChild(buff);
-  }
-
-  document.addEventListener('DOMContentLoaded', function(event) {
-    start();
-  });
-})();
+ exports.ToDoContentManager = ToDoContentManager;
+ 
+})(window);
diff --git a/homework/index.html b/homework/index.html
index e387963..c52a45e 100644
--- a/homework/index.html
+++ b/homework/index.html
@@ -4,6 +4,7 @@
   <meta charset="UTF-8">
   <title> Homework - Note List </title>
   <script defer src="list.js"></script>
+  <script defer src="main.js"></script>
   <script defer src="content.js"></script>
   <link rel="stylesheet" type="text/css" href="main.css" />
 </head>
diff --git a/homework/list.js b/homework/list.js
index 21eddbc..d710a8d 100644
--- a/homework/list.js
+++ b/homework/list.js
@@ -1,44 +1,48 @@
 'use strict';
 
-(function() {
-
-  var _listNoteContent = [];
-  var _wrapper = document.querySelector('#note-list-wrapper');
-
-  function start() {
-    fetchList(function(data) {
-      updateList(data);
-      drawList();
-      preloadFirstNote();
-    });
-    window.addEventListener('click', function(event) {
-      onNoteOpen(event);
-    });
-  }
-
-  function onNoteOpen(event) {
-    if (event.target.classList.contains('note-title')) {
+(function(exports) {
+  
+  var ToDoListManager = function(){
+    this._listNoteContent = [];
+    this._wrapper = document.querySelector('#note-list-wrapper');
+  };
+  
+  ToDoListManager.prototype = {
+    start(){
+      this.fetchList()
+      .then((function(data) {
+        this.updateList(data);
+        this.drawList();
+        this.preloadFirstNote();
+      }).bind(this));
+      window.addEventListener('click', (function(event) {
+        this.onNoteOpen(event);
+      }).bind(this));
+    },
+    
+    onNoteOpen(event){
+      if (event.target.classList.contains('note-title')) {
       var id = event.target.dataset.noteId;
-      var content = _listNoteContent[id];
+      var content = this._listNoteContent[id];
       window.dispatchEvent(new CustomEvent('note-open',
         { detail: content }));
-    };
-  }
-
-  function preloadFirstNote() {
-    if (_listNoteContent.length !== 0) {
-      var content = _listNoteContent[0];
+      };
+    },
+    
+    preloadFirstNote(){
+      if (this._listNoteContent.length !== 0) {
+      var content = this._listNoteContent[0];
       window.dispatchEvent(new CustomEvent('note-open',
         { detail: content }));
-    }
-  }
-
-  function updateList(list) {
-    _listNoteContent = list;
-  }
-
-  function drawList() {
-    var list = _listNoteContent;
+      }
+    },
+    
+    updateList(list) {
+      this._listNoteContent = list;
+    },
+    
+    drawList() {
+    var list = this._listNoteContent;
     var ul = document.createElement('ul');
     ul.id = 'note-title-list';
     var buff = document.createDocumentFragment();
@@ -52,28 +56,30 @@
       buff.appendChild(li);
     });
     ul.appendChild(buff);
-    _wrapper.appendChild(ul);
-  }
+    this._wrapper.appendChild(ul);
+    },
 
-  function fetchList(afterFetch) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', 'http://127.0.0.1:8000/demo-list-notes.json', true);
-    xhr.responseType = 'json';
-    xhr.onreadystatechange = function(e) {
-      // Watch out: we have a mysterious unknown 'this'.
-      if (this.readyState === 4 && this.status === 200) {
-        var listData = this.response;
-        // The flow ends here.
-        afterFetch(listData);
-      } else if (this.status !== 200 ){
-        // Ignore error in this case.
-      }
-    };
-    xhr.send();
-  }
-
-  document.addEventListener('DOMContentLoaded', function(event) {
-    start();
-  });
+    fetchList(afterFetch) {
+      return new Promise((function(resolve , reject){
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', 'http://127.0.0.1:8000/demo-list-notes.json', true);
+        xhr.responseType = 'json';
+        xhr.onreadystatechange = (function(e) {
+          // Watch out: we have a mysterious unknown 'this'.
+          if (this.readyState === 4 && this.status === 200) {
+            var listData = this.response;
+            // The flow ends here.
+            resolve(listData);
+          } else if (this.status !== 200 ){
+            // Ignore error in this case.
+            reject('Error!');
+          }
+        };
+        xhr.send();
+      }).bind(this));
+    }
+    
+  };
 
-})();
+  exports.ToDoListManager = ToDoListManager;
+})(window);
diff --git a/homework/main.js b/homework/main.js
new file mode 100644
index 0000000..ba6648d
--- /dev/null
+++ b/homework/main.js
@@ -0,0 +1,8 @@
+'use strict';
+
+document.addEventListener('DOMContentLoaded',function(event){
+  var  ToDoContentManager = new ToDoContentManager();
+  var  ToDoListManager = new ToDoListManager();
+  ToDoContentManager.start();
+  ToDoListManager.start();
+});
diff --git a/homework/test/test-list.js b/homework/test/test-list.js
index 441fc45..8336fc3 100644
--- a/homework/test/test-list.js
+++ b/homework/test/test-list.js
@@ -1,8 +1,12 @@
-describe('Test > ', function() {
+describe('Test ToDoListManager ', function() {
+  var subject;
   beforeEach(function() {
+      subject = new ToDoListManager();
   });
 
   it('will test some pure functions', function() {
-    // Write any pure function assertion here.
+    var test = subject;
+    var sum = test.puerFunction(1,1);
+    assert.equal(sum,2,'It is equal to 2!');
   });
 });