diff --git a/wherehows-web/app/templates/components/dataset-compliance.hbs b/wherehows-web/app/templates/components/dataset-compliance.hbs
index 03051d975f..55ac07a5d1 100644
--- a/wherehows-web/app/templates/components/dataset-compliance.hbs
+++ b/wherehows-web/app/templates/components/dataset-compliance.hbs
@@ -1,5 +1,5 @@
 <div id="compliance" class="tab-body">
-  {{#if privacyCompliancePolicy}}
+  {{!--{{#if privacyCompliancePolicy}}
     {{#if isNewPrivacyCompliancePolicy}}
       <h5 class="bg-info tab_head">
         This dataset does not have an associated "Privacy Compliance Policy".<br>
@@ -80,6 +80,117 @@
     </div>
   {{else}}
     <h3>An error occurred: Privacy Compliance Policy is not available.</h3>
+  {{/if}}--}}
+  <section class="metadata-prompt" id="has-member">
+    <header>
+      <p>Can any fields in this dataset's schema be used to identify a member?</p>
+    </header>
+    <span>
+      {{#radio-button-composer
+        value=true
+        name="has-member"
+        groupValue=(readonly radioSelection.memberId)
+        changed=(action 'didChangePrivacyIdentifiable')}}
+        Yes
+      {{/radio-button-composer}}
+      {{#radio-button-composer
+        value=false
+        name="has-member"
+        groupValue=(readonly radioSelection.memberId)
+        changed=(action 'didChangePrivacyIdentifiable')}}
+        No
+      {{/radio-button-composer}}
+    </span>
+  </section>
+
+  {{#if showSubjectMemberIdPrompt}}
+    <section class="metadata-prompt" id="has-subject-member">
+      <header>
+        <p>
+          If there are no owner member fields, does each record in this dataset belong to a specific member or members?
+        </p>
+      </header>
+      <span>
+        {{#radio-button-composer
+          value=true
+          name="has-subject-member"
+          groupValue=(readonly radioSelection.subjectMemberId)
+          changed=(action 'didChangePrivacyIdentifiable')}}
+          Yes
+        {{/radio-button-composer}}
+        {{#radio-button-composer
+          value=false
+          name="has-subject-member"
+          groupValue=(readonly radioSelection.subjectMemberId)
+          changed=(action 'didChangePrivacyIdentifiable')}}
+          No
+        {{/radio-button-composer}}
+    </span>
+    </section>
   {{/if}}
+
+  {{#if showUrnIdPrompt}}
+    <section class="metadata-prompt" id="has-urn">
+      <header>
+        <p>When a record in this dataset is deleted, do any fields identify records from other dependent datasets that
+          should be deleted?</p>
+      </header>
+      <span>
+        {{#radio-button-composer
+          value=true
+          name="has-urn"
+          groupValue=(readonly radioSelection.urnId)
+          changed="didChangePrivacyIdentifiable"}}
+          Yes
+        {{/radio-button-composer}}
+        {{#radio-button-composer
+          value=false
+          name="has-urn"
+          groupValue=(readonly radioSelection.urnId)
+          changed="didChangePrivacyIdentifiable"}}
+          No
+        {{/radio-button-composer}}
+    </span>
+    </section>
+  {{/if}}
+
+  {{#if showOrgIdPrompt}}
+    <section class="metadata-prompt" id="has-org">
+      <header>
+        <p>Do fields in the schema contain the ID of an organization?</p>
+      </header>
+      <span>
+        {{#radio-button-composer
+          value=true
+          name="has-organization"
+          groupValue=(readonly radioSelection.orgId)
+          changed="didChangePrivacyIdentifiable"}}
+          Yes
+        {{/radio-button-composer}}
+        {{#radio-button-composer
+          value=false
+          name="has-organization"
+          groupValue=(readonly radioSelection.orgId)
+          changed="didChangePrivacyIdentifiable"}}
+          No
+        {{/radio-button-composer}}
+    </span>
+    </section>
+  {{/if}}
+
+  {{dataset-schema-table
+    sortColumnWithName=sortColumnWithName
+    filterBy=filterBy
+    sortDirection=sortDirection
+    searchTerm=searchTerm
+    fields=complianceFields
+    fieldFormats=identifierTypes
+    onFormatChange=(action "onFieldFormatChange")
+    onPrivacyChange=(action "onFieldPrivacyChange")}}
+
+  <button class="btn btn-primary" {{action "saveCompliance"}}>
+    {{if isNewPrivacyCompliancePolicy "Create New Policy" "Confirm Privacy Fields"}}
+  </button>
+  <button class="btn btn-default" {{action "resetCompliance"}}>Reset</button>
 </div>
-{{yield}}
+{{yield}}
\ No newline at end of file
diff --git a/wherehows-web/app/templates/components/dataset-confidential.hbs b/wherehows-web/app/templates/components/dataset-confidential.hbs
index 7a5b831e41..a23933d50e 100644
--- a/wherehows-web/app/templates/components/dataset-confidential.hbs
+++ b/wherehows-web/app/templates/components/dataset-confidential.hbs
@@ -1,108 +1,8 @@
 <div id="confidential" class="tab-body">
-  {{#if securitySpecification}}
-    {{#if isNewSecuritySpecification}}
-      <h5 class="bg-info tab_head">
-        This dataset does not have an associated "Security Specification".<br>
-        To create one update fields as required and click the "Create" button below.
-      </h5>
-    {{/if}}
-    <label class="lbl">
-      <span class="lbl__text">Retention</span>
-      {{#ember-selector values=retentionTypes
-                        selection=retention
-                        selectionDidChange="updateRetentionType"}}
-      {{/ember-selector}}
-    </label>
-    <label class="lbl">
-      <span class="lbl__text">Geographic Affinity</span>
-      {{#ember-selector values=affinityTypes
-                        selection=geographicAffinity
-                        selectionDidChange="updateGeographicAffinity"}}
-      {{/ember-selector}}
-    </label>
-    <label class="lbl">
-      <span class="lbl__text">Record Owner Type</span>
-      {{#ember-selector values=recordOwnerTypes
-                        selection=recordOwnerType
-                        selectionDidChange="updateRecordOwnerType"}}
-      {{/ember-selector}}
-    </label>
-
-    <header class="typeahead-header">
-      <div class="field-names">
-        <h4>Field Names</h4>
-        <input type="text"
-               id="confidential-typeahead"
-               class="field-search__input form-control"
-               placeholder="Filter field names...">
-      </div>
-      <h4>Data Type</h4>
+  <section class="metadata-prompt" id="has-confidentiality">
+    <header>
+      <p>Which fields should be classified as Confidential or Highly Confidential (if any)?</p>
     </header>
-    <section class="typeahead-matches">
-      {{#each matchingFields as |matchingField|}}
-        {{#draggable-item content=matchingField.value class="draggable__item item-source"}}
-          <span class="match-pill__value">{{matchingField.value}}</span>
-          {{#if matchingField.dataType}}
-            <span class="match-pill__data-type">{{matchingField.dataType}}</span>
-          {{/if}}
-        {{/draggable-item}}
-      {{else}}
-        <span class="classification-list-help">No results found.</span>
-      {{/each}}
-    </section>
-    <section class="drop-bucket panel panel-default">
-      <!-- TODO: Refactor as component -->
-      <div class="panel-heading">
-        <h4>Confidential Classification</h4>
-        <sub>Add items by dragging to relevant cells below</sub>
-      </div>
-      <table class="table table-bordered">
-        <tbody>
-        {{#each classification as |classifier|}}
-          <tr>
-            <th>{{classifier.label}}</th>
-            <td class="drop-bucket__td">
-              {{#drop-region dropped="addToClassification" param=classifier.key}}
-                {{#if classifier.values}}
-                  <ul class="drop-bucket__ul">
-                    {{#each classifier.values as |value|}}
-                      {{#if value}}
-                        <li class="draggable__item">
-                          {{value}}
-                          <i class="glyphicon glyphicon-remove" aria-hidden="true"
-                            {{action "removeFromClassification" value
-                                     classifier.key
-                                     on='click'}}></i>
-                        </li>
-                      {{/if}}
-                    {{/each}}
-                  </ul>
-                {{else}}
-                  <span class="classification-list-help">Drag relevant search result items here...</span>
-                {{/if}}
-              {{/drop-region}}
-            </td>
-          </tr>
-        {{/each}}
-        </tbody>
-      </table>
-    </section>
-    <div class="cta">
-      {{#if isApproved}}<!-- TODO: not yet implemented on BE -->
-        <button class="btn btn-primary" {{action 'disapproveSecuritySpecification'}}>
-          Remove Approval
-        </button>
-      {{else}}
-        <button class="btn btn-primary" {{action 'approveSecuritySpecification'}}>Approve</button>
-      {{/if}}
-
-      <button class="btn btn-primary" {{action 'saveSecuritySpecification'}}>
-        {{if isNewSecuritySpecification 'Create' 'Save'}}
-      </button>
-      <button class="btn btn-default" {{action 'resetSecuritySpecification'}}>Reset</button>
-    </div>
-  {{else}}
-    <h3>An error occurred: Security Specification is not available.</h3>
-  {{/if}}
+  </section>
 </div>
 {{yield}}