diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index e018c874..73eba29f 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -162,6 +162,7 @@ MIDDLEWARE_CLASSES = [
     "django.contrib.messages.middleware.MessageMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
     "reversion.middleware.RevisionMiddleware",
+    "waffle.middleware.WaffleMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.contrib.flatpages.middleware.FlatpageFallbackMiddleware",
     'pinaxcon.monkey_patch.MonkeyPatchMiddleware',
@@ -227,8 +228,9 @@ INSTALLED_APPS = [
     "jquery",
     "djangoformsetjs",
 
-    # testing
+    # testing and rollout
     "django_nose",
+    "waffle",
 ]
 
 DEBUG_TOOLBAR_PANELS = [
diff --git a/pinaxcon/templates/symposion/schedule/_grid.html b/pinaxcon/templates/symposion/schedule/_grid.html
index ef138b7b..fb8cbfd0 100644
--- a/pinaxcon/templates/symposion/schedule/_grid.html
+++ b/pinaxcon/templates/symposion/schedule/_grid.html
@@ -1,4 +1,5 @@
 {% load lca2018_tags %}
+{% load waffle_tags %}
 <table class="calendar table table-bordered">
   <thead>
     <tr>
@@ -35,20 +36,22 @@
                 <span class="speaker">
                   {{ slot.content.speakers|join:", " }}
                 </span>
-                {% if slot.sessions %}
-                  <div>
-                    {% for session in slot.sessions.all %}
-                      {% if not session.chair %}
-                        <br />
-                        <a href="{% url "schedule_session_detail" session.id %}">Volunteer! 🙋</a>
-                      {% elif session.chair.user == request.user %}
-                        <br />
-                        <a href="{% url "schedule_session_detail" session.id %}">(You are session chair)</a>
-                      {% endif %}
-                      </a>
-                    {% endfor %}
-                  </div>
-                {% endif %}
+                {% flag "session_chair" %}
+                  {% if slot.sessions %}
+                    <div>
+                      {% for session in slot.sessions.all %}
+                        {% if not session.chair %}
+                          <br />
+                          <a href="{% url "schedule_session_detail" session.id %}">Volunteer! 🙋</a>
+                        {% elif session.chair.user == request.user %}
+                          <br />
+                          <a href="{% url "schedule_session_detail" session.id %}">(You are session chair)</a>
+                        {% endif %}
+                        </a>
+                      {% endfor %}
+                    </div>
+                  {% endif %}
+                {% endflag %}
               {% endif %}
             {% elif slot.kind.label == "shortbreak" %}
             {% else %}
diff --git a/requirements.txt b/requirements.txt
index 921aea38..4f1f9a32 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,3 +42,4 @@ pinax-stripe==3.2.1
 requests>=2.11.1
 stripe==1.38.0
 
+django-waffle>=0.12.0