diff --git a/index.html b/index.html
index 935c09e..f147b9c 100644
--- a/index.html
+++ b/index.html
@@ -1,46 +1,44 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Calculator</title>
+    <link rel="stylesheet" href="style.css" />
+  </head>
 
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Calculator</title>
-  <link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-  <div class="calculator">
-    <div class="display">&nbsp;</div>
-    <div class="buttons">
-      <div class="row">
-        <button class="number" id="number-7">7</button>
-        <button class="number" id="number-8">8</button>
-        <button class="number" id="number-9">9</button>
-      </div>
-      <div class="row">
-        <button class="number" id="number-4">4</button>
-        <button class="number" id="number-5">5</button>
-        <button class="number" id="number-6">6</button>
-      </div>
-      <div class="row">
-        <button class="number" id="number-1">1</button>
-        <button class="number" id="number-2">2</button>
-        <button class="number" id="number-3">3</button>
-      </div>
-      <div class="row operations">
-        <!-- <button id="add">+</button>
-        <button id="subtract">-</button>
-        <button id="multiply">*</button>
-        <button id="divide">/</button> -->
-      </div>
-      <div class="row last-row">
-        <button id="clear">C</button>
-        <button class="number" id="number-0">0</button>
-        <button id="equal">=</button>
+  <body>
+    <div class="calculator">
+      <div class="display">&nbsp;</div>
+      <div class="buttons">
+        <div class="row">
+          <button class="number" id="number-7">7</button>
+          <button class="number" id="number-8">8</button>
+          <button class="number" id="number-9">9</button>
+        </div>
+        <div class="row">
+          <button class="number" id="number-4">4</button>
+          <button class="number" id="number-5">5</button>
+          <button class="number" id="number-6">6</button>
+        </div>
+        <div class="row">
+          <button class="number" id="number-1">1</button>
+          <button class="number" id="number-2">2</button>
+          <button class="number" id="number-3">3</button>
+        </div>
+        <div class="row operations">
+          <button id="add">+</button>
+          <button id="subtract">-</button>
+          <button id="multiply">*</button>
+          <button id="divide">/</button>
+        </div>
+        <div class="row last-row">
+          <button id="clear">C</button>
+          <button class="number" id="number-0">0</button>
+          <button id="equal">=</button>
+        </div>
       </div>
     </div>
-  </div>
-  <script src="script.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+    <script src="script.js"></script>
+  </body>
+</html>
diff --git a/script.js b/script.js
new file mode 100644
index 0000000..237f85e
--- /dev/null
+++ b/script.js
@@ -0,0 +1,77 @@
+/* **************************************************** 
+*               DevClub excercise 2               
+*                   CALCULATOR  
+/* **************************************************** 
+ *  This file implements the logic of a caluclator 
+ *  that can do 4 basic operations: (+), (-), (*), (/) 
+/* **************************************************** */
+
+let operand;
+let operator;
+let result;
+
+const display = document.querySelector('.display');
+const numbers = document.querySelectorAll('.number');
+const operators = document.querySelectorAll('.row.operations button');
+
+numbers.forEach((numButton) => {
+  numButton.addEventListener('click', () => {
+    if (display.textContent === '0') {
+      display.textContent = '';
+    }
+
+    operand += numButton.textContent;
+
+    display.textContent += numButton.textContent;
+  });
+});
+
+operators.forEach((button) => {
+  button.addEventListener('click', () => {
+    calc();
+
+    operator = button.textContent;
+    display.textContent = result + operator;
+  });
+});
+
+clear.addEventListener('click', handleClear);
+
+equal.addEventListener('click', () => {
+  calc();
+  display.textContent = result;
+  operand = result;
+  result = 0;
+});
+
+handleClear();
+
+function calc() {
+  switch (operator) {
+    case '+':
+      result = result + parseInt(operand);
+      break;
+    case '-':
+      result = result - parseInt(operand);
+      break;
+    case '*':
+      result = result * parseInt(operand);
+      break;
+    case '/':
+      result = result / parseInt(operand);
+      break;
+    default:
+      result = parseInt(operand);
+  }
+
+  operand = '';
+  operator = '';
+}
+
+function handleClear() {
+  operator = '';
+  operand = '';
+  result = 0;
+
+  display.textContent = '0';
+}
