diff --git a/src/main/java/smells/calculator/Calculator.java b/src/main/java/smells/calculator/Calculator.java
new file mode 100644
index 0000000..831831c
--- /dev/null
+++ b/src/main/java/smells/calculator/Calculator.java
@@ -0,0 +1,80 @@
+package smells.calculator;
+
+import java.util.Scanner;
+
+public class Calculator extends SuperCalculator {
+
+    private String resultAsText;
+
+    public final static int MULTIPLIER = 10;
+
+    public static void main(String[] args) {
+        new Calculator().runProgram();
+    }
+
+    public double addition(double a, double b) {
+        return a + b;
+    }
+
+    public double multiplication(double a, double b, double c) {
+        return a * b;
+    }
+
+    public double multiplication(double a, double b) { return multiplication(a, b, 42); }
+
+    public double subtraction(double a, double b) {
+        return a - b;
+    }
+
+    public double division(double a, double b) {
+        return a / b;
+    }
+
+    public void runProgram() {
+        println("The calculator is ready to calculate!");
+
+        Scanner inp= new Scanner(System.in);
+        int num1;
+        int num2;
+        println("Enter first number:");
+        num1 = inp.nextInt();
+        println("Enter second number:");
+        num2 = inp.nextInt();
+
+        println("Enter your selection: 1 for addition, 2 for subtraction, 3 for multiplication and 4 for division:");
+        int choose;
+        choose = inp.nextInt();
+
+        switch (choose){
+            case 1:
+                println("The result of the addition is:");
+                println(addition( num1,num2));
+                break;
+            case 2:
+                println("The result of the subtraction is:");
+                println(subtraction( num1,num2));
+                break;
+            case 3:
+                println("The result of the multiplication is:");
+                println(multiplication( num1,num2));
+                break;
+            case 4:
+                println("The result of the division is:");
+                println(division( num1,num2));
+                break;
+            default:
+                println("Illegal Operation");
+        }
+
+        inp.close();
+        println("Thank you for using this awesome calculator.");
+    }
+
+    private void println(Object object) {
+        System.out.println(object);
+    }
+
+}
+//
+
+
diff --git a/src/main/java/smells/calculator/SuperCalculator.java b/src/main/java/smells/calculator/SuperCalculator.java
new file mode 100644
index 0000000..47d2e3e
--- /dev/null
+++ b/src/main/java/smells/calculator/SuperCalculator.java
@@ -0,0 +1,4 @@
+package smells.calculator;
+
+public class SuperCalculator {
+}
diff --git a/src/main/java/smells/commentedoutcode/CommentedOutCode.java b/src/main/java/smells/commentedoutcode/CommentedOutCode.java
index 1bb28ad..adafed2 100644
--- a/src/main/java/smells/commentedoutcode/CommentedOutCode.java
+++ b/src/main/java/smells/commentedoutcode/CommentedOutCode.java
@@ -25,3 +25,4 @@ protected int calculateSomething() {
 	}
 	
 }
+//
\ No newline at end of file
diff --git a/src/main/java/smells/incorrectorderofmodifiers/IncorrectOrderOfModifiers.java b/src/main/java/smells/incorrectorderofmodifiers/IncorrectOrderOfModifiers.java
index ea2abe9..7e8abf5 100644
--- a/src/main/java/smells/incorrectorderofmodifiers/IncorrectOrderOfModifiers.java
+++ b/src/main/java/smells/incorrectorderofmodifiers/IncorrectOrderOfModifiers.java
@@ -21,3 +21,4 @@ protected int getMultiplier() {
 	}
 
 }
+//
diff --git a/src/main/java/smells/localvariableimmediatelyreturned/LocalVariableImmediatelyReturned.java b/src/main/java/smells/localvariableimmediatelyreturned/LocalVariableImmediatelyReturned.java
index 3053ede..481f0b9 100644
--- a/src/main/java/smells/localvariableimmediatelyreturned/LocalVariableImmediatelyReturned.java
+++ b/src/main/java/smells/localvariableimmediatelyreturned/LocalVariableImmediatelyReturned.java
@@ -12,3 +12,4 @@ protected int multiply(int a, int b) {
 	}
 
 }
+//
\ No newline at end of file
diff --git a/src/main/java/smells/methodtoolong/MethodTooLong.java b/src/main/java/smells/methodtoolong/MethodTooLong.java
index 3354e41..55d25bc 100644
--- a/src/main/java/smells/methodtoolong/MethodTooLong.java
+++ b/src/main/java/smells/methodtoolong/MethodTooLong.java
@@ -65,3 +65,4 @@ private void println(Object object) {
 	}
 
 }
+//
\ No newline at end of file
diff --git a/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotation.java b/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotation.java
index acb27e1..f913964 100644
--- a/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotation.java
+++ b/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotation.java
@@ -14,3 +14,4 @@ public double addition(double a, double b) {
 	}
 
 }
+//
\ No newline at end of file
diff --git a/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotationSuperClass.java b/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotationSuperClass.java
index 64d2336..70c46fb 100644
--- a/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotationSuperClass.java
+++ b/src/main/java/smells/missingoverrideannotation/MissingOverrideAnnotationSuperClass.java
@@ -13,3 +13,4 @@ public double addition(double a, double b) {
 	}
 	
 }
+//
\ No newline at end of file
diff --git a/src/main/java/smells/unusedmethodparameter/UnusedMethodParameter.java b/src/main/java/smells/unusedmethodparameter/UnusedMethodParameter.java
index b3e4a2b..308d7f9 100644
--- a/src/main/java/smells/unusedmethodparameter/UnusedMethodParameter.java
+++ b/src/main/java/smells/unusedmethodparameter/UnusedMethodParameter.java
@@ -27,3 +27,4 @@ protected int calculateSomethingElse() {
 	}
 
 }
+//
\ No newline at end of file
diff --git a/src/main/java/smells/unusedprivatefield/UnusedPrivateField.java b/src/main/java/smells/unusedprivatefield/UnusedPrivateField.java
index 0cc170f..e300dd0 100644
--- a/src/main/java/smells/unusedprivatefield/UnusedPrivateField.java
+++ b/src/main/java/smells/unusedprivatefield/UnusedPrivateField.java
@@ -18,3 +18,4 @@ public UnusedPrivateField() {
 	}
 	
 }
+//
\ No newline at end of file