diff --git a/ProjectClock/AlarmActivationViewController.swift b/ProjectClock/AlarmActivationViewController.swift
index 54a7f7f..4398025 100644
--- a/ProjectClock/AlarmActivationViewController.swift
+++ b/ProjectClock/AlarmActivationViewController.swift
@@ -23,6 +23,9 @@ class AlarmActivationViewController: UIViewController
     @IBOutlet weak var rpsView: UIView!
     @IBOutlet weak var rpsResult: UILabel!
     
+    //Shake Outlets
+    @IBOutlet weak var shakeView: UIView!
+    
     //Other Outlets
     @IBOutlet weak var timeLabel: UILabel!
     @IBOutlet weak var dateLabel: UILabel!
@@ -55,6 +58,7 @@ class AlarmActivationViewController: UIViewController
         //Hide all inactive wakemethods
         puzzleView.isHidden = true
         rpsView.isHidden = true
+        shakeView.isHidden = true
         
         timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(AlarmActivationViewController.playSound), userInfo: nil, repeats: true)
         setAlarmType()
@@ -85,6 +89,9 @@ class AlarmActivationViewController: UIViewController
                 rpsView.isHidden = false
                 //Get Choice here
                 //rpsAction(choice: choice)
+            case "Shake":
+                shakeView.isHidden = false
+                shakeAction()
             default:
                 print("Invalid alarm type")
             }
diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard
index 42fb87e..5e3460a 100644
--- a/ProjectClock/Base.lproj/Main.storyboard
+++ b/ProjectClock/Base.lproj/Main.storyboard
@@ -665,6 +665,20 @@
                                     <constraint firstItem="eTb-g7-8x3" firstAttribute="top" secondItem="CZ0-R6-FDq" secondAttribute="bottom" constant="20" id="yME-j6-vSk"/>
                                 </constraints>
                             </view>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zph-rd-rPI" userLabel="shakeView">
+                                <rect key="frame" x="87" y="357" width="240" height="128"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nK2-jK-GsP">
+                                        <rect key="frame" x="99" y="53" width="42" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NmX-iJ-1D0" userLabel="rpsView">
                                 <rect key="frame" x="20" y="338.5" width="374" height="165"/>
                                 <subviews>
@@ -748,6 +762,7 @@
                         <outlet property="puzzleView" destination="OMQ-qK-fej" id="KLT-oe-RJX"/>
                         <outlet property="rpsResult" destination="HEP-oh-VSY" id="W2G-eZ-mzI"/>
                         <outlet property="rpsView" destination="NmX-iJ-1D0" id="Rhg-Hm-2Xx"/>
+                        <outlet property="shakeView" destination="Zph-rd-rPI" id="aJ0-W7-cAV"/>
                         <outlet property="timeLabel" destination="vmg-Oj-8tB" id="FJJ-No-dwF"/>
                     </connections>
                 </viewController>
diff --git a/ProjectClock/MathExpressions.swift b/ProjectClock/MathExpressions.swift
index 862caa1..2461525 100644
--- a/ProjectClock/MathExpressions.swift
+++ b/ProjectClock/MathExpressions.swift
@@ -198,6 +198,7 @@ class RPS {
      */
 }
 
+
 //Reference: https://youtu.be/XDuchXYiWuE
 class Shake {
     var motionManager = CMMotionManager()
@@ -214,3 +215,4 @@ class Shake {
         }
     }
 }
+
diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift
index 2705718..1fbfa82 100644
--- a/ProjectClock/Models.swift
+++ b/ProjectClock/Models.swift
@@ -40,6 +40,7 @@ struct WVM: Codable
 let wvms = [
     WVM(name: "Factor", desc: "Factor a binomial"),
     WVM(name: "RPS", desc: "Win a game of rock paper scissors"),
+    WVM(name: "Shake", desc: "Shake your phone... aggresively!"),
     //WVM(name: "Smash", desc: "It'll never turn off"),
     //WVM(name: "Walk", desc: "Walk a few steps"),
     //WVM(name: "Jump", desc: "Make a few jumps")
diff --git a/ProjectClock/NotificationLogic.swift b/ProjectClock/NotificationLogic.swift
index 29a620c..8f801d9 100644
--- a/ProjectClock/NotificationLogic.swift
+++ b/ProjectClock/NotificationLogic.swift
@@ -18,6 +18,10 @@ func jumpAction() {
     
 }
 
+func shakeAction() {
+    
+}
+
 func rpsAction(choice: RPS.Choice) -> Bool? {
     let rps = RPS()
     return rps.playRPS(you: choice, computer: RPS.randomComputerChoice())