diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..f7f7b2ad
Binary files /dev/null and b/.DS_Store differ
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 00000000..6853a3ee
Binary files /dev/null and b/src/.DS_Store differ
diff --git a/src/main/.DS_Store b/src/main/.DS_Store
new file mode 100644
index 00000000..5062015a
Binary files /dev/null and b/src/main/.DS_Store differ
diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
new file mode 100644
index 00000000..f00ff078
Binary files /dev/null and b/src/main/java/.DS_Store differ
diff --git a/src/main/java/com/.DS_Store b/src/main/java/com/.DS_Store
new file mode 100644
index 00000000..79e014bc
Binary files /dev/null and b/src/main/java/com/.DS_Store differ
diff --git a/src/main/java/com/zipcodewilmington/.DS_Store b/src/main/java/com/zipcodewilmington/.DS_Store
new file mode 100644
index 00000000..c61fb8ec
Binary files /dev/null and b/src/main/java/com/zipcodewilmington/.DS_Store differ
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/.DS_Store b/src/main/java/com/zipcodewilmington/scientificcalculator/.DS_Store
new file mode 100644
index 00000000..f20ab098
Binary files /dev/null and b/src/main/java/com/zipcodewilmington/scientificcalculator/.DS_Store differ
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 83f0e97f..081c603d 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -2,6 +2,7 @@
 
 import java.util.Scanner;
 
+
 /**
  * Created by leon on 2/9/18.
  */
@@ -23,10 +24,27 @@ public static String getStringInput(String prompt) {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Integer userInput = Integer.valueOf(scanner.nextLine());
+        return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Double userInput = Double.valueOf(scanner.nextLine());
+        return userInput;
+
+                /*
+        String s = Console.getStringInput("Enter a string");
+        Integer i = Console.getIntegerInput("Enter an integer");
+        Double d = Console.getDoubleInput("Enter a double.");
+
+        Console.println("The user input %s as a string", s);
+        Console.println("The user input %s as a integer", i);
+        Console.println("The user input %s as a d", d);
+
+         */
     }
 }
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java
new file mode 100644
index 00000000..e9adf02f
--- /dev/null
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java
@@ -0,0 +1,84 @@
+package com.zipcodewilmington.scientificcalculator;
+
+import java.util.Scanner;
+
+public class CoreFeatures {
+    public static void provideOptions() {
+
+        System.out.println("Please select an option");
+        System.out.println("clearDisplay  currrentDisplay  basicOperation\n" +
+                " square  squareRoot  exponents  invert");
+        Scanner scanner = new Scanner(System.in);
+        String selection = String.valueOf(scanner.nextLine());
+        userChoice(selection);
+    }
+    public static void userChoice(String selection){
+        if(selection.equalsIgnoreCase("cleardisplay")){
+            MainApplication.currentNumber = 0;
+            System.out.println(MainApplication.currentNumber);
+            MainApplication.getUserInput();
+            provideOptions();
+        }else if(selection.equalsIgnoreCase("currentdisplay")) {
+            System.out.println(MainApplication.currentNumber);
+            MainApplication.getUserInput();
+            provideOptions();
+        }else if(selection.equalsIgnoreCase("basicoperation")) {
+            basicoperations();
+        }else if(selection.equalsIgnoreCase("square")) {
+            square();
+        }else if(selection.equalsIgnoreCase("squareroot")) {
+            squareroot();
+        }else if(selection.equalsIgnoreCase("exponents")) {
+            exponents();
+        }else if(selection.equalsIgnoreCase("invert")) {
+            invert();
+        }else if(selection.equalsIgnoreCase("Scientific")){
+            //scientificFunctions.
+        }else{
+            System.out.println("Invalid Choice, Please try again");
+            provideOptions();
+        }
+
+    }
+    public static void basicoperations(){
+        System.out.println("Please enter an operation to use.");
+        Scanner scanner = new Scanner(System.in);
+        String selection = String.valueOf(scanner.nextLine());
+        if(selection.equals("+")){
+             double output = (MainApplication.currentNumber + MainApplication.getUserInput());
+             MainApplication.printNumber(output);
+            provideOptions();
+        }else if(selection.equals("-")){
+            double output = (MainApplication.currentNumber - MainApplication.getUserInput());
+            MainApplication.printNumber((output));
+            provideOptions();
+        }else if(selection.equals("*")){
+            double output = (MainApplication.currentNumber * MainApplication.getUserInput());
+            MainApplication.printNumber((output));
+            provideOptions();
+        }else if(selection.equals("/")){
+            double number2 = MainApplication.getUserInput();
+            double output = (MainApplication.currentNumber / number2);
+            MainApplication.printNumber((output));
+            provideOptions();
+        }else {
+            System.out.println("invalid choice, please choose again");
+            basicoperations();
+        }
+
+    }
+    public static void square(){
+        double output = (MainApplication.currentNumber * MainApplication.currentNumber);
+        MainApplication.printNumber(output);
+        provideOptions();
+    }
+    public static void squareroot(){
+
+    }
+    public static void exponents(){
+
+    }
+    public static void invert(){
+
+    }
+}
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
index 5f421325..0f590be6 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
@@ -1,17 +1,42 @@
 package com.zipcodewilmington.scientificcalculator;
 
+import java.util.Scanner;
+
 /**
  * Created by leon on 2/9/18.
  */
 public class MainApplication {
+
+    double userInput;
+    double savedNumber;
+    static double currentNumber;
+    static double output;
+
+//how does git work
+
     public static void main(String[] args) {
-        Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
-        Integer i = Console.getIntegerInput("Enter an integer");
-        Double d = Console.getDoubleInput("Enter a double.");
-
-        Console.println("The user input %s as a string", s);
-        Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
+        int startingNumber = 0;
+
+        Console.println("Welcome to our calculator!");
+        System.out.println(startingNumber);
+        currentNumber = getUserInput();
+        printNumber(currentNumber);
+        CoreFeatures.provideOptions();
+
     }
-}
+    public static double getUserInput() {
+        System.out.println("Please input a number");
+        Scanner scanner = new Scanner(System.in);
+        Double userInput = Double.valueOf(scanner.nextLine());
+        return userInput;
+    }
+    public static void printNumber(double output){
+
+        System.out.println(output);
+
+
+    }
+
+    }
+
+