diff --git a/src/Components/Button.js b/src/Components/Button.js
index f8f0462..86ba0f9 100644
--- a/src/Components/Button.js
+++ b/src/Components/Button.js
@@ -1,6 +1,6 @@
 export default function Button(props){
 
     return(
-        <button onClick={props.handleInput}>{props.children}</button>
+        <button className="button" id={props.id} 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 ac6c629..f70addc 100644
--- a/src/Components/Calculator.js
+++ b/src/Components/Calculator.js
@@ -2,12 +2,20 @@ import { useState } from "react";
 import KeyPad from "./KeyPad";
 
 export default function Calculator(props){
-    const [main,setMain] = useState(0)
-    const [memory,setMemory] = useState(0)
+    const [main,setMain] = useState("0")
+    const [memory,setMemory] = useState("0")
     const [operation,setOperation] = useState("")
 
     const map = {
-        conc:(numberString)=>{setMain(prev=>prev+numberString)},
+        conc:(numberString)=>{
+            if(main[0]==="0"){
+                console.log("STARTS WITH ZERO")
+                setMain(prev=>prev.slice(1)+numberString)
+            }else{
+                setMain(prev=>prev+numberString)
+            }
+
+        },
 
         zero:function(){this.conc("0")},
         one:function(){this.conc("1")},
@@ -20,7 +28,7 @@ export default function Calculator(props){
         eight:function(){this.conc("8")},
         nine:function(){this.conc("9")},
         decimal:function(){
-            if(!/./g.test(main)){
+            if(!/\./g.test(main)){
                 this.conc(".")
             }  
         },
@@ -40,9 +48,20 @@ export default function Calculator(props){
         add:(a,b)=>{return a+b},
         subtract:(a,b)=>{return a-b},
         multiply:(a,b)=>{return a*b},
-        divide:(a,b)=>{return a/b},
-        },   
-        equals:()=>{setMain(prev=>{this.operations[operation](prev,memory)})}
+        divide:(a,b)=>{return b/a},
+        }, 
+        
+        clear:()=>{
+            setMain("0")
+            setMemory("0")
+            setOperation("")
+        },
+        equals:function(){        
+            setMain(prev=>{
+                return this.operations[operation](parseInt(prev),parseInt(memory)).toString()
+            })
+            setOperation("")
+        }
     } 
 
     function handleInput(content){  
@@ -53,9 +72,9 @@ export default function Calculator(props){
 
     return(
         <>
-        <div id="display">
+        <div id="display-container">
             <p id="memory">{memory}</p>
-            <p id="main">{main}</p>
+            <p id="display">{main}</p>
             <p id="operation">{operation}</p>
         </div>
         <KeyPad handleInput={handleInput}/>
diff --git a/src/Components/KeyPad.js b/src/Components/KeyPad.js
index e723b56..ebd24b2 100644
--- a/src/Components/KeyPad.js
+++ b/src/Components/KeyPad.js
@@ -22,23 +22,37 @@ export default function NumPad(props){
         
     }
 
+    const functionMap = {
+        clear:"C",
+        equals:"="
+    }
 
+    function buildButtons(map){
+        return Object.keys(map).map((e,i)=>{
+            return(
+                <Button 
+                    id={e} 
+                    content={map[e]} 
+                    key={e+i} 
+                    handleInput={()=>props.handleInput(e)}>
+                    {map[e]}
+                </Button>
+            )
+        })
+    }
 
-    const numPad = Object.keys(numberMap).map((e,i)=>{
-        return(
-            <Button 
-                id={e} 
-                content={numberMap[e]} 
-                key={"numPad"+e} 
-                handleInput={()=>props.handleInput(e)}>
-                {numberMap[e]}
-            </Button>
-        )
-    })
 
     return(
-        <div className="numPad">
-        {numPad}
+        <div className="keypad">
+        <div className="num-pad">
+        {buildButtons(numberMap)}
+        </div>
+        <div className="operator-pad">
+        {buildButtons(operatorMap)}
+        </div>
+        <div className="function-pad">
+        {buildButtons(functionMap)}
+        </div>
         </div>
     )
 }
\ No newline at end of file