diff --git a/bitcore.js b/bitcore.js
index 3b01f7a..7bc20e5 100644
--- a/bitcore.js
+++ b/bitcore.js
@@ -5,7 +5,7 @@
 
 module.exports.bignum = require('bignum');
 module.exports.base58 = require('base58-native');
-//module.exports.Address = require('./Address');
+module.exports.Address = require('./Address');
 
 
 
diff --git a/test/index.html b/test/index.html
index 773d3ff..726aa39 100644
--- a/test/index.html
+++ b/test/index.html
@@ -16,6 +16,7 @@
 
     <script src="test.main.js"></script>
     <script src="test.base58.js"></script>
+    <script src="test.Address.js"></script>
     <script>
       mocha.run();
     </script>
diff --git a/test/test.Address.js b/test/test.Address.js
new file mode 100644
index 0000000..c70818f
--- /dev/null
+++ b/test/test.Address.js
@@ -0,0 +1,24 @@
+'use strict';
+
+var chai = require('chai');
+var bitcore = require('../bitcore');
+
+var expect = chai.expect;
+var should = chai.should();
+
+var Address = bitcore.Address.class();
+
+describe('Address', function() {
+  it('should initialze the main object', function() {
+    should.exist(Address);
+  });
+  it('should create a bignum from string', function() {
+  });
+  it('should perform basic math operations', function() {
+  });
+});
+
+
+
+
+