diff --git a/bobpay/public/index.html b/bobpay/public/index.html
index 62dfbad..f9b9d91 100755
--- a/bobpay/public/index.html
+++ b/bobpay/public/index.html
@@ -225,6 +225,14 @@ <h2 class="section-heading">Install BobPay</h2>
                     </p>
                     <input id="alipay" type="checkbox" value="">AliPay</label>
                     <p id="bobpayerror" class="error-message"></p>
+                    <br>
+                    <br>
+                    <h2 class="section-heading">Setup FIDO / WebAuthn</h2>
+                    <span>
+                        WebAuthn:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <a href="#webauthn-register" onclick="new WebAuthnTransaction().register()">Register <img src="https://www.gstatic.com/images/icons/material/system/1x/cloud_download_black_24dp.png"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <a href="#webauthn-register" onclick="new FidoLocalStorage().deleteAll()">Delete All <img src="https://www.gstatic.com/images/icons/material/system/1x/delete_black_24dp.png"></a>
+                    </span>
                 </div>
             </div>
         </div>
@@ -248,6 +256,10 @@ <h2 class="section-heading">Install BobPay</h2>
     <!-- Theme JavaScript -->
     <script src="js/new-age.min.js"></script>
 
+    <!-- FIDO / WebAuthn Library -->
+    <!-- TODO: update URL when development is mature -->
+    <script src="https://rawgit.com/apowers313/fido-local-server/master/fido-local-server.js"></script>
+
 </body>
 
 </html>
diff --git a/bobpay/public/pay/index.html b/bobpay/public/pay/index.html
index 20148c4..b8bdc97 100644
--- a/bobpay/public/pay/index.html
+++ b/bobpay/public/pay/index.html
@@ -41,15 +41,26 @@ <h1>You are paying with BobPay</h1>
     function pay() {
       if(!paymentRequestClient) return;
 
-      var paymentAppResponse = {
-        methodName: "https://emerald-eon.appspot.com/bobpay",
-        details: {
-          id: "123456"
-        }
-      };
-
-      paymentRequestClient.postMessage(paymentAppResponse);
-      window.close();
+      var authn = new WebAuthnTransaction();
+
+      authn.authenticate()
+        .then(() => {
+          var paymentAppResponse = {
+            methodName: "https://emerald-eon.appspot.com/bobpay",
+            details: {
+              id: "123456"
+            }
+          };
+
+          paymentRequestClient.postMessage(paymentAppResponse);
+          window.close();
+        })
+        .catch((e) => {
+          // TODO: need to think about the error path here: retry? fail payment?
+          console.log ("Authentication failed");
+          console.log (e);
+          throw e;
+        });
     }
 
     function cancel() {