diff --git a/ProjectClock/AddAlarmViewController.swift b/ProjectClock/AddAlarmViewController.swift
index b05680f..4361aea 100644
--- a/ProjectClock/AddAlarmViewController.swift
+++ b/ProjectClock/AddAlarmViewController.swift
@@ -17,36 +17,47 @@ class AddAlarmViewController: UIViewController
         scrollView.addSubview(scrollViewInner)
         scrollView.contentSize = scrollViewInner.frame.size
     }
-    
-    @IBOutlet weak var repeatWeekdaysSwitch: UISwitch!
-    @IBOutlet weak var repeatWeekendsSwitch: UISwitch!
-    @IBOutlet weak var alarmNameTextField: UITextField!
-    
 
     // Pickers
     @IBOutlet weak var timePicker: UIDatePicker!
     @IBOutlet weak var wvmPicker: UIPickerView!
     
-    @IBAction func defaultRingtonesButton(_ sender: Any) {
-    }
-    @IBAction func soundLibraryButton(_ sender: Any) {
+    // UI Elements
+    @IBOutlet weak var repeatWeekdaysSwitch: UISwitch!
+    @IBOutlet weak var repeatWeekendsSwitch: UISwitch!
+    @IBOutlet weak var alarmNameTextField: UITextField!
+    
+    @IBAction func defaultRingtonesButton(_ sender: Any)
+    {
+        
     }
     
+    @IBAction func soundLibraryButton(_ sender: Any)
+    {
+        
+    }
+    
+    /**
+     Called when the user clicks Add Alarm
+     */
     @IBAction func addAlarmButton(_ sender: Any) {
         
         let (h, m, _) = timePicker.date.getHMS()
-        let alarms = Alarms.fromLocal();
-        alarms.list.append(
-            Alarm(hour: h, minute: m, text: "\(alarmNameTextField.text) - \(h * m)", wakeMethod: wvms[0], lastActivate: Date().added(.minute, -1))
-        )
-        alarms.localSave()
         
-        _ = navigationController?.popViewController(animated: true)
-    }
-    
-    override func viewDidLoad()
-    {
-        super.viewDidLoad()
+        // Create the alarm
+        let alarm = Alarm(hour: h, minute: m,
+                          text: alarmNameTextField.text ?? "Alarm",
+                          wakeMethod: wvms[wvmPicker.selectedRow(inComponent: 0)],
+                          lastActivate: Date())
+        
+        // TODO: Set alarm.repeats to correspond with what the user selects
+
+        
+        // Add the alarm to the list and save the list
+        Alarms.fromLocal().apply { $0.list.append(alarm) }.localSave();
+
+        // Dismiss this view
+        self.dismiss(animated: true, completion: nil)
     }
 }