diff --git a/_src/_assets/images/chris-messina.jpg b/_src/_assets/images/chris-messina.jpg
new file mode 100644
index 0000000..278462c
Binary files /dev/null and b/_src/_assets/images/chris-messina.jpg differ
diff --git a/_src/_assets/images/john-lilic.jpg b/_src/_assets/images/john-lilic.jpg
new file mode 100644
index 0000000..b6982cc
Binary files /dev/null and b/_src/_assets/images/john-lilic.jpg differ
diff --git a/_src/_assets/images/vinay-gupta.jpg b/_src/_assets/images/vinay-gupta.jpg
new file mode 100644
index 0000000..2f5e593
Binary files /dev/null and b/_src/_assets/images/vinay-gupta.jpg differ
diff --git a/_src/_assets/javascripts/page-features.js b/_src/_assets/javascripts/page-features.js
new file mode 100644
index 0000000..9ba44f5
--- /dev/null
+++ b/_src/_assets/javascripts/page-features.js
@@ -0,0 +1,8 @@
+
+//=include bigchain/testimonials.js
+
+jQuery(function($) {
+
+    Testimonials.init();
+
+});
diff --git a/_src/_data/testimonials.yml b/_src/_data/testimonials.yml
index 35c5f40..cb04434 100644
--- a/_src/_data/testimonials.yml
+++ b/_src/_data/testimonials.yml
@@ -1,20 +1,48 @@
+#
+#
+# Photo paths are relative to /assets/img/
+# Photos of quotees need to be square and should be at least or exact 144x144px.
+#
 
-- name: Juan Benet
-  org: IPFS
-  link: https://ipfs.io
-  image: /assets/img/juan-benet.png
-  quote: 'BigchainDB is exciting! It marries the performance and power of traditional databases with the public verifiability of blockchains.'
+set1:
+    - name: John Lilic
+      org: Consensys
+      link: https://consensys.net/
+      image: john-lilic.jpg
+      quote: 'BigchainDB is a system that affords enterprise an opportunity to credibly consider business processes with very high transaction through-put running on a blockchain.'
 
 
-- name: Ian Worrall
-  org: Encrypted Labs
-  link: http://encryptedlabs.com
-  image: /assets/img/ian-worrall.jpg
-  quote: 'BigchainDB is a game changer. This is the first true solution I have seen that resolves many of the restraints with the Bitcoin blockchain.'
+    - name: Fabian Vogelsteller
+      org: Ethereum Foundation
+      link: https://www.ethereum.org
+      image: fabian-vogelsteller.jpg
+      quote: 'BigchainDB is the logical next step in scaling non-computational blockchains.'
 
 
-- name: Fabian Vogelsteller
-  org: Ethereum Foundation
-  link: https://www.ethereum.org
-  image: /assets/img/fabian-vogelsteller.jpg
-  quote: 'BigchainDB is the logical next step in scaling non-computational blockchains.'
+    - name: Chris Messina
+      org: Uber
+      link: https://www.uber.com
+      image: chris-messina.jpg
+      quote: 'From the makers of ascribe, this has the potential to be a big deal. The team has blown the cap off the conventional blockchain limitations.'
+
+
+set2:
+    - name: Juan Benet
+      org: IPFS
+      link: https://ipfs.io
+      image: juan-benet.png
+      quote: 'BigchainDB is exciting! It marries the performance and power of traditional databases with the public verifiability of blockchains.'
+
+
+    - name: Ian Worrall
+      org: Encrypted Labs
+      link: http://encryptedlabs.com
+      image: ian-worrall.jpg
+      quote: 'BigchainDB is a game changer. This is the first true solution I have seen that resolves many of the restraints with the Bitcoin blockchain.'
+
+
+    - name: Vinay Gupta
+      org: Ethereum Foundation & Consensys
+      link: https://www.ethereum.org/
+      image: vinay-gupta.jpg
+      quote: 'I think framing Ethereum as logic, IPFS as disk and BigchainDB as database - a direct parallel to the web stack - is nothing short of genius and really points the way to the future of this industry and, shortly, the web itself.'
diff --git a/_src/_includes/testimonials.html b/_src/_includes/testimonials.html
index f06acf3..3bc06d8 100644
--- a/_src/_includes/testimonials.html
+++ b/_src/_includes/testimonials.html
@@ -1,7 +1,7 @@
 
 <article class="testimonials grid grid--full grid-medium--fit grid--gutters">
 
-    {% for testimonial in site.data.testimonials %}
+    {% for testimonial in site.data.testimonials.[page.quotes] %}
 
     <div class="grid__col">
         <figure class="testimonial">
@@ -9,7 +9,7 @@
             <blockquote class="testimonial__quote">{{ testimonial.quote }}</blockquote>
 
             <figcaption class="testimonial__caption">
-                <img class="testimonial__avatar" src="{{ testimonial.image }}">
+                <img class="testimonial__avatar" src="/assets/img/{{ testimonial.image }}">
                 <cite class="testimonial__cite">
                     <span class="testimonial__name">{{ testimonial.name }}</span>
                     <span class="testimonial__org"><a href="{{ testimonial.link }}">{{ testimonial.org }}</a></span>
diff --git a/_src/features.html b/_src/features.html
index ffb34a9..f85a00a 100644
--- a/_src/features.html
+++ b/_src/features.html
@@ -3,6 +3,10 @@ layout: page
 
 title: How It Works
 description: 'Rather than trying to scale up blockchain technology, BigchainDB starts with a big data distributed database and then adds blockchain characteristics - decentralized control, immutability and the transfer of digital assets.'
+
+quotes: set2
+
+js: page-features.min.js
 ---
 
 <section class="section section-features">
@@ -213,6 +217,8 @@ description: 'Rather than trying to scale up blockchain technology, BigchainDB s
 
 </section>
 
+{% include section-testimonials.html %}
+
 <section class="section section-contribute background--photo">
     <div class="row">
         <header class="section-header">
diff --git a/_src/index.html b/_src/index.html
index 132e1df..b17f6a0 100644
--- a/_src/index.html
+++ b/_src/index.html
@@ -5,6 +5,8 @@ tagline:    'Meet BigchainDB. The scalable blockchain database.'
 
 front_page: true
 hero_video_name: northern-light
+quotes: set1
+
 js: page-front.min.js
 ---
 
@@ -94,7 +96,7 @@ js: page-front.min.js
     </div>
 </section>
 
-{% include section-testimonials.html  %}
+{% include section-testimonials.html %}
 
 <section class="section section-whitepaper background--photo">
     <div class="row">