diff --git a/08_calculator/calculator.js b/08_calculator/calculator.js
index c22e8d28640..1fc13306a55 100644
--- a/08_calculator/calculator.js
+++ b/08_calculator/calculator.js
@@ -1,25 +1,40 @@
-const add = function() {
-	
+const add = function(num1, num2) {
+	return num1 + num2;
 };
 
-const subtract = function() {
-	
+const subtract = function(num1, num2) {
+	return num1 - num2;
 };
 
-const sum = function() {
-	
+const sum = function(args) {
+  if(args.length === 0) {
+    return 0;
+  }
+  return args.reduce((acc, curr) => acc + parseInt(curr));
 };
 
-const multiply = function() {
+const multiply = function(args) {
+  if(args.length === null) {
+    return 0;
+  }
+
+  return args.reduce(((a, b) => a = a * b));
 
 };
 
-const power = function() {
-	
+const power = function(num, exp) {
+  return num**exp;
 };
 
-const factorial = function() {
-	
+const factorial = function(num) {
+	let sum = 1; 
+  while(true) {
+    if(num === 0) {
+      return sum;
+    }
+    sum=sum*num;
+    num--;
+  }
 };
 
 // Do not edit below this line
diff --git a/08_calculator/calculator.spec.js b/08_calculator/calculator.spec.js
index 48b08c9cb70..59956fe70cc 100644
--- a/08_calculator/calculator.spec.js
+++ b/08_calculator/calculator.spec.js
@@ -5,73 +5,73 @@ describe('add', () => {
     expect(calculator.add(0, 0)).toBe(0);
   });
 
-  test.skip('adds 2 and 2', () => {
+  test('adds 2 and 2', () => {
     expect(calculator.add(2, 2)).toBe(4);
   });
 
-  test.skip('adds positive numbers', () => {
+  test('adds positive numbers', () => {
     expect(calculator.add(2, 6)).toBe(8);
   });
 });
 
 describe('subtract', () => {
-  test.skip('subtracts numbers', () => {
+  test('subtracts numbers', () => {
     expect(calculator.subtract(10, 4)).toBe(6);
   });
 });
 
 describe('sum', () => {
-  test.skip('computes the sum of an empty array', () => {
+  test('computes the sum of an empty array', () => {
     expect(calculator.sum([])).toBe(0);
   });
 
-  test.skip('computes the sum of an array of one number', () => {
+  test('computes the sum of an array of one number', () => {
     expect(calculator.sum([7])).toBe(7);
   });
 
-  test.skip('computes the sum of an array of two numbers', () => {
+  test('computes the sum of an array of two numbers', () => {
     expect(calculator.sum([7, 11])).toBe(18);
   });
 
-  test.skip('computes the sum of an array of many numbers', () => {
+  test('computes the sum of an array of many numbers', () => {
     expect(calculator.sum([1, 3, 5, 7, 9])).toBe(25);
   });
 });
 
 describe('multiply', () => {
-  test.skip('multiplies two numbers', () => {
+  test('multiplies two numbers', () => {
     expect(calculator.multiply([2, 4])).toBe(8);
   });
 
-  test.skip('multiplies several numbers', () => {
+  test('multiplies several numbers', () => {
     expect(calculator.multiply([2, 4, 6, 8, 10, 12, 14])).toBe(645120);
   });
 });
 
 describe('power', () => {
-  test.skip('raises one number to the power of another number', () => {
+  test('raises one number to the power of another number', () => {
     expect(calculator.power(4, 3)).toBe(64); // 4 to third power is 64
   });
 });
 
 describe('factorial', () => {
-  test.skip('computes the factorial of 0', () => {
+  test('computes the factorial of 0', () => {
     expect(calculator.factorial(0)).toBe(1); // 0! = 1
   });
 
-  test.skip('computes the factorial of 1', () => {
+  test('computes the factorial of 1', () => {
     expect(calculator.factorial(1)).toBe(1);
   });
 
-  test.skip('computes the factorial of 2', () => {
+  test('computes the factorial of 2', () => {
     expect(calculator.factorial(2)).toBe(2);
   });
 
-  test.skip('computes the factorial of 5', () => {
+  test('computes the factorial of 5', () => {
     expect(calculator.factorial(5)).toBe(120);
   });
 
-  test.skip('computes the factorial of 10', () => {
+  test('computes the factorial of 10', () => {
     expect(calculator.factorial(10)).toBe(3628800);
   });
 });