diff --git a/library/res/color/calendar_bg_selector.xml b/library/res/color/calendar_bg_selector.xml
deleted file mode 100644
index 5a9def01..00000000
--- a/library/res/color/calendar_bg_selector.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2012 Square, Inc. -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-  <item app:state_period_middle="true" android:color="@color/calendar_selected_period_bg"/>
-  <item android:state_selected="true" android:color="@color/calendar_selected_day_bg"/>
-  <item android:state_pressed="true" android:color="@color/calendar_selected_day_bg"/>
-  <item app:state_current_month="false" android:color="@color/calendar_inactive_month_bg"/>
-  <item app:state_today="true" android:color="@color/calendar_text_active"/>
-  <item android:color="@color/calendar_active_month_bg"/>
-</selector>
diff --git a/library/res/drawable/calendar_bg_selector.xml b/library/res/drawable/calendar_bg_selector.xml
new file mode 100644
index 00000000..ffce8c44
--- /dev/null
+++ b/library/res/drawable/calendar_bg_selector.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2012 Square, Inc. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item app:state_range_middle="true">
+    <color android:color="@color/calendar_selected_range_bg"/>
+  </item>
+  <item android:state_selected="true">
+    <color android:color="@color/calendar_selected_day_bg"/>
+  </item>
+  <item android:state_pressed="true">
+    <color android:color="@color/calendar_selected_day_bg"/>
+  </item>
+  <item app:state_current_month="false">
+    <color android:color="@color/calendar_inactive_month_bg"/>
+  </item>
+  <item app:state_today="true">
+    <color android:color="@color/calendar_text_active"/>
+  </item>
+  <item>
+    <color android:color="@color/calendar_active_month_bg"/>
+  </item>
+</selector>
diff --git a/library/res/values/attrs.xml b/library/res/values/attrs.xml
index 91ebe05c..71224582 100644
--- a/library/res/values/attrs.xml
+++ b/library/res/values/attrs.xml
@@ -4,8 +4,8 @@
     <attr name="state_selectable" format="boolean" />
     <attr name="state_current_month" format="boolean" />
     <attr name="state_today" format="boolean" />
-    <attr name="state_period_first" format="boolean" />
-    <attr name="state_period_middle" format="boolean" />
-    <attr name="state_period_last" format="boolean" />
+    <attr name="state_range_first" format="boolean" />
+    <attr name="state_range_middle" format="boolean" />
+    <attr name="state_range_last" format="boolean" />
   </declare-styleable>
 </resources>
diff --git a/library/res/values/colors.xml b/library/res/values/colors.xml
index 0aebe9a8..7349fc84 100644
--- a/library/res/values/colors.xml
+++ b/library/res/values/colors.xml
@@ -5,7 +5,7 @@
   <color name="calendar_divider">#ffbababa</color>
   <color name="calendar_inactive_month_bg">#ffd7d9db</color>
   <color name="calendar_selected_day_bg">#ff379bff</color>
-  <color name="calendar_selected_period_bg">#ff96caff</color>
+  <color name="calendar_selected_range_bg">#ff96caff</color>
   <color name="calendar_text_inactive">#40778088</color>
   <color name="calendar_text_active">#ff778088</color>
   <color name="calendar_text_selected">#ffffffff</color>
diff --git a/library/res/values/styles.xml b/library/res/values/styles.xml
index a203dbf9..d8a0ea54 100644
--- a/library/res/values/styles.xml
+++ b/library/res/values/styles.xml
@@ -20,7 +20,7 @@
 
   <style name="CalendarCell.CalendarDate">
     <item name="android:textSize">@dimen/calendar_text_medium</item>
-    <item name="android:colorBackground">@color/calendar_bg_selector</item>
+    <item name="android:background">@drawable/calendar_bg_selector</item>
     <item name="android:textColor">@color/calendar_text_selector</item>
     <item name="android:clickable">true</item>
     <item name="android:textStyle">bold</item>
diff --git a/library/src/com/squareup/timessquare/CalendarCellView.java b/library/src/com/squareup/timessquare/CalendarCellView.java
index da1b6478..7802aa05 100644
--- a/library/src/com/squareup/timessquare/CalendarCellView.java
+++ b/library/src/com/squareup/timessquare/CalendarCellView.java
@@ -2,11 +2,10 @@
 
 package com.squareup.timessquare;
 
-import com.squareup.timessquare.MonthCellDescriptor.PeriodState;
-
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.TextView;
+import com.squareup.timessquare.MonthCellDescriptor.RangeState;
 
 public class CalendarCellView extends TextView {
 
@@ -19,20 +18,20 @@ public class CalendarCellView extends TextView {
   private static final int[] STATE_TODAY = {
       R.attr.state_today
   };
-  private static final int[] STATE_PERIOD_FIRST = {
-      R.attr.state_period_first
+  private static final int[] STATE_RANGE_FIRST = {
+      R.attr.state_range_first
   };
-  private static final int[] STATE_PERIOD_MIDDLE = {
-      R.attr.state_period_middle
+  private static final int[] STATE_RANGE_MIDDLE = {
+      R.attr.state_range_middle
   };
-  private static final int[] STATE_PERIOD_LAST = {
-      R.attr.state_period_last
+  private static final int[] STATE_RANGE_LAST = {
+      R.attr.state_range_last
   };
 
   private boolean isSelectable = false;
   private boolean isCurrentMonth = false;
   private boolean isToday = false;
-  private PeriodState periodState = PeriodState.NONE;
+  private RangeState rangeState = RangeState.NONE;
 
   public CalendarCellView(Context context) {
     super(context);
@@ -61,8 +60,8 @@ public void setToday(boolean isToday) {
     refreshDrawableState();
   }
 
-  public void setPeriodState(PeriodState periodState) {
-    this.periodState = periodState;
+  public void setRangeState(MonthCellDescriptor.RangeState rangeState) {
+    this.rangeState = rangeState;
     refreshDrawableState();
   }
 
@@ -81,12 +80,12 @@ public void setPeriodState(PeriodState periodState) {
       mergeDrawableStates(drawableState, STATE_TODAY);
     }
 
-    if (periodState == PeriodState.FIRST) {
-      mergeDrawableStates(drawableState, STATE_PERIOD_FIRST);
-    } else if (periodState == PeriodState.MIDDLE) {
-      mergeDrawableStates(drawableState, STATE_PERIOD_MIDDLE);
-    } else if (periodState == PeriodState.LAST) {
-      mergeDrawableStates(drawableState, STATE_PERIOD_LAST);
+    if (rangeState == MonthCellDescriptor.RangeState.FIRST) {
+      mergeDrawableStates(drawableState, STATE_RANGE_FIRST);
+    } else if (rangeState == MonthCellDescriptor.RangeState.MIDDLE) {
+      mergeDrawableStates(drawableState, STATE_RANGE_MIDDLE);
+    } else if (rangeState == RangeState.LAST) {
+      mergeDrawableStates(drawableState, STATE_RANGE_LAST);
     }
 
     return drawableState;
diff --git a/library/src/com/squareup/timessquare/CalendarPickerView.java b/library/src/com/squareup/timessquare/CalendarPickerView.java
index 5802f59c..6373309e 100644
--- a/library/src/com/squareup/timessquare/CalendarPickerView.java
+++ b/library/src/com/squareup/timessquare/CalendarPickerView.java
@@ -9,12 +9,13 @@
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
-import com.squareup.timessquare.MonthCellDescriptor.PeriodState;
+import com.squareup.timessquare.MonthCellDescriptor.RangeState;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -37,14 +38,24 @@
  */
 public class CalendarPickerView extends ListView {
   public enum SelectionMode {
-    /** Only one date will be selectable. */
+    /**
+     * Only one date will be selectable.  If there is already a selected date and you select a new
+     * one, the old date will be unselected.
+     */
     SINGLE,
-    /** Multiple dates will be selectable. */
+    /**
+     * Multiple dates will be selectable.  If there is already a selected date and you select a new
+     * one, the old date will also be selected.
+     */
     MULTIPLE,
-    /** Up to (and no more than) two dates will be selectable. */
-    PERIOD,
-    /** Like {@link #PERIOD} but also selects all dates in between the two selected dates. */
-    SELECTED_PERIOD
+    /**
+     * Allows you to select a date range.  Previous selections are cleared when you either:
+     * <ul>
+     * <li>Have a range selected and select another date (even if it's in the current range).</li>
+     * <li>Have one date selected and then select an earlier date.</li>
+     * </ul>
+     */
+    RANGE
   }
 
   private final CalendarPickerView.MonthAdapter adapter;
@@ -57,7 +68,7 @@ public enum SelectionMode {
   final Calendar today = Calendar.getInstance();
   private final List<List<List<MonthCellDescriptor>>> cells =
       new ArrayList<List<List<MonthCellDescriptor>>>();
-  private final List<Calendar> selectedCals = new ArrayList<Calendar>();
+  final List<Calendar> selectedCals = new ArrayList<Calendar>();
   private final Calendar minCal = Calendar.getInstance();
   private final Calendar maxCal = Calendar.getInstance();
   private final Calendar monthCounter = Calendar.getInstance();
@@ -175,50 +186,36 @@ public FluentInitializer withSelectedDate(Date selectedDates) {
      * Set multiple selected dates.  This will throw an {@link IllegalArgumentException} if you
      * pass in multiple dates and haven't already called {@link #inMode(SelectionMode)}.
      */
-    public FluentInitializer withSelectedDates(Iterable<Date> selectedDates) {
+    public FluentInitializer withSelectedDates(Collection<Date> selectedDates) {
+      if (selectionMode == SelectionMode.SINGLE && selectedDates.size() > 1) {
+        throw new IllegalArgumentException("SINGLE mode can't be used with multiple selectedDates");
+      }
       if (selectedDates != null) {
-        Date minDate = minCal.getTime();
-        Date maxDate = maxCal.getTime();
-        for (Date selectedDate : selectedDates) {
-          if (selectedDate == null) {
-            throw new IllegalArgumentException(
-                "Selected date must be non-null.  " + dbg(selectedDates));
-          }
-          if (selectedDate.getTime() == 0) {
-            throw new IllegalArgumentException(
-                "Selected date must be non-zero.  " + dbg(selectedDates));
-          }
-
-          if (selectedDate.before(minDate) || selectedDate.after(maxDate)) {
-            throw new IllegalArgumentException(
-                "selectedDate must be between minDate and maxDate.  " + dbg(selectedDates));
-          }
-
-          Calendar selectedCal = Calendar.getInstance();
-          selectedCals.add(selectedCal);
-          // Sanitize input: clear out the hours/minutes/seconds/millis.
-          selectedCal.setTime(selectedDate);
-          setMidnight(selectedCal);
+        for (Date date : selectedDates) {
+          selectDate(date);
         }
       }
-      int selectedIndex = 0;
-      int todayIndex = 0;
+      Integer selectedIndex = null;
+      Integer todayIndex = null;
       Calendar today = Calendar.getInstance();
-      for (MonthDescriptor month : months) {
-        if (selectedIndex == 0) {
+      for (int c = 0; c < months.size(); c++) {
+        MonthDescriptor month = months.get(c);
+        if (selectedIndex == null) {
           for (Calendar selectedCal : selectedCals) {
             if (sameMonth(selectedCal, month)) {
-              selectedIndex = months.size();
+              selectedIndex = c;
               break;
             }
           }
-          if (selectedIndex == 0 && todayIndex == 0 && sameMonth(today, month)) {
-            todayIndex = months.size();
+          if (selectedIndex == null && todayIndex == null && sameMonth(today, month)) {
+            todayIndex = c;
           }
         }
       }
-      if (selectedIndex != 0 || todayIndex != 0) {
-        scrollToSelectedMonth(selectedIndex != 0 ? selectedIndex : todayIndex);
+      if (selectedIndex != null) {
+        scrollToSelectedMonth(selectedIndex);
+      } else if (todayIndex != null) {
+        scrollToSelectedMonth(todayIndex);
       }
 
       validateAndUpdate();
@@ -244,9 +241,6 @@ private void validateAndUpdate() {
     if (getAdapter() == null) {
       setAdapter(adapter);
     }
-    if (selectionMode == SelectionMode.SINGLE && selectedCals.size() > 1) {
-      throw new IllegalArgumentException("SINGLE mode cannot be used with multiple selectedDates");
-    }
     adapter.notifyDataSetChanged();
   }
 
@@ -273,14 +267,8 @@ public Date getSelectedDate() {
 
   public List<Date> getSelectedDates() {
     List<Date> selectedDates = new ArrayList<Date>();
-    for (Calendar cal : selectedCals) {
-      selectedDates.add(cal.getTime());
-    }
-    if (selectionMode == SelectionMode.SELECTED_PERIOD) {
-      // Add all days in the period.
-      for (int i = 2; i < selectedCells.size(); i++) {
-        selectedDates.add(selectedCells.get(i).getDate());
-      }
+    for (MonthCellDescriptor cal : selectedCells) {
+      selectedDates.add(cal.getDate());
     }
     Collections.sort(selectedDates);
     return selectedDates;
@@ -305,7 +293,7 @@ private static String dbg(Iterable<Date> selectedDates) {
   }
 
   /** Clears out the hours/minutes/seconds/millis of a Calendar. */
-  private static void setMidnight(Calendar cal) {
+  static void setMidnight(Calendar cal) {
     cal.set(HOUR_OF_DAY, 0);
     cal.set(MINUTE, 0);
     cal.set(SECOND, 0);
@@ -334,15 +322,23 @@ private class CellClickedListener implements MonthView.Listener {
    * Select a new date.  Respects the {@link SelectionMode} this CalendarPickerView is configured
    * with: if you are in {@link SelectionMode#SINGLE}, the previously selected date will be
    * un-selected.  In {@link SelectionMode#MULTIPLE}, the new date will be added to the list of
-   * selected dates.  TODO figure out the behavior in {@link SelectionMode#PERIOD} and
-   * TODO {@link SelectionMode#SELECTED_PERIOD} and document here.  Write tests for this.
-   * </p>
-   * If the selection was made (selectable date, in range), the view will scroll to the newly
+   * selected dates.
+   * </p> If the selection was made (selectable date, in range), the view will scroll to the newly
    * selected date if it's not already visible.
    *
    * @return - whether we were able to set the date
    */
   public boolean selectDate(Date date) {
+    if (date == null) {
+      throw new IllegalArgumentException("Selected date must be non-null.  " + date);
+    }
+    if (date.getTime() == 0) {
+      throw new IllegalArgumentException("Selected date must be non-zero.  " + date);
+    }
+    if (date.before(minCal.getTime()) || date.after(maxCal.getTime())) {
+      throw new IllegalArgumentException(
+          "selectedDate must be between minDate and maxDate.  " + date);
+    }
     MonthCellWithMonthIndex monthCellWithMonthIndex = getMonthCellWithIndexByDate(date);
     if (monthCellWithMonthIndex == null || !isDateSelectable(date)) {
       return false;
@@ -355,55 +351,33 @@ public boolean selectDate(Date date) {
   }
 
   private boolean doSelectDate(Date date, MonthCellDescriptor cell) {
-    Calendar selectedCal = Calendar.getInstance();
-    selectedCal.setTime(date);
+    Calendar newlySelectedCal = Calendar.getInstance();
+    newlySelectedCal.setTime(date);
+    // Sanitize input: clear out the hours/minutes/seconds/millis.
+    setMidnight(newlySelectedCal);
 
-    // Clear any remaining period state.
+    // Clear any remaining range state.
     for (MonthCellDescriptor selectedCell : selectedCells) {
-      selectedCell.setPeriodState(PeriodState.NONE);
+      selectedCell.setRangeState(RangeState.NONE);
     }
 
     switch (selectionMode) {
-      case SELECTED_PERIOD: {
-        // Clear additionally selected cells (Cals were not selected).
-        while (selectedCells.size() > 2) {
-          selectedCells.get(2).setSelected(false);
-          selectedCells.remove(2);
-        }
-      }
-      // NOTE: there is no break here.  This code falls through and runs the normal PERIOD code.
-      case PERIOD:
-        // Keep cell selected if this was both start and end date.
-        if (selectedCals.size() >= 2) {
-          if (selectedCals.get(0).compareTo(selectedCals.get(1)) != 0) {
-            if (selectedCals.size() != selectedCells.size()) {
-              throw new IllegalStateException(
-                  String.format("Mismatched number of selected cells (%d)/dates (%d)",
-                      selectedCells.size(), selectedCals.size()));
-            }
-            selectedCells.get(0).setSelected(false);
-            selectedCells.remove(0);
-          }
-          selectedCals.remove(0);
-          if (selectedCals.size() != selectedCells.size()) {
-            throw new IllegalStateException(
-                String.format("Mismatched number of selected cells (%d)/dates (%d) after removal",
-                    selectedCells.size(), selectedCals.size()));
-          }
+      case RANGE:
+        if (selectedCals.size() > 1) {
+          // We've already got a range selected: clear the old one.
+          clearOldSelections();
+        } else if (selectedCals.size() == 1 && newlySelectedCal.before(selectedCals.get(0))) {
+          // We're moving the start of the range back in time: clear the old start date.
+          clearOldSelections();
         }
         break;
 
       case MULTIPLE:
-        date = applyMultiSelect(date, selectedCal);
+        date = applyMultiSelect(date, newlySelectedCal);
         break;
 
       case SINGLE:
-        for (MonthCellDescriptor selectedCell : selectedCells) {
-          // De-select the currently-selected cell.
-          selectedCell.setSelected(false);
-        }
-        selectedCells.clear();
-        selectedCals.clear();
+        clearOldSelections();
         break;
       default:
         throw new IllegalStateException("Unknown selectionMode " + selectionMode);
@@ -415,23 +389,14 @@ private boolean doSelectDate(Date date, MonthCellDescriptor cell) {
         selectedCells.add(cell);
         cell.setSelected(true);
       }
-      selectedCals.add(selectedCal);
+      selectedCals.add(newlySelectedCal);
 
-      if (selectionMode == SelectionMode.SELECTED_PERIOD && selectedCells.size() > 1) {
+      if (selectionMode == SelectionMode.RANGE && selectedCells.size() > 1) {
         // Select all days in between start and end.
-        Date start;
-        Date end;
-        if (selectedCells.get(0).getDate().after(selectedCells.get(1).getDate())) {
-          start = selectedCells.get(1).getDate();
-          end = selectedCells.get(0).getDate();
-          selectedCells.get(1).setPeriodState(PeriodState.FIRST);
-          selectedCells.get(0).setPeriodState(PeriodState.LAST);
-        } else {
-          start = selectedCells.get(0).getDate();
-          end = selectedCells.get(1).getDate();
-          selectedCells.get(0).setPeriodState(PeriodState.FIRST);
-          selectedCells.get(1).setPeriodState(PeriodState.LAST);
-        }
+        Date start = selectedCells.get(0).getDate();
+        Date end = selectedCells.get(1).getDate();
+        selectedCells.get(0).setRangeState(MonthCellDescriptor.RangeState.FIRST);
+        selectedCells.get(1).setRangeState(MonthCellDescriptor.RangeState.LAST);
 
         for (List<List<MonthCellDescriptor>> month : cells) {
           for (List<MonthCellDescriptor> week : month) {
@@ -440,7 +405,7 @@ private boolean doSelectDate(Date date, MonthCellDescriptor cell) {
                   && singleCell.getDate().before(end)
                   && singleCell.isSelectable()) {
                 singleCell.setSelected(true);
-                singleCell.setPeriodState(PeriodState.MIDDLE);
+                singleCell.setRangeState(MonthCellDescriptor.RangeState.MIDDLE);
                 selectedCells.add(singleCell);
               }
             }
@@ -454,6 +419,15 @@ private boolean doSelectDate(Date date, MonthCellDescriptor cell) {
     return date != null;
   }
 
+  private void clearOldSelections() {
+    for (MonthCellDescriptor selectedCell : selectedCells) {
+      // De-select the currently-selected cell.
+      selectedCell.setSelected(false);
+    }
+    selectedCells.clear();
+    selectedCals.clear();
+  }
+
   private Date applyMultiSelect(Date date, Calendar selectedCal) {
     for (MonthCellDescriptor selectedCell : selectedCells) {
       if (selectedCell.getDate().equals(date)) {
@@ -564,24 +538,20 @@ List<List<MonthCellDescriptor>> getMonthCells(MonthDescriptor month, Calendar st
         boolean isToday = sameDate(cal, today);
         int value = cal.get(DAY_OF_MONTH);
 
-        PeriodState periodState = PeriodState.NONE;
+        MonthCellDescriptor.RangeState rangeState = MonthCellDescriptor.RangeState.NONE;
         if (selectedCals != null && selectedCals.size() > 1) {
           if (sameDate(minSelectedCal, cal)) {
-            periodState = PeriodState.FIRST;
+            rangeState = MonthCellDescriptor.RangeState.FIRST;
           } else if (sameDate(maxDate(selectedCals), cal)) {
-            periodState = PeriodState.LAST;
+            rangeState = MonthCellDescriptor.RangeState.LAST;
           } else if (betweenDates(cal, minSelectedCal, maxSelectedCal)) {
-            periodState = PeriodState.MIDDLE;
+            rangeState = MonthCellDescriptor.RangeState.MIDDLE;
           }
         }
 
-        MonthCellDescriptor cell =
+        weekCells.add(
             new MonthCellDescriptor(date, isCurrentMonth, isSelectable, isSelected, isToday, value,
-                periodState);
-        if (isSelected) {
-          selectedCells.add(cell);
-        }
-        weekCells.add(cell);
+                rangeState));
         cal.add(DATE, 1);
       }
     }
@@ -656,10 +626,8 @@ public void setOnInvalidDateSelectedListener(OnInvalidDateSelectedListener liste
 
   /**
    * Set a listener used to discriminate between selectable and unselectable dates. Set this to
-   * disable arbitrary dates as they are rendered.
-   * <p/>
-   * Important: set this before you call {@link #init(Date, Date)} methods.  If called afterwards,
-   * it will not be consistently applied.
+   * disable arbitrary dates as they are rendered. <p/> Important: set this before you call {@link
+   * #init(Date, Date)} methods.  If called afterwards, it will not be consistently applied.
    */
   public void setDateSelectableFilter(DateSelectableFilter listener) {
     dateConfiguredListener = listener;
@@ -668,9 +636,7 @@ public void setDateSelectableFilter(DateSelectableFilter listener) {
   /**
    * Interface to be notified when a new date is selected.  This will only be called when the user
    * initiates the date selection.  If you call {@link #selectDate(Date)} this listener will not be
-   * notified.
-   * <p/>
-   * See {@link #setOnDateSelectedListener(OnDateSelectedListener)}.
+   * notified. <p/> See {@link #setOnDateSelectedListener(OnDateSelectedListener)}.
    */
   public interface OnDateSelectedListener {
     void onDateSelected(Date date);
@@ -678,10 +644,10 @@ public interface OnDateSelectedListener {
 
   /**
    * Interface to be notified when an invalid date is selected by the user. This will only be
-   * called when the user initiates the date selection. If you call {@link #selectDate(Date)} this
-   * listener will not be notified.
-   * <p/>
-   * See {@link #setOnInvalidDateSelectedListener(OnInvalidDateSelectedListener)}.
+   * called
+   * when the user initiates the date selection. If you call {@link #selectDate(Date)} this
+   * listener
+   * will not be notified. <p/> See {@link #setOnInvalidDateSelectedListener(OnInvalidDateSelectedListener)}.
    */
   public interface OnInvalidDateSelectedListener {
     void onInvalidDateSelected(Date date);
@@ -689,9 +655,7 @@ public interface OnInvalidDateSelectedListener {
 
   /**
    * Interface used for determining the selectability of a date cell when it is configured for
-   * display on the calendar.
-   * <p/>
-   * See {@link #setDateSelectableFilter(DateSelectableFilter)}.
+   * display on the calendar. <p/> See {@link #setDateSelectableFilter(DateSelectableFilter)}.
    */
   public interface DateSelectableFilter {
     boolean isDateSelectable(Date date);
diff --git a/library/src/com/squareup/timessquare/MonthCellDescriptor.java b/library/src/com/squareup/timessquare/MonthCellDescriptor.java
index a2c779ed..90ed3585 100644
--- a/library/src/com/squareup/timessquare/MonthCellDescriptor.java
+++ b/library/src/com/squareup/timessquare/MonthCellDescriptor.java
@@ -6,7 +6,7 @@
 
 /** Describes the state of a particular date cell in a {@link MonthView}. */
 class MonthCellDescriptor {
-  public enum PeriodState {
+  public enum RangeState {
     NONE, FIRST, MIDDLE, LAST
   }
 
@@ -16,17 +16,17 @@ public enum PeriodState {
   private boolean isSelected;
   private final boolean isToday;
   private final boolean isSelectable;
-  private PeriodState periodState;
+  private RangeState rangeState;
 
   MonthCellDescriptor(Date date, boolean currentMonth, boolean selectable, boolean selected,
-      boolean today, int value, PeriodState periodState) {
+      boolean today, int value, RangeState rangeState) {
     this.date = date;
     isCurrentMonth = currentMonth;
     isSelectable = selectable;
     isSelected = selected;
     isToday = today;
     this.value = value;
-    this.periodState = periodState;
+    this.rangeState = rangeState;
   }
 
   public Date getDate() {
@@ -53,12 +53,12 @@ public boolean isToday() {
     return isToday;
   }
 
-  public PeriodState getPeriodState() {
-    return periodState;
+  public RangeState getRangeState() {
+    return rangeState;
   }
 
-  public void setPeriodState(PeriodState periodState) {
-    this.periodState = periodState;
+  public void setRangeState(RangeState rangeState) {
+    this.rangeState = rangeState;
   }
 
   public int getValue() {
@@ -79,8 +79,8 @@ public int getValue() {
         + isToday
         + ", isSelectable="
         + isSelectable
-        + ", periodState="
-        + periodState
+        + ", rangeState="
+        + rangeState
         + '}';
   }
 }
diff --git a/library/src/com/squareup/timessquare/MonthView.java b/library/src/com/squareup/timessquare/MonthView.java
index b3abad96..47336d5e 100644
--- a/library/src/com/squareup/timessquare/MonthView.java
+++ b/library/src/com/squareup/timessquare/MonthView.java
@@ -67,7 +67,7 @@ public void init(MonthDescriptor month, List<List<MonthCellDescriptor>> cells) {
           cellView.setSelected(cell.isSelected());
           cellView.setCurrentMonth(cell.isCurrentMonth());
           cellView.setToday(cell.isToday());
-          cellView.setPeriodState(cell.getPeriodState());
+          cellView.setRangeState(cell.getRangeState());
           cellView.setTag(cell);
         }
       } else {
diff --git a/library/test/com/squareup/timessquare/CalendarPickerViewTest.java b/library/test/com/squareup/timessquare/CalendarPickerViewTest.java
index 51c8e6b3..3b03fb7d 100644
--- a/library/test/com/squareup/timessquare/CalendarPickerViewTest.java
+++ b/library/test/com/squareup/timessquare/CalendarPickerViewTest.java
@@ -3,8 +3,9 @@
 
 import android.app.Activity;
 import android.widget.TextView;
-import com.squareup.timessquare.MonthCellDescriptor.PeriodState;
+import com.squareup.timessquare.MonthCellDescriptor.RangeState;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -16,7 +17,7 @@
 import org.robolectric.RobolectricTestRunner;
 
 import static com.squareup.timessquare.CalendarPickerView.SelectionMode.MULTIPLE;
-import static com.squareup.timessquare.CalendarPickerView.SelectionMode.SELECTED_PERIOD;
+import static com.squareup.timessquare.CalendarPickerView.SelectionMode.RANGE;
 import static com.squareup.timessquare.CalendarPickerView.SelectionMode.SINGLE;
 import static java.util.Calendar.APRIL;
 import static java.util.Calendar.AUGUST;
@@ -93,123 +94,123 @@ public void testInitMidyear() throws Exception {
 
   @Test
   public void testOnlyShowingFourWeeks() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(FEBRUARY, 2015, today);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(FEBRUARY, 2015, today);
     assertThat(cells).hasSize(4);
 
     // Last cell should be 1.
-    assertCell(cells, 0, 0, 1, true, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 0, 1, true, false, false, false, MonthCellDescriptor.RangeState.NONE);
 
     // Last cell should be 28.
-    assertCell(cells, 3, 6, 28, true, false, false, false, PeriodState.NONE);
+    assertCell(cells, 3, 6, 28, true, false, false, false, MonthCellDescriptor.RangeState.NONE);
   }
 
   @Test
   public void testOnlyShowingFiveWeeks() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(FEBRUARY, 2013, today);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(FEBRUARY, 2013, today);
     assertThat(cells).hasSize(5);
 
     // First cell is the 27th of January.
-    assertCell(cells, 0, 0, 27, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 0, 27, false, false, false, false, MonthCellDescriptor.RangeState.NONE);
 
     // First day of Feb falls on the 5th cell.
-    assertCell(cells, 0, 5, 1, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 0, 5, 1, true, false, false, true, MonthCellDescriptor.RangeState.NONE);
 
     // Last day of Feb falls on the 5th row, 5th column.
-    assertCell(cells, 4, 4, 28, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 4, 4, 28, true, false, false, true, MonthCellDescriptor.RangeState.NONE);
 
     // Last cell should be March 2nd.
-    assertCell(cells, 4, 6, 2, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 4, 6, 2, false, false, false, false, RangeState.NONE);
   }
 
   @Test
   public void testWeirdOverlappingYear() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(JANUARY, 2013, today);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(JANUARY, 2013, today);
     assertThat(cells).hasSize(5);
   }
 
   @Test
   public void testShowingSixWeeks() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(DECEMBER, 2012, today);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(DECEMBER, 2012, today);
     assertThat(cells).hasSize(6);
 
     // First cell is the 27th of November.
-    assertCell(cells, 0, 0, 25, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 0, 25, false, false, false, false, MonthCellDescriptor.RangeState.NONE);
 
     // First day of December falls on the 6th cell.
-    assertCell(cells, 0, 6, 1, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 0, 6, 1, true, false, false, true, MonthCellDescriptor.RangeState.NONE);
 
     // Last day of December falls on the 6th row, 2nd column.
-    assertCell(cells, 5, 1, 31, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 5, 1, 31, true, false, false, true, MonthCellDescriptor.RangeState.NONE);
 
     // Last cell should be January 5th.
-    assertCell(cells, 5, 6, 5, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 5, 6, 5, false, false, false, false, RangeState.NONE);
   }
 
   @Test
   public void testIsSelected() throws Exception {
     Calendar nov29 = buildCal(2012, NOVEMBER, 29);
 
-    List<List<MonthCellDescriptor>> cells = getCells(NOVEMBER, 2012, nov29);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(NOVEMBER, 2012, nov29);
     assertThat(cells).hasSize(5);
     // Make sure the cell is selected when it's in November.
-    assertCell(cells, 4, 4, 29, true, true, false, true, PeriodState.NONE);
+    assertCell(cells, 4, 4, 29, true, true, false, true, MonthCellDescriptor.RangeState.NONE);
 
-    cells = getCells(DECEMBER, 2012, nov29);
+    cells = selectDateAndGetCells(DECEMBER, 2012, nov29);
     assertThat(cells).hasSize(6);
     // Make sure the cell is not selected when it's in December.
-    assertCell(cells, 0, 4, 29, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 4, 29, false, false, false, false, MonthCellDescriptor.RangeState.NONE);
   }
 
   @Test
   public void testTodayIsToday() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(NOVEMBER, 2012, today);
-    assertCell(cells, 2, 5, 16, true, true, true, true, PeriodState.NONE);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(NOVEMBER, 2012, today);
+    assertCell(cells, 2, 5, 16, true, true, true, true, RangeState.NONE);
   }
 
   @Test
   public void testSelectabilityInFirstMonth() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(NOVEMBER, 2012, today);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(NOVEMBER, 2012, today);
     // 10/29 is not selectable because it's in the previous month.
-    assertCell(cells, 0, 0, 28, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 0, 28, false, false, false, false, RangeState.NONE);
     // 11/1 is not selectable because it's < minDate (11/16/12).
-    assertCell(cells, 0, 4, 1, true, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 4, 1, true, false, false, false, MonthCellDescriptor.RangeState.NONE);
     // 11/16 is selectable because it's == minDate (11/16/12).
-    assertCell(cells, 2, 5, 16, true, true, true, true, PeriodState.NONE);
+    assertCell(cells, 2, 5, 16, true, true, true, true, RangeState.NONE);
     // 11/20 is selectable because it's > minDate (11/16/12).
-    assertCell(cells, 3, 2, 20, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 3, 2, 20, true, false, false, true, MonthCellDescriptor.RangeState.NONE);
     // 12/1 is not selectable because it's in the next month.
-    assertCell(cells, 4, 6, 1, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 4, 6, 1, false, false, false, false, MonthCellDescriptor.RangeState.NONE);
   }
 
   @Test
   public void testSelectabilityInLastMonth() throws Exception {
-    List<List<MonthCellDescriptor>> cells = getCells(NOVEMBER, 2013, today);
+    List<List<MonthCellDescriptor>> cells = selectDateAndGetCells(NOVEMBER, 2013, today);
     // 10/29 is not selectable because it's in the previous month.
-    assertCell(cells, 0, 0, 27, false, false, false, false, PeriodState.NONE);
+    assertCell(cells, 0, 0, 27, false, false, false, false, RangeState.NONE);
     // 11/1 is selectable because it's < maxDate (11/16/13).
-    assertCell(cells, 0, 5, 1, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 0, 5, 1, true, false, false, true, MonthCellDescriptor.RangeState.NONE);
     // 11/15 is selectable because it's one less than maxDate (11/16/13).
-    assertCell(cells, 2, 5, 15, true, false, false, true, PeriodState.NONE);
+    assertCell(cells, 2, 5, 15, true, false, false, true, RangeState.NONE);
     // 11/16 is not selectable because it's > maxDate (11/16/13).
-    assertCell(cells, 2, 6, 16, true, false, false, false, PeriodState.NONE);
+    assertCell(cells, 2, 6, 16, true, false, false, false, MonthCellDescriptor.RangeState.NONE);
   }
 
   @Test
   public void testInitSingleWithMultipleSelections() throws Exception {
-    List<Date> multipleSelectedDates = new ArrayList<Date>();
-    multipleSelectedDates.add(minDate);
+    List<Date> selectedDates = new ArrayList<Date>();
+    selectedDates.add(minDate);
     // This one should work.
     view.init(minDate, maxDate) //
         .inMode(SINGLE) //
-        .withSelectedDates(multipleSelectedDates);
+        .withSelectedDates(selectedDates);
 
     // Now add another date and try init'ing again in SINGLE mode.
     Calendar secondSelection = buildCal(2012, NOVEMBER, 17);
-    multipleSelectedDates.add(secondSelection.getTime());
+    selectedDates.add(secondSelection.getTime());
     try {
       view.init(minDate, maxDate) //
           .inMode(SINGLE) //
-          .withSelectedDates(multipleSelectedDates);
+          .withSelectedDates(selectedDates);
       fail("Should not have been able to init() with SINGLE mode && multiple selected dates");
     } catch (IllegalArgumentException expected) {
     }
@@ -221,7 +222,7 @@ public void testNullDates() throws Exception {
     try {
       view.init(validDate, validDate) //
           .inMode(SINGLE) //
-          .withSelectedDate((Date) null);
+          .withSelectedDate(null);
       fail("Should not have been able to pass in a null startDate");
     } catch (IllegalArgumentException expected) {
     }
@@ -328,13 +329,16 @@ public void testShowingOnlyOneMonth() throws Exception {
   }
 
   @Test
-  public void selectDateReturnsFalseForDatesOutOfRange() {
+  public void selectDateThrowsExceptionForDatesOutOfRange() {
     view.init(minDate, maxDate) //
         .inMode(SINGLE) //
         .withSelectedDate(today.getTime());
     Calendar outOfRange = buildCal(2015, FEBRUARY, 1);
-    boolean wasAbleToSetDate = view.selectDate(outOfRange.getTime());
-    assertThat(wasAbleToSetDate).isFalse();
+    try {
+      view.selectDate(outOfRange.getTime());
+      fail("selectDate should've blown up with an out of range date");
+    } catch (IllegalArgumentException expected) {
+    }
   }
 
   @Test
@@ -374,8 +378,6 @@ public void testMultiselectWithNoInitialSelections() throws Exception {
     assertThat(view.getSelectedDates().get(1)).hasTime(secondSelection.getTimeInMillis());
   }
 
-  // TODO add tests for PERIOD and SELECTED_PERIOD
-
   @Test
   public void testOnDateConfiguredListener() {
     final Calendar testCal = Calendar.getInstance();
@@ -401,34 +403,114 @@ public void testOnDateConfiguredListener() {
   }
 
   @Test
-  public void testPeriodStateOnDateSelections() {
+  public void testRangeSelectionWithNoInitialSelection() throws Exception {
+    view.init(minDate, maxDate)
+        .inMode(RANGE);
+    assertThat(view.selectedCals).hasSize(0);
+    assertThat(view.selectedCells).hasSize(0);
+
+    Calendar nov18 = buildCal(2012, NOVEMBER, 18);
+    view.selectDate(nov18.getTime());
+    assertOneDateSelected();
+
+    Calendar nov24 = buildCal(2012, NOVEMBER, 24);
+    view.selectDate(nov24.getTime());
+    assertRangeSelected();
+
+    assertRangeSelectionBehavior();
+  }
+
+  private void assertRangeSelectionBehavior() {
+    // Start a new range in the middle of the current (Nov 18 - Nov 24) one.
+    Calendar nov20 = buildCal(2012, NOVEMBER, 20);
+    view.selectDate(nov20.getTime());
+    assertOneDateSelected();
+
+    // Finish that range.
+    Calendar nov26 = buildCal(2012, NOVEMBER, 26);
+    view.selectDate(nov26.getTime());
+    assertRangeSelected();
+
+    // Start a new range in the middle of the current (Nov 20 - Nov 26) one.
+    Calendar nov24 = buildCal(2012, NOVEMBER, 24);
+    view.selectDate(nov24.getTime());
+    assertOneDateSelected();
+
+    // Only Nov 24 is selected: going backward should start a new range.
+    view.selectDate(nov20.getTime());
+    assertOneDateSelected();
+  }
+
+  @Test
+  public void testRangeWithTwoInitialSelections() throws Exception {
+    Calendar nov18 = buildCal(2012, NOVEMBER, 18);
+    Calendar nov24 = buildCal(2012, NOVEMBER, 24);
+    List<Date> selectedDates = Arrays.asList(nov18.getTime(), nov24.getTime());
+    view.init(minDate, maxDate)
+        .inMode(RANGE)
+        .withSelectedDates(selectedDates);
+    assertRangeSelected();
+
+    assertRangeSelectionBehavior();
+  }
+
+  @Test
+  public void testRangeWithOneInitialSelection() throws Exception {
+    Calendar nov18 = buildCal(2012, NOVEMBER, 18);
+    Calendar nov24 = buildCal(2012, NOVEMBER, 24);
+    List<Date> selectedDates = Arrays.asList(nov18.getTime());
+    view.init(minDate, maxDate)
+        .inMode(RANGE)
+        .withSelectedDates(selectedDates);
+    assertOneDateSelected();
+
+    view.selectDate(nov24.getTime());
+    assertRangeSelected();
+
+    assertRangeSelectionBehavior();
+  }
+
+  private void assertRangeSelected() {
+    assertThat(view.selectedCals).hasSize(2);
+    assertThat(view.selectedCells).hasSize(7);
+    assertThat(view.getSelectedDates()).hasSize(7);
+  }
+
+  private void assertOneDateSelected() {
+    assertThat(view.selectedCals).hasSize(1);
+    assertThat(view.selectedCells).hasSize(1);
+    assertThat(view.getSelectedDates()).hasSize(1);
+  }
+
+  @Test
+  public void testRangeStateOnDateSelections() {
     Calendar startCal = buildCal(2012, NOVEMBER, 17);
     Calendar endCal = buildCal(2012, NOVEMBER, 24);
 
     view.init(minDate, maxDate) //
-        .inMode(SELECTED_PERIOD);
-    
+        .inMode(RANGE);
+
     boolean wasAbleToSetDate = view.selectDate(startCal.getTime());
     assertThat(wasAbleToSetDate).isTrue();
 
     wasAbleToSetDate = view.selectDate(endCal.getTime());
     assertThat(wasAbleToSetDate).isTrue();
 
-    List<List<MonthCellDescriptor>> cells = getCells(NOVEMBER, 2012, startCal);
-    assertCell(cells, 2, 6, 17, true, true, false, true, PeriodState.FIRST);
-    assertCell(cells, 3, 0, 18, true, false, false, true, PeriodState.MIDDLE);
-    assertCell(cells, 3, 1, 19, true, false, false, true, PeriodState.MIDDLE);
-    assertCell(cells, 3, 2, 20, true, false, false, true, PeriodState.MIDDLE);
-    assertCell(cells, 3, 3, 21, true, false, false, true, PeriodState.MIDDLE);
-    assertCell(cells, 3, 4, 22, true, false, false, true, PeriodState.MIDDLE);
-    assertCell(cells, 3, 5, 23, true, false, false, true, PeriodState.MIDDLE);
-    assertCell(cells, 3, 6, 24, true, true, false, true, PeriodState.LAST);
+    List<List<MonthCellDescriptor>> cells = getCells(NOVEMBER, 2012);
+    assertCell(cells, 2, 6, 17, true, true, false, true, MonthCellDescriptor.RangeState.FIRST);
+    assertCell(cells, 3, 0, 18, true, false, false, true, MonthCellDescriptor.RangeState.MIDDLE);
+    assertCell(cells, 3, 1, 19, true, false, false, true, MonthCellDescriptor.RangeState.MIDDLE);
+    assertCell(cells, 3, 2, 20, true, false, false, true, RangeState.MIDDLE);
+    assertCell(cells, 3, 3, 21, true, false, false, true, RangeState.MIDDLE);
+    assertCell(cells, 3, 4, 22, true, false, false, true, MonthCellDescriptor.RangeState.MIDDLE);
+    assertCell(cells, 3, 5, 23, true, false, false, true, MonthCellDescriptor.RangeState.MIDDLE);
+    assertCell(cells, 3, 6, 24, true, true, false, true, MonthCellDescriptor.RangeState.LAST);
   }
 
   @Test
   public void testLocaleSetting() throws Exception {
     view.init(minDate, maxDate) //
-      .withLocale(Locale.GERMAN);
+        .withLocale(Locale.GERMAN);
     MonthView monthView = (MonthView) view.getAdapter().getView(1, null, null);
     CalendarRowView header = (CalendarRowView) monthView.grid.getChildAt(0);
     TextView firstDay = (TextView) header.getChildAt(0);
@@ -438,18 +520,23 @@ public void testLocaleSetting() throws Exception {
 
   private static void assertCell(List<List<MonthCellDescriptor>> cells, int row, int col,
       int expectedVal, boolean expectedCurrentMonth, boolean expectedSelected,
-      boolean expectedToday, boolean expectedSelectable, PeriodState expectedPeriodState) {
+      boolean expectedToday, boolean expectedSelectable, MonthCellDescriptor.RangeState expectedRangeState) {
     final MonthCellDescriptor cell = cells.get(row).get(col);
     assertThat(cell.getValue()).isEqualTo(expectedVal);
     assertThat(cell.isCurrentMonth()).isEqualTo(expectedCurrentMonth);
     assertThat(cell.isSelected()).isEqualTo(expectedSelected);
     assertThat(cell.isToday()).isEqualTo(expectedToday);
     assertThat(cell.isSelectable()).isEqualTo(expectedSelectable);
-    assertThat(cell.getPeriodState()).isEqualTo(expectedPeriodState);
+    assertThat(cell.getRangeState()).isEqualTo(expectedRangeState);
   }
 
-  private List<List<MonthCellDescriptor>> getCells(int month, int year, Calendar selectedDate) {
+  private List<List<MonthCellDescriptor>> selectDateAndGetCells(int month, int year,
+      Calendar selectedDate) {
     view.selectDate(selectedDate.getTime());
+    return getCells(month, year);
+  }
+
+  private List<List<MonthCellDescriptor>> getCells(int month, int year) {
     Calendar cal = Calendar.getInstance();
     cal.set(DAY_OF_MONTH, 1);
     cal.set(YEAR, year);
@@ -463,6 +550,7 @@ private Calendar buildCal(int year, @MagicConstant(intValues = {
   }) int month, int day) {
     Calendar jumpToCal = Calendar.getInstance();
     jumpToCal.set(year, month, day);
+    CalendarPickerView.setMidnight(jumpToCal);
     return jumpToCal;
   }
 }
diff --git a/sample/res/layout/calendar_picker.xml b/sample/res/layout/sample_calendar_picker.xml
similarity index 81%
rename from sample/res/layout/calendar_picker.xml
rename to sample/res/layout/sample_calendar_picker.xml
index 43dff954..c17b9b12 100644
--- a/sample/res/layout/calendar_picker.xml
+++ b/sample/res/layout/sample_calendar_picker.xml
@@ -15,7 +15,8 @@
             android:id="@+id/button_single"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Single" />
+            android:text="Single"
+            android:enabled="false"/>
 
         <Button
             android:id="@+id/button_multi"
@@ -24,16 +25,10 @@
             android:text="Multi" />
 
         <Button
-            android:id="@+id/button_period"
+            android:id="@+id/button_range"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Period" />
-
-        <Button
-            android:id="@+id/button_speriod"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="S-Period" />
+            android:text="Range" />
 
     </LinearLayout>
     
diff --git a/sample/src/com/squareup/timessquare/sample/SampleTimesSquareActivity.java b/sample/src/com/squareup/timessquare/sample/SampleTimesSquareActivity.java
index 44e558c6..00734642 100644
--- a/sample/src/com/squareup/timessquare/sample/SampleTimesSquareActivity.java
+++ b/sample/src/com/squareup/timessquare/sample/SampleTimesSquareActivity.java
@@ -22,32 +22,42 @@ public class SampleTimesSquareActivity extends Activity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setContentView(R.layout.calendar_picker);
+    setContentView(R.layout.sample_calendar_picker);
 
     final Calendar nextYear = Calendar.getInstance();
     nextYear.add(Calendar.YEAR, 1);
 
+    final Calendar lastYear = Calendar.getInstance();
+    lastYear.add(Calendar.YEAR, -1);
+
     calendar = (CalendarPickerView) findViewById(R.id.calendar_view);
-    calendar.init(new Date(), nextYear.getTime()) //
+    calendar.init(lastYear.getTime(), nextYear.getTime()) //
         .inMode(SelectionMode.SINGLE) //
         .withSelectedDate(new Date());
 
-    Button single = (Button) findViewById(R.id.button_single);
+    final Button single = (Button) findViewById(R.id.button_single);
+    final Button range = (Button) findViewById(R.id.button_range);
+    final Button multi = (Button) findViewById(R.id.button_multi);
     single.setOnClickListener(new OnClickListener() {
-
       @Override
       public void onClick(View v) {
+        single.setEnabled(false);
+        multi.setEnabled(true);
+        range.setEnabled(true);
+
         calendar.init(new Date(), nextYear.getTime()) //
             .inMode(SelectionMode.SINGLE) //
             .withSelectedDate(new Date());
       }
     });
 
-    Button multi = (Button) findViewById(R.id.button_multi);
     multi.setOnClickListener(new OnClickListener() {
-
       @Override
       public void onClick(View v) {
+        single.setEnabled(true);
+        multi.setEnabled(false);
+        range.setEnabled(true);
+
         Calendar today = Calendar.getInstance();
         ArrayList<Date> dates = new ArrayList<Date>();
         for (int i = 0; i < 5; i++) {
@@ -60,36 +70,21 @@ public void onClick(View v) {
       }
     });
 
-    Button period = (Button) findViewById(R.id.button_period);
-    period.setOnClickListener(new OnClickListener() {
-
+    range.setOnClickListener(new OnClickListener() {
       @Override
       public void onClick(View v) {
-        Calendar today = Calendar.getInstance();
-        ArrayList<Date> dates = new ArrayList<Date>();
-        today.add(Calendar.DAY_OF_MONTH, 3);
-        dates.add(today.getTime());
-        today.add(Calendar.DAY_OF_MONTH, 5);
-        dates.add(today.getTime());
-        calendar.init(new Date(), nextYear.getTime()) //
-            .inMode(SelectionMode.PERIOD) //
-            .withSelectedDates(dates);
-      }
-    });
-
-    Button sPeriod = (Button) findViewById(R.id.button_speriod);
-    sPeriod.setOnClickListener(new OnClickListener() {
+        single.setEnabled(true);
+        multi.setEnabled(true);
+        range.setEnabled(false);
 
-      @Override
-      public void onClick(View v) {
         Calendar today = Calendar.getInstance();
         ArrayList<Date> dates = new ArrayList<Date>();
-        today.add(Calendar.DAY_OF_MONTH, 3);
+        today.add(Calendar.DATE, 3);
         dates.add(today.getTime());
-        today.add(Calendar.DAY_OF_MONTH, 5);
+        today.add(Calendar.DATE, 5);
         dates.add(today.getTime());
         calendar.init(new Date(), nextYear.getTime()) //
-            .inMode(SelectionMode.SELECTED_PERIOD) //
+            .inMode(SelectionMode.RANGE) //
             .withSelectedDates(dates);
       }
     });
@@ -97,11 +92,9 @@ public void onClick(View v) {
     findViewById(R.id.done_button).setOnClickListener(new OnClickListener() {
       @Override
       public void onClick(View view) {
-        Log.d(TAG, "Selected time in millis: "
-            + calendar.getSelectedDate().getTime());
+        Log.d(TAG, "Selected time in millis: " + calendar.getSelectedDate().getTime());
         String toast = "Selected: " + calendar.getSelectedDate().getTime();
-        Toast.makeText(SampleTimesSquareActivity.this, toast, LENGTH_SHORT)
-            .show();
+        Toast.makeText(SampleTimesSquareActivity.this, toast, LENGTH_SHORT).show();
       }
     });
   }