diff --git a/calculator.cpp b/calculator.cpp
index 3b2266f..d3da50a 100644
--- a/calculator.cpp
+++ b/calculator.cpp
@@ -1,34 +1,36 @@
 // Basic calculator that adds, subtracts, multiplies, and divides
 #include <iostream>
-using std::cin; using std::cout; usind std::endl;
+using std::cin; using std::cout; using std::endl;
 
 int main() {
     char yor = 'y';
     char op;
-    float num1, num2;
+    int num1, num2;
 
+    cin>> num1 >>num2;
+    cin>>op;
 
     switch(op)
     {
 
         case '+': // Adds num1 by num2
-            cout << sub;
+            cout << (num1+num2);
             break;
         case '-': // Subtracts num1 by num2
-            cout << sub;
+            cout << (num1 - num2);
             break;
         case '*': // Multiplies num1 by num2
-            cout << mult;
+            cout << (num1 * num2);
             break;
         case '/': // Divides num1 by num2
 			if (num2 != 0)
-				cout << div;
+				cout << (num1/num2);
 			else
 				cout << "You cannot divide by 0!";
             break;
         case '%': // Returns remainder of num1 divided by num2
 			if (num2 != 0)
-				cout << num1 % num2;
+				cout << (num1 % num2);
 			else
 				cout << "You cannot divide by 0!";
             break;
@@ -41,4 +43,4 @@ int main() {
 	return 0;
 
 
-}
\ No newline at end of file
+}