diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html
index 0287961e5c49d2070782f0bb28b7105de7e68a54..97c43c444614dc8aa5a7e8cb10676bc6c33b5f32 100644
--- a/pinaxcon/templates/static_pages/homepage.html
+++ b/pinaxcon/templates/static_pages/homepage.html
@@ -76,6 +76,83 @@
     </div>
   </div>
 
+  <div class="jumbotron homepage-block white">
+    <div class="container homepage-block-content">
+      <h1>Speakers</h1>
+
+      <div class="row speaker-list">
+
+{% comment %}
+        <div class="speaker" >
+          <div class="image-alignment">
+            <div class="circle" style="border: 0;">
+                <div class="fill" style="background-image: url('{% static "images/brandon.jpg" %}');"></div>
+            </div>
+          </div>
+          <h4>Brandon Rhodes</h4>
+          <span class="presentation-title">Keynote Speaker</span>
+        </div>
+
+        <div class="speaker" >
+          <div class="image-alignment">
+            <div class="circle" style="border: 0;">
+                <div class="fill" style="background-image: url('{% static "images/cczona.jpg" %}');"></div>
+            </div>
+          </div>
+          <h4>Carina C. Zona</h4>
+          <span class="presentation-title">Keynote Speaker</span>
+        </div>
+
+{% endcomment %}
+
+        {% speakers as speakers %}
+        {% for speaker in speakers %}
+          <div class="speaker" >
+            <div class="image-alignment">
+              <div class="circle" style="border: 0;">
+                {% if speaker.photo %}
+                  <div class="fill" style="background-image: url('{% thumbnail speaker.photo '600x600' %}');"></div>
+                {% else %}
+                  <div class="fill" style="background-image: url('{% static "images/website-background.svg" %}');"></div>
+                {% endif %}
+              </div>
+            </div>
+            {% for presentation in speaker.presentations.all %}
+              <a href="{% url "schedule_presentation_detail" presentation.id %}">
+              <h4>{{ speaker.conferencespeaker.name }}</h4>
+                <span class="presentation-title">{{ presentation.title }}</span>
+              </a>
+            {% endfor %}
+          </div>
+        {% endfor %}
+
+{% comment %}
+        <div class="speaker" >
+          <div class="image-alignment">
+            <div class="circle" style="border: 0;">
+                <div class="fill" style="background-image: url('{% static "images/vmbrasseur.jpg" %}');"></div>
+            </div>
+          </div>
+          <h4>VM Brasseur</h4>
+          <span class="presentation-title">Speaker Training</span>
+        </div>
+
+      </div>
+{% endcomment %}
+    </div>
+
+    <div class="homepage-block-footer full-width">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-4">
+            <a class="btn btn-lg btn-primary btn-shadow" href="/schedule">See the schedule</a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
   <div class="jumbotron homepage-block dark">
     <div class="homepage-block-bg mystic-background"></div>
     <div class="container homepage-block-content">
@@ -86,10 +163,10 @@
       <ul>
         <li>An historic venue with countless restaurants and coffee shops in walking distance</li>
         <li>World-famous craft food and drink producers on your doorstep</li>
-        <li>Charming small-town hotels, as close as one block away</li>
+        <li>Charming <a href="/attend/hotels">small-town hotels</a>, as close as one block away</li>
       </ul>
 
-      <p>&hellip; and it's only an hour away from San Francisco (on a good day).</p>
+      <p>&hellip; and it's <a href="/attend/travel">only an hour away from San Francisco</a> (on a good day).</p>
     </div>
 
     <div class="homepage-block-footer full-width">
@@ -97,6 +174,8 @@
         <div class="row">
           <div class="col-md-4">
             <a class="btn btn-lg btn-primary btn-shadow" href="/about/petaluma">Learn More</a>
+            <a class="btn btn-lg btn-info" href="/attend/hotels">Hotels</a>
+            <a class="btn btn-lg btn-info" href="/attend/travel">Travel</a>
           </div>
 
           <div class="col-md-8 text-right photo-attribution">