diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
index 5039191..9a1f11c 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
@@ -46,7 +46,9 @@ public abstract class BaseAlarmViewHolder extends BaseViewHolder<Alarm> {
     private static final String TAG = "BaseAlarmViewHolder";
     private static final String TAG_ADD_LABEL_DIALOG = "add_label_dialog";
 
-    private final AlarmController mAlarmController;
+    // Visible for subclasses.
+    final AlarmController mAlarmController;
+
     // TODO: Should we use VectorDrawable type?
     private final Drawable mDismissNowDrawable;
     private final Drawable mCancelSnoozeDrawable;
@@ -307,6 +309,7 @@ public abstract class BaseAlarmViewHolder extends BaseViewHolder<Alarm> {
         };
     }
 
+    @Deprecated
     protected final OnListItemInteractionListener<Alarm> getInteractionListener() {
         return mInteractionListener;
     }
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java
index ec28388..15df7ff 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java
@@ -129,8 +129,13 @@ public class ExpandedAlarmViewHolder extends BaseAlarmViewHolder {
     // any changes until the user explicitly clicked save. We have to do this here now because
     // we should commit changes as they are made.
     @OnCheckedChanged(R.id.vibrate)
-    void onVibrateToggled() {
-        // TODO
+    void onVibrateToggled(boolean checked) {
+        final Alarm oldAlarm = getAlarm();
+        Alarm newAlarm = oldAlarm.toBuilder()
+                .vibrates(checked)
+                .build();
+        oldAlarm.copyMutableFieldsTo(newAlarm);
+        mAlarmController.save(newAlarm);
     }
 
     @OnCheckedChanged({ R.id.day0, R.id.day1, R.id.day2, R.id.day3, R.id.day4, R.id.day5, R.id.day6 })
@@ -197,7 +202,6 @@ public class ExpandedAlarmViewHolder extends BaseAlarmViewHolder {
         Alarm newAlarm = Alarm.builder()
                 .hour(oldAlarm.hour()/*TODO*/)
                 .minutes(oldAlarm.minutes()/*TODO*/)
-                .label(mLabel.getText().toString())
                 .ringtone(""/*TODO*/)
                 .vibrates(mVibrate.isChecked())
                 .build();