diff --git a/style.css b/index.css
similarity index 100%
rename from style.css
rename to index.css
diff --git a/index.html b/index.html
index 063ab98..366bb8c 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="stylesheet" href="style.css">
-  <!-- <script src="main.js"></script> -->
+  <script src="index.js"></script>
   <title>Document</title>
 </head>
 <body>
@@ -18,9 +18,9 @@
       <!-- the "onclick" event listener passes its element's "id" to the "changeOperation" function in the main.js file -->
       <button type="button" name="add" id="addition" onclick="changeOperation(this.id)">Add</button>
       <button type="button" name="subtract" id="subtraction" onclick="changeOperation(this.id)">Subtract</button>
-      <button type="button" name="multiply" id="multiplication">Multiply</button>
-      <button type="button" name="divide" id="division">Divide</button>
-      <button type="button" name="modulus" id="modulus">Modulus</button>
+      <button type="button" name="multiply" id="multiplication" onclick="changeOperation(this.id)">Multiply</button>
+      <button type="button" name="divide" id="division" onclick="changeOperation(this.id)">Divide</button>
+      <button type="button" name="modulus" id="modulus" onclick="changeOperation(this.id)">Modulus</button>
     </div>
     <br>
     <!-- this "onclick" calls the "equal" function in the main.js file -->
diff --git a/main.js b/index.js
similarity index 78%
rename from main.js
rename to index.js
index bf60c18..6580f98 100644
--- a/main.js
+++ b/index.js
@@ -30,15 +30,24 @@ const subtract = (numA, numB) => {
 // These variables are already defined but that don't point to functions. It's up to you to build the functions to complete your calculator use:
 
 const multiply = (numA, numB) => {
+  const multiply = (numA * numB)
+  return multiply
   // * to get a product then return it
   // Open up the inspector tool in Chrome and select the Console tab to see what this functions is "logging out" to the console.
-  console.log(numA, numB)
 }
 
-const divide = null
+const divide = (numA, numB) => {
+  const divide = (numA / numB)
+  return divide
+}
+ 
 // / to get a quotient,
 
-const modulus = null
+const modulus = (numA, numB) => {
+  const modulus = (numA % numB)
+  return modulus
+}
+
 // and % to get a remainder.
 
 // This function changes the "operation" variable to be equal to the "id" of the button we choose on the web page.
@@ -59,18 +68,27 @@ const putResultInElement = (operationResults) => {
 
 // The function uses the value of "operation" variable to determine which operation function it should use on the number: add, subtract, multiply, divide, or modulus
 const equals = () => {
+  if (!firstNum) {
+    firstNum = parseInt(document.getElementById("first-Number").value)
+  }
+
+  if (!secondNum) {
+    secondNum = parseInt(document.getElementById("second-Number").value)
+  }
+  
+  console.log(firstNum, secondNum);
   switch (operation) {
     case "addition":  putResultInElement(add(firstNum, secondNum)) 
     break;
     case "subtraction": putResultInElement(subtract(firstNum, secondNum)) 
     break;
-    case "multiplication": multiply(firstNum, secondNum) 
+    case "multiplication": putResultInElement(multiply(firstNum, secondNum))
     break;
-    case "division": console.log(divide(firstNum, secondNum)) 
+    case "division": putResultInElement(divide(firstNum, secondNum)) 
     break;
-    case "modulus": console.log(modulus(firstNum, secondNum)) 
+    case "modulus": putResultInElement(modulus(firstNum, secondNum)) 
     break;
-    default: "Choose an operation"
+    default: alert("Choose an operation")
   }
 }
 
