diff --git a/src/Components/Button.js b/src/Components/Button.js
index 40d5f7d..f8f0462 100644
--- a/src/Components/Button.js
+++ b/src/Components/Button.js
@@ -1,6 +1,6 @@
 export default function Button(props){
 
     return(
-        <button>{props.children}</button>
+        <button onClick={props.handleInput}>{props.children}</button>
     )
 }
\ No newline at end of file
diff --git a/src/Components/Calculator.js b/src/Components/Calculator.js
index fdf01d8..ac6c629 100644
--- a/src/Components/Calculator.js
+++ b/src/Components/Calculator.js
@@ -1,6 +1,5 @@
 import { useState } from "react";
-import NumPad from "./NumPad";
-import Operators from "./Operators";
+import KeyPad from "./KeyPad";
 
 export default function Calculator(props){
     const [main,setMain] = useState(0)
@@ -10,26 +9,26 @@ export default function Calculator(props){
     const map = {
         conc:(numberString)=>{setMain(prev=>prev+numberString)},
 
-        zero:()=>this.conc("0"),
-        one:()=>this.conc("1"),
-        two:()=>this.conc("2"),
-        three:()=>this.conc("3"),
-        four:()=>this.conc("4"),
-        five:()=>this.conc("5"),
-        six:()=>this.conc("6"),
-        seven:()=>this.conc("7"),
-        eight:()=>this.conc("8"),
-        nine:()=>this.conc("9"),
-        decimal:()=>{
+        zero:function(){this.conc("0")},
+        one:function(){this.conc("1")},
+        two:function(){this.conc("2")},
+        three:function(){this.conc("3")},
+        four:function(){this.conc("4")},
+        five:function(){this.conc("5")},
+        six:function(){this.conc("6")},
+        seven:function(){this.conc("7")},
+        eight:function(){this.conc("8")},
+        nine:function(){this.conc("9")},
+        decimal:function(){
             if(!/./g.test(main)){
                 this.conc(".")
             }  
         },
 
-        add:()=>this.rcvOperator("add"),
-        subtract:()=>this.rcvOperator("subtract"),
-        multiply:()=>this.rcvOperator("multiply"),
-        divide:()=>this.rcvOperator("divide"),
+        add:function(){this.rcvOperator("add")},
+        subtract:function(){this.rcvOperator("subtract")},
+        multiply:function(){this.rcvOperator("multiply")},
+        divide:function(){this.rcvOperator("divide")},
 
         rcvOperator:(operator)=>{
             setMemory(main)
@@ -47,6 +46,7 @@ export default function Calculator(props){
     } 
 
     function handleInput(content){  
+        console.log("handling input!")
         map[content]()
     }
 
@@ -58,8 +58,8 @@ export default function Calculator(props){
             <p id="main">{main}</p>
             <p id="operation">{operation}</p>
         </div>
-        <NumPad handlemain={handleInput}/>
-        <Operators handlemain={handleInput}/>
+        <KeyPad handleInput={handleInput}/>
+
         </>
     )
 }
\ No newline at end of file
diff --git a/src/Components/NumPad.js b/src/Components/KeyPad.js
similarity index 68%
rename from src/Components/NumPad.js
rename to src/Components/KeyPad.js
index d1122aa..e723b56 100644
--- a/src/Components/NumPad.js
+++ b/src/Components/KeyPad.js
@@ -1,6 +1,6 @@
 import Button from "./Button"
 export default function NumPad(props){
-    const map = {
+    const numberMap = {
         zero:0,
         one:1,
         two:2,
@@ -11,20 +11,27 @@ export default function NumPad(props){
         seven:7,
         eight:8,
         nine:9,
+        decimal:"."
+    }
+
+    const operatorMap = {
         add:"+",
         subtract:"-",
         multiply:"x",
         divide:"/",
-        decimal:"."
+        
     }
-    const numPad = Object.keys(map).map((e,i)=>{
+
+
+
+    const numPad = Object.keys(numberMap).map((e,i)=>{
         return(
             <Button 
                 id={e} 
-                content={map[e]} 
+                content={numberMap[e]} 
                 key={"numPad"+e} 
-                handleInput={props.handleInput}>
-                {i}
+                handleInput={()=>props.handleInput(e)}>
+                {numberMap[e]}
             </Button>
         )
     })
diff --git a/src/Components/Operators.js b/src/Components/Operators.js
deleted file mode 100644
index 7ee0180..0000000
--- a/src/Components/Operators.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Button from "./Button";
-export default function Operators(props){
-    const map = {
-        add:"+",
-        subtract:"-",
-        multiply:"x",
-        divide:"/",
-        decimal:"."
-    }
-
-    const operators = Object.keys(map).map(e=>{
-        return <Button  
-                id={e} 
-                content={map[e]}
-                handleInput={props.handleInput} 
-                key={e}>
-                    {map[e]}
-                </Button>
-    })
-
-    return ( <div className="operations-pad">{operators}</div>)
-    
-}
\ No newline at end of file