diff --git a/homework/content.js b/homework/content.js
index 710be28..9f37fec 100644
--- a/homework/content.js
+++ b/homework/content.js
@@ -1,37 +1,40 @@
 'use strict';
 
-(function() {
-  var _wrapper = document.querySelector('#note-content-wrapper');
-
-  function start() {
-    window.addEventListener('note-open', function(event) {
-      var note = event.detail;
-      resetWrapper();
-      drawNote(note);
-    });
-  }
-
-  function resetWrapper() {
-    _wrapper.innerHTML = '';
+(function(exports) {
+	var ContentManager = function () {
+	this._wrapper = document.querySelector('#note-content-wrapper'}
+  
   }
 
-  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);
-  }
+  ContentManager.prototype = {
+	start(){
+		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.appendChid(p);
+	});
+	this._wrapper.appendChid(h);
+	this._wrapper.appendChid(buff);
+   }
+  };
 
-  document.addEventListener('DOMContentLoaded', function(event) {
-    start();
-  });
-})();
+	exports.ContentManager = ContentManager;
+	})(window);
\ No newline at end of file
diff --git a/homework/index.html b/homework/index.html
index e387963..108faf4 100644
--- a/homework/index.html
+++ b/homework/index.html
@@ -5,6 +5,7 @@
   <title> Homework - Note List </title>
   <script defer src="list.js"></script>
   <script defer src="content.js"></script>
+  <script defer src="main.js"></scipt>
   <link rel="stylesheet" type="text/css" href="main.css" />
 </head>
 <body>
diff --git a/homework/list.js b/homework/list.js
index 21eddbc..28ad48e 100644
--- a/homework/list.js
+++ b/homework/list.js
@@ -1,79 +1,83 @@
 'use strict';
 
-(function() {
+(function(exports) {
 
-  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')) {
-      var id = event.target.dataset.noteId;
-      var content = _listNoteContent[id];
-      window.dispatchEvent(new CustomEvent('note-open',
-        { detail: content }));
-    };
-  }
-
-  function preloadFirstNote() {
-    if (_listNoteContent.length !== 0) {
-      var content = _listNoteContent[0];
-      window.dispatchEvent(new CustomEvent('note-open',
-        { detail: content }));
-    }
+	var ListManager = function();
+	 this._listNoteContent = [];
+	 this._wrapper = document.querySelector('#note-list-wrapper');
   }
 
-  function updateList(list) {
-    _listNoteContent = list;
-  }
+  ListManager.prototype = {
+  start(){
+  this.fetchList()
+  .then((function)(data){
+  this.updateList(data);
+  this.drawList();
+  this.preloadFirstNote();
+  }).bind(this))
+  .catch((function(){
+  
+  }).bind(this) );
+  
+  window.addEventListener('click',(function(event){
+  this.onNote(event);
+  }).bind(this))
+  },
 
-  function drawList() {
-    var list = _listNoteContent;
-    var ul = document.createElement('ul');
-    ul.id = 'note-title-list';
-    var buff = document.createDocumentFragment();
-    list.forEach(function(note, i) {
-      var li = document.createElement('li');
-      li.dataset.noteId = i;
-      li.classList.add('note-title');
-      li.textContent = note.title;
-      // Note: buff is captured, so we now have a
-      // little closure naturally.
-      buff.appendChild(li);
-    });
-    ul.appendChild(buff);
-    _wrapper.appendChild(ul);
-  }
+  onNoteOpen(event){
+   if(event.target.classList,contains('note-title')){
+   var id = event.target.dataset.noteId;
+   vat content = this._listNoteContent[id];
+   window.dispatchEvent(new CustomEvent('note-open',
+	detail: content}));
+	};
+ },
+  
+  preloadFirstNote(){
+	if(this.listNoteContent.lenght !== 0){
+	var content = this._listNoteContent[0];
+	window.dispatchEvent(new CustomEvent('note-open',
+		{detail: content}));
+	}
+  },
+  
+  updateList(List){
+	this.listNoteContent = List;
+  },
 
-  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();
+  drawList(){
+  var List = this._listNoteContent;
+  var ul = document.createElement('ul');
+  ul.id = 'note=title-list';
+  var buff = document.createDocumentFragment();
+  list.forEach(function(note, i ){
+  var li  = document.createElement('li');
+  li.dataset.noteId = i;
+  li.classList.add('note-title');
+  li.textContent = note.title;
+  buff.appendChild(li);
   });
+  ul.appendChild(buff);
+  this._wrapper.appendChild(ul);
+  },
+  
+  fetchList(){
+	return new Promise(function(resolve, reject){
+		var xhr = new XMLHttpRequest();
+		xhr.open('GET','http://127.0.1:8000/demo-list-notes.json',true);
+		xhr.responseType = 'json';
+		xhr.onreadystatechange=function(e){
+			if(xhr.readyState==&& xhr.status==200){
+			resolve(xhr.response);
+			}else if (xhr.status !=200){
+			reject(xhr);
+			}
+		};
+		xhr.send();
+		});
+	}
+  }
+  
 
-})();
+  exports.ListManager = ListManager
+})(window);
diff --git a/homework/main.js b/homework/main.js
new file mode 100644
index 0000000..649c836
--- /dev/null
+++ b/homework/main.js
@@ -0,0 +1,8 @@
+'use strict' 
+
+document.addEventListener('DOMContentLoaded',function(event){
+	var contentManager = new ContentManager();
+	var listManager = new ListManager();
+	contentManager.start();
+	listManager.start();
+});
\ No newline at end of file
diff --git a/homework/test/test-list.js b/homework/test/test-list.js
index 441fc45..4be3840 100644
--- a/homework/test/test-list.js
+++ b/homework/test/test-list.js
@@ -1,8 +1,13 @@
-describe('Test > ', function() {
+var assert = require('assert');
+
+describe('Test Math',function(){
   beforeEach(function() {
   });
 
-  it('will test some pure functions', function() {
-    // Write any pure function assertion here.
+  it('Calculate the Maximum num', function() {
+    var small = 1;
+	var big = 10;
+	var maxNumber = Math.max(big,small);
+	assert.equal(maxNumber,big);
   });
 });
