diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ca34746..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Calculator
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 827ba1e..7ac24c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,16 +3,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Users\Kriti\Other Docs\Desktop\mnnit\Btech 4th Sem\gradle\gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index dcdca1a..297565b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Calculator.iml" filepath="$PROJECT_DIR$/Calculator.iml" />
+      <module fileurl="file://$PROJECT_DIR$/DrStrangeCalculator.iml" filepath="$PROJECT_DIR$/DrStrangeCalculator.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 6564d52..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/DrStrangeCalculator.iml b/DrStrangeCalculator.iml
new file mode 100644
index 0000000..a9d917f
--- /dev/null
+++ b/DrStrangeCalculator.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="DrStrangeCalculator" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 9a3b8a1..0044d44 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,6 +47,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -57,6 +61,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -65,32 +76,29 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="jsr223-api-1.0" level="project" />
+    <orderEntry type="library" exported="" name="rhino-1.7.7.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="rhino-android-1.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index ccf7d1f..30e0f4a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,4 +22,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'io.apisense:rhino-android:1.0'
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 641488f..aea096b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,20 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.calculator" >
+    package="com.example.android.calculator">
+
+    <uses-feature
+        android:name="android.hardware.sensor.accelerometer"
+        android:required="true" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        >
         <activity
+            android:configChanges="orientation|screenSize"
             android:name=".MainActivity"
-            android:label="@string/title_activity_main" >
+            android:label="@string/title_activity_main">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+
+
+
+
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/calculator/MainActivity.java b/app/src/main/java/com/example/android/calculator/MainActivity.java
index 54143e2..63eb9a9 100644
--- a/app/src/main/java/com/example/android/calculator/MainActivity.java
+++ b/app/src/main/java/com/example/android/calculator/MainActivity.java
@@ -1,27 +1,59 @@
 package com.example.android.calculator;
 
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
+
 import android.widget.TextView;
-import android.widget.Toast;
 
-import org.w3c.dom.Text;
+
+
+
+
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+
+
 
 public class MainActivity extends AppCompatActivity {
+    private SensorManager mSensorManager;
+    private Sensor mAccelerometer;
+    private ShakerMethod mShakeDetector;
 Button plus,minus,multiply,divide;
-TextView input_et;
-TextView result_tv;
-double a=0,res=0;
-    boolean set=false;
-char operation='0';
+public static  TextView input_et;
+public static TextView result_tv;
+    double res=0,a=0,previousAnswer=0;
+   // boolean set=false;
+public static char operation='0';
+    public static String expression;
+
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+        mAccelerometer = mSensorManager
+                .getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        mShakeDetector = new ShakerMethod();
+        mShakeDetector.setOnShakeListener(new ShakerMethod.OnShakeListener() {
+
+            @Override
+            public void onShake(int count) {
+                handleShakeEvent(count);
+            }
+        });
+        expression="";
         setContentView(R.layout.activity_main);
         plus=(Button)findViewById(R.id.add);
         minus=(Button)findViewById(R.id.subtract);
@@ -30,6 +62,11 @@ protected void onCreate(Bundle savedInstanceState) {
         input_et=(TextView)findViewById(R.id.input_et);
         result_tv=(TextView)findViewById(R.id.result_tv);
     }
+    public void handleShakeEvent(int count){
+        input_et.setText("0.0");
+        result_tv.setText("0.0");
+        expression="";
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -52,7 +89,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
-    public void display(View view) {
+    public void display(View view) throws ScriptException {
         switch(operation){
             case '+':
                 res+=a;
@@ -66,116 +103,224 @@ public void display(View view) {
             case '/':
                 res/=a;
                 break;
+            case '^':
+                res=Math.pow(res,a);
             default:
                 break;
         }
-        a=res;
-        result_tv.setText(""+res);
+
+        try {
+
+            ScriptEngine engine = new ScriptEngineManager().getEngineByName("rhino");
+            res = (double) engine.eval(correctString(expression));
+            a = res;
+            result_tv.setText("" + res);
+            input_et.setText("0.0");
+            expression="";
+        }
+        catch (Exception e){
+            return;
+        }
+    }
+    public String correctString(String modifiedExpression){
+        for(int i=0;i<expression.length();i++){
+            if(expression.charAt(i)=='^'){
+                modifiedExpression=modifiedExpression.replace(modifiedExpression.substring(i-1,i+2),
+                        "Math.pow("+modifiedExpression.charAt(i-1)+","+modifiedExpression.charAt(i+1)+")");
+            }
+        }
+        return modifiedExpression;
     }
 
+    public void addToMemory(View view){
+        expression="";
+        previousAnswer=res;
+        result_tv.setText("Previous Answer "+previousAnswer);
+        res=0;
+        input_et.setText(Double.toString(res));
+    }
+    public void subtractFromMemory(View view){
+        expression+= previousAnswer+" ";
+        input_et.setText(expression);
+    }
+
+
+    public void power(View view){
+        if(!(expression.charAt(expression.length()-1)=='^')) {
+            res = a;
+            result_tv.setText("" + res);
+            a = 0;
+            operation = '^';
+            expression+=operation;
+
+            input_et.setText(" " + expression);
+        }
+
+    }
+    public void openBrace(View view){
+        if(!(expression.charAt(expression.length()-1)=='(')) {
+            res = a;
+            result_tv.setText("" + res);
+            //set=true;
+            a = 0;
+            expression+="(";
+            input_et.setText(" " + expression);
+        }
+
+    }
+    public void closeBrace(View view){
+        if(!(expression.charAt(expression.length()-1)==')')) {
+            res = a;
+            result_tv.setText("" + res);
+            //set=true;
+            a = 0;
+            expression+=")";
+            input_et.setText(" " + expression);
+        }
+
+    }
+
+
     public void clear(View view){
         res=0;
         a=0;
-        set=false;
+        expression="";
+        //set=false;
         operation= '0';
         result_tv.setText(""+res);
-        input_et.setText(""+a);
+        input_et.setText(" "+expression);
     }
     public void add(View view){
-        if(!set){
-            res=a;
-            result_tv.setText(""+res);
-            set=true;
+        if(!(expression.charAt(expression.length()-1)=='+')) {
+            res = a;
+            result_tv.setText("" + res);
+            //set=true;
+
+            //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show();
+            //  a=Float.parseFloat(input_et.getText().toString());
+            a=0;
+            operation = '+';
+            expression+=operation;
+            input_et.setText(" " + expression);
         }
-      //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show();
-      //  a=Float.parseFloat(input_et.getText().toString());
-        a=0;
-        operation='+';
-        input_et.setText(""+a);
     }
     public void subtract(View view){
-       if(!set){
-           res=a;
-           result_tv.setText(""+res);
-           set=true;
+       if(!(expression.charAt(expression.length()-1)=='-')) {
+           res = a;
+           result_tv.setText("" + res);
+           //set=true;
+
+           //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show();
+           // a=Float.parseFloat(input_et.getText().toString());
+           a = 0;
+           operation = '-';
+           expression+=operation;
+           input_et.setText(" " + expression);
        }
-        //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show();
-       // a=Float.parseFloat(input_et.getText().toString());
-        a=0;
-        operation='-';
-        input_et.setText(""+a);
     }
     public void multiply(View view){
-        if(!set){
-            res=a;
-            result_tv.setText(""+res);
-            set=true;
+        if(!(expression.charAt(expression.length()-1)=='*')) {
+            res = a;
+            result_tv.setText("" + res);
+            //set=true;
+            //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show()
+            a = 0;
+            operation = '*';
+            expression+=operation;
+            input_et.setText(" " + expression);
         }
-        //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show()
-        a=0;
-        operation='*';
-        input_et.setText(""+a);
     }
     public void divide(View view){
-        if(!set){
-            res=a;
-            result_tv.setText(""+res);
-            set=true;
+        if(!(expression.charAt(expression.length()-1)=='/')) {
+            res = a;
+            result_tv.setText("" + res);
+            //set=true;
+            //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show();
+            //  a=Float.parseFloat(input_et.getText().toString());
+            a = 0;
+            operation = '/';
+            expression+=operation;
+
+            input_et.setText(" " + expression);
         }
-        //  Toast.makeText(this,"Plus button clicked",Toast.LENGTH_SHORT).show();
-      //  a=Float.parseFloat(input_et.getText().toString());
-        a=0;
-        operation='/';
-        input_et.setText(""+a);
     }
     public void value1(View view){
-        a*=10;
-        a+=1;
-        input_et.setText(""+a);
+        //a*=10;
+        a=1;
+        expression+=(int)a;
+        input_et.setText(" "+expression);
     }
     public void value2(View view){
-        a*=10;
-        a+=2;
-        input_et.setText(""+a);
+        //a*=10;
+        a=2;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value3(View view){
-        a*=10;
-        a+=3;
-        input_et.setText(""+a);
+        //a*=10;
+        a=3;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value4(View view){
-        a*=10;
-        a+=4;
-        input_et.setText(""+a);
+        //a*=10;
+        a=4;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value5(View view){
-        a*=10;
-        a+=5;
-        input_et.setText(""+a);
+        //a*=10;
+        a=5;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value6(View view){
-        a*=10;
-        a+=6;
-        input_et.setText(""+a);
+        //a*=10;
+        a=6;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value7(View view){
-        a*=10;
-        a+=7;
-        input_et.setText(""+a);
+        //a*=10;
+        a=7;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value8(View view){
-        a*=10;
-        a+=8;
-        input_et.setText(""+a);
+        //a*=10;
+        a=8;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value9(View view){
-        a*=10;
-        a+=9;
-        input_et.setText(""+a);
+        //a*=10;
+        a=9;
+        expression+=(int)a;
+
+        input_et.setText(" "+expression);
     }
     public void value0(View view){
-        a*=10;
-        input_et.setText(""+a);
+        //a*=10;
+        expression+='0';
+        input_et.setText(" "+expression);
+    }
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSensorManager.registerListener(mShakeDetector, mAccelerometer,	SensorManager.SENSOR_DELAY_UI);
+    }
+
+    @Override
+    public void onPause() {
+        mSensorManager.unregisterListener(mShakeDetector);
+        super.onPause();
     }
 
 
diff --git a/app/src/main/java/com/example/android/calculator/ShakerMethod.java b/app/src/main/java/com/example/android/calculator/ShakerMethod.java
new file mode 100644
index 0000000..26710a0
--- /dev/null
+++ b/app/src/main/java/com/example/android/calculator/ShakerMethod.java
@@ -0,0 +1,64 @@
+package com.example.android.calculator;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+
+
+public class ShakerMethod implements SensorEventListener {
+
+    private static final float SHAKE_THRESHOLD_GRAVITY = 2.7F;
+    private static final int SHAKE_SLOP_TIME_MS = 500;
+    private static final int SHAKE_COUNT_RESET_TIME_MS = 3000;
+
+    private OnShakeListener mListener;
+    private long mShakeTimestamp;
+    private int mShakeCount;
+
+    public void setOnShakeListener(OnShakeListener listener) {
+        this.mListener = listener;
+    }
+
+    public interface OnShakeListener {
+        public void onShake(int count);
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+
+        if (mListener != null) {
+            float x = event.values[0];
+            float y = event.values[1];
+            float z = event.values[2];
+
+            float gX = x / SensorManager.GRAVITY_EARTH;
+            float gY = y / SensorManager.GRAVITY_EARTH;
+            float gZ = z / SensorManager.GRAVITY_EARTH;
+
+            float gForce = (float) Math.sqrt(gX * gX + gY * gY + gZ * gZ);
+
+            if (gForce > SHAKE_THRESHOLD_GRAVITY) {
+                final long now = System.currentTimeMillis();
+                if (mShakeTimestamp + SHAKE_SLOP_TIME_MS > now) {
+                    return;
+                }
+
+                if (mShakeTimestamp + SHAKE_COUNT_RESET_TIME_MS < now) {
+                    mShakeCount = 0;
+                }
+
+                mShakeTimestamp = now;
+                mShakeCount++;
+
+                mListener.onShake(mShakeCount);
+            }
+        }
+    }
+
+}
+
+
diff --git a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png
new file mode 100644
index 0000000..894b069
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 40b3bec..5df92d1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,11 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:layout_height="match_parent">
+<LinearLayout
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -56,6 +61,13 @@
             android:layout_weight="1"
             android:id="@+id/divide"
             android:onClick="divide"/>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="^"
+            android:onClick="power"/>
+
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
@@ -119,31 +131,76 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="9"
             android:layout_weight="1"
-            android:onClick="value9"/>
+            android:onClick="value9"
+            android:id="@+id/button2" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="("
+            android:layout_weight="1"
+            android:onClick="openBrace"/>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text=")"
+            android:onClick="closeBrace"/>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:layout_weight="1"
+            android:onClick="value0"/>
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="="
             android:onClick="display"/>
+
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="Clear"
-            android:onClick="clear"/>
+            android:onClick="clear"
+            android:id="@+id/button" />
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="0"
+            android:text="MR+"
             android:layout_weight="1"
-            android:onClick="value0"/>
+            android:onClick="addToMemory"
+             />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="MR-"
+            android:layout_weight="1"
+            android:onClick="subtractFromMemory"
+             />
+
+
+
+
 
     </LinearLayout>
 
+
 </LinearLayout>
+    </ScrollView>
+
diff --git a/app/src/main/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml
new file mode 100644
index 0000000..4db8c59
--- /dev/null
+++ b/app/src/main/res/values-v14/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+Refer to App Widget Documentation for margin information
+http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
+    -->
+    <dimen name="widget_margin">0dp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 47c8224..fb6e235 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,10 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <!--
+Refer to App Widget Documentation for margin information
+http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
+    -->
+    <dimen name="widget_margin">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1b611f..a29d054 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,4 +4,7 @@
 
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
+    <string name="appwidget_text">EXAMPLE</string>
+    <string name="configure">Configure</string>
+    <string name="add_widget">Add widget</string>
 </resources>