diff --git a/data/schema.graphql b/data/schema.graphql
index d40b4399e8..ab566eb8ce 100644
--- a/data/schema.graphql
+++ b/data/schema.graphql
@@ -618,6 +618,8 @@ type Case implements Node {
   submitter_slide_ids: String
   annotations: CaseAnnotations
   demographic: Demographic
+  metadata_participant: MetadataParticipant
+  metadata_sample: [MetadataSample]
   diagnoses: Diagnoses
   files: CaseFiles
   exposures: Exposures
@@ -629,6 +631,46 @@ type Case implements Node {
   score: Int
 }
 
+type MetadataParticipant{
+  participant: Int
+  age_2012: Int
+  totMETs1: Float
+  weight_lbs: Float
+}
+
+type MetadataSample{
+
+  id: Int
+  project: String
+  sample: String
+  participant: Int
+  DaysSince1Jan12: Int
+  drAlcohol: Float
+  drB12: Float
+  drCalories: Float
+  drCarbs: Float
+  drCholine: Float
+  drFat: Float
+  drFiber: Float
+  drFolate: Float
+  drIron: Float
+  drProtein: Float
+  participant: Int
+  q2Alcohol: String
+  q2B12: String
+  q2Calories: String
+  q2Carbs: String
+  q2Choline: String
+  q2Fat: String
+  q2Fiber: String
+  q2Folate: String
+  q2Iron: String
+  q2Protein: String
+  Time: String
+  week: Int
+}
+
+
 type CaseAggregations {
   updated_datetime: Aggregations
   submitter_analyte_ids: Aggregations
@@ -657,6 +699,9 @@ type CaseAggregations {
   demographic__demographic_id: Aggregations
   demographic__ethnicity: Aggregations
   demographic__year_of_death: NumericAggergations
+  metadata_participant__age_2012: Aggregations
+  metadata_participant__totMETs1: Aggregations
+  metadata_participant__weight_lbs: Aggregations
   lost_to_followup: Aggregations
   state: Aggregations
   case_id: Aggregations
diff --git a/src/packages/@ncigdc/components/TabPieCharts/RepoCasesPies.js b/src/packages/@ncigdc/components/TabPieCharts/RepoCasesPies.js
index a7d15037b4..618088ded5 100644
--- a/src/packages/@ncigdc/components/TabPieCharts/RepoCasesPies.js
+++ b/src/packages/@ncigdc/components/TabPieCharts/RepoCasesPies.js
@@ -16,6 +16,9 @@ export type TProps = {
     demographic__ethnicity: { buckets: [TBucket] },
     demographic__gender: { buckets: [TBucket] },
     demographic__race: { buckets: [TBucket] },
+    metadata_participant__age_2012:  { buckets: [TBucket] },
+    metadata_participant__totMETs1: { buckets: [TBucket] },
+    metadata_participant__weight_lbs: { buckets: [TBucket] },
     primary_site: { buckets: [TBucket] },
     project__program__name: { buckets: [TBucket] },
     project__project_id: { buckets: [TBucket] },
@@ -60,11 +63,41 @@ const RepoCasesPiesComponent = ({ aggregations, query, push }: TProps) => {
           width={125}
         />
       </ColumnCenter>
-      <ColumnCenter className="test-gender">
-        <PieTitle>Gender</PieTitle>
+      <ColumnCenter className="test-age">
+        <PieTitle>Age in 2012</PieTitle>
         <SelfFilteringPie
-          buckets={_.get(aggregations, 'demographic__gender.buckets')}
-          fieldName="cases.demographic.gender"
+          buckets={_.get(aggregations, 'metadata_participant__age_2012.buckets')}
+          fieldName="cases.metadata_participant.age_2012"
+          docTypeSingular="case"
+          currentFieldNames={currentFieldNames}
+          currentFilters={currentFilters}
+          query={query}
+          push={push}
+          path="doc_count"
+          height={125}
+          width={125}
+        />
+      </ColumnCenter>
+      <ColumnCenter className="test-weight">
+        <PieTitle>Weight Lbs</PieTitle>
+        <SelfFilteringPie
+          buckets={_.get(aggregations, 'metadata_participant__weight_lbs.buckets')}
+          fieldName="cases.metadata_participant.weight_lbs"
+          docTypeSingular="case"
+          currentFieldNames={currentFieldNames}
+          currentFilters={currentFilters}
+          query={query}
+          push={push}
+          path="doc_count"
+          height={125}
+          width={125}
+        />
+      </ColumnCenter>
+     <ColumnCenter className="test-totMETs1">
+        <PieTitle>totMETs1</PieTitle>
+        <SelfFilteringPie
+          buckets={_.get(aggregations, 'metadata_participant__totMETs1.buckets')}
+          fieldName="cases.metadata_participant.totMETs1"
           docTypeSingular="case"
           currentFieldNames={currentFieldNames}
           currentFilters={currentFilters}
@@ -101,6 +134,24 @@ export const RepoCasesPiesQuery = {
             key
           }
         }
+        metadata_participant__age_2012 {
+          buckets {
+            doc_count
+            key
+          }
+        }
+        metadata_participant__totMETs1 {
+          buckets {
+            doc_count
+            key
+          }
+        }
+        metadata_participant__weight_lbs {
+          buckets {
+            doc_count
+            key
+          }
+        }
         primary_site {
           buckets {
             doc_count
diff --git a/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.js b/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.js
index d3ee25a8bf..05272dbc52 100644
--- a/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.js
+++ b/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.js
@@ -31,9 +31,9 @@ export type TProps = {
   facets: { facets: string },
   parsedFacets: Object,
   aggregations: {
-    demographic__ethnicity: { buckets: [TBucket] },
-    demographic__gender: { buckets: [TBucket] },
-    demographic__race: { buckets: [TBucket] },
+    metadata_participant__age_2012: { buckets: [TBucket] },
+    metadata_participant__totMETs1: { buckets: [TBucket] },
+    metadata_participant__weight_lbs: { buckets: [TBucket] },
     primary_site: { buckets: [TBucket] },
     project__program__name: { buckets: [TBucket] },
     project__project_id: { buckets: [TBucket] },
@@ -81,23 +81,23 @@ const presetFacets = [
     type: 'terms',
   },
   {
-    title: 'Gender',
-    field: 'demographic.gender',
-    full: 'cases.demographic.gender',
+    title: 'Age in 2012',
+    field: 'metadata_participant.age_2012',
+    full: 'cases.metadata_participant.age_2012',
     doc_type: 'cases',
     type: 'keyword',
   },
   {
-    title: 'Race',
-    field: 'demographic.race',
-    full: 'cases.demographic.race',
+    title: 'totMETs1',
+    field: 'metadata_participant.totMETs1',
+    full: 'cases.metadata_participant.totMETs1',
     doc_type: 'cases',
     type: 'keyword',
   },
   {
-    title: 'Ethnicity',
-    field: 'demographic.ethnicity',
-    full: 'cases.demographic.ethnicity',
+    title: 'Weight Lbs',
+    field: 'metadata_participant.weight_lbs',
+    full: 'cases.metadata_participant.weight_lbs',
     doc_type: 'cases',
     type: 'keyword',
   },
diff --git a/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.relay.js b/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.relay.js
index 700556895c..068ef5db45 100644
--- a/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.relay.js
+++ b/src/packages/@ncigdc/modern_components/CaseAggregations/CaseAggregations.relay.js
@@ -77,19 +77,19 @@ export default (Component: ReactClass<*>) =>
                         key
                       }
                     }
-                    demographic__gender {
+                    metadata_participant__age_2012 {
                       buckets {
                         doc_count
                         key
                       }
                     }
-                    demographic__race {
+                    metadata_participant__totMETs1 {
                       buckets {
                         doc_count
                         key
                       }
                     }
-                    demographic__ethnicity {
+                    metadata_participant__weight_lbs {
                       buckets {
                         doc_count
                         key
diff --git a/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.model.js b/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.model.js
index 41bc0dd0a9..75f1a5c763 100644
--- a/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.model.js
+++ b/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.model.js
@@ -7,6 +7,7 @@ import { makeFilter } from '@ncigdc/utils/filters';
 import FileSize from '@ncigdc/components/FileSize';
 
 import { PROJECTLINK } from '@ncigdc/utils/constants'
+import { STORAGELINK } from '@ncigdc/utils/constants'
 
 const filesTableModel = [
   {
@@ -45,12 +46,13 @@ const filesTableModel = [
   {
     name: 'File Name',
     id: 'file_name',
+    file_id: 'file_id',
     sortable: true,
     downloadable: true,
     th: () => <Th>File Name</Th>,
     td: ({ node }) => (
       <Td style={{ whiteSpace: 'pre-line', wordBreak: 'break-all' }}>
-        <a href={PROJECTLINK}>
+         <a href={node.file_id.replace("gs://",STORAGELINK)}>
           {node.file_name}
         </a>
       </Td>
@@ -65,7 +67,7 @@ const filesTableModel = [
         {uniq(
           node.cases.hits.edges.map(e => e.node.project.project_id),
         ).map(pId => (
-          <a href={PROJECTLINK}>
+          <a href={PROJECTLINK + pId}>
             {pId}
           </a>
         ))}
diff --git a/src/packages/@ncigdc/modern_components/ProjectsTable/ProjectsTable.model.js b/src/packages/@ncigdc/modern_components/ProjectsTable/ProjectsTable.model.js
index 9ae4eac249..cb8524e012 100644
--- a/src/packages/@ncigdc/modern_components/ProjectsTable/ProjectsTable.model.js
+++ b/src/packages/@ncigdc/modern_components/ProjectsTable/ProjectsTable.model.js
@@ -41,7 +41,7 @@ const projectsTableModel = [
     th: () => <Th rowSpan="2">Project</Th>,
     td: ({ node }) => (
       <Td>
-        <a href={PROJECTLINK}>
+        <a href={PROJECTLINK+node.project_id}>
           {node.project_id}
         </a>
       </Td>
diff --git a/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.model.js b/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.model.js
index 093affe6e1..73ffd7f1d9 100644
--- a/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.model.js
+++ b/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.model.js
@@ -94,7 +94,15 @@ const casesTableModel = [
     ),
     td: ({ node, index }) => (
       <Td>
-        {node.submitter_id}
+        <CaseLink
+          uuid={node.case_id}
+          id={`row-${index}-case-link`}
+          merge
+          whitelist={['filters']}
+        >
+          {node.submitter_id}
+        </CaseLink>
+
       </Td>
     ),
   },
@@ -110,7 +118,7 @@ const casesTableModel = [
     ),
     td: ({ node, index }) => (
       <Td>
-        <a href={PROJECTLINK}>
+        <a href={PROJECTLINK+node.project.project_id}>
           {node.project.project_id}
         </a>
       </Td>
@@ -129,18 +137,50 @@ const casesTableModel = [
     td: ({ node }) => <Td key="primary_site">{node.primary_site}</Td>,
   },
   {
-    name: 'Gender',
-    id: 'demographic.gender',
+    name: 'Age in 2012',
+    id: 'metadata_participant.age_2012',
+    sortable: true,
+    downloadable: true,
+    th: () => (
+      <Th key="metadata_participant.age_2012" rowSpan="1">
+        Age in 2012
+      </Th>
+    ),
+    td: ({ node }) => (
+      <Td key="metadata_participant.age_2012">
+        {_.capitalize(node.metadata_participant.age_2012) || '--'}
+      </Td>
+    ),
+  },
+ {
+    name: 'Weight Lbs',
+    id: 'metadata_participant.weight_lbs',
+    sortable: true,
+    downloadable: true,
+    th: () => (
+      <Th key="metadata_participant.weight_lbs" rowSpan="1">
+        Weight Lbs
+      </Th>
+    ),
+    td: ({ node }) => (
+      <Td key="metadata_participant.weight_lbs">
+        {_.capitalize(node.metadata_participant.weight_lbs) || '--'}
+      </Td>
+    ),
+  },
+ {
+    name: 'totMETs1',
+    id: 'metadata_participant.totMETs1',
     sortable: true,
     downloadable: true,
     th: () => (
-      <Th key="demographic.gender" rowSpan="2">
-        Gender
+      <Th key="metadata_participant.totMETs1" rowSpan="1">
+        totMETs1
       </Th>
     ),
     td: ({ node }) => (
-      <Td key="demographic.gender">
-        {_.capitalize(node.demographic.gender) || '--'}
+      <Td key="metadata_participant.totMETs1">
+        {_.capitalize(node.metadata_participant.totMETs1) || '--'}
       </Td>
     ),
   },
@@ -182,28 +222,6 @@ const casesTableModel = [
     th: () => <Th rowSpan="2">Program</Th>,
     td: ({ node }) => <Td>{node.project.program.name}</Td>,
   },
-  {
-    name: 'Ethnicity',
-    id: 'demographic.ethnicity',
-    sortable: false,
-    downloadable: true,
-    hidden: true,
-    th: () => <Th rowSpan="2">Ethnicity</Th>,
-    td: ({ node }) => (
-      <Td>{(node.demographic && node.demographic.ethnicity) || '--'}</Td>
-    ),
-  },
-  {
-    name: 'Race',
-    id: 'demographic.race',
-    sortable: false,
-    downloadable: true,
-    hidden: true,
-    th: () => <Th rowSpan="2">Race</Th>,
-    td: ({ node }) => (
-      <Td>{(node.demographic && node.demographic.race) || '--'}</Td>
-    ),
-  },
 ];
 
 export default casesTableModel;
diff --git a/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.relay.js b/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.relay.js
index a5397913d3..9c5ae3790b 100644
--- a/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.relay.js
+++ b/src/packages/@ncigdc/modern_components/RepoCasesTable/RepoCasesTable.relay.js
@@ -80,10 +80,15 @@ export default (Component: React.Class<*>) =>
                             }
                           }
                         }
-                        demographic {
-                          gender
-                          ethnicity
-                          race
+                        metadata_participant {
+                          age_2012
+                          weight_lbs
+                          totMETs1
+                        }
+                        metadata_sample {
+                          week
+                          drFiber
+                          drCalories
                         }
                         summary {
                           data_categories {
diff --git a/src/packages/@ncigdc/utils/constants.js b/src/packages/@ncigdc/utils/constants.js
index 6238ddaee8..fbc38f6ebb 100644
--- a/src/packages/@ncigdc/utils/constants.js
+++ b/src/packages/@ncigdc/utils/constants.js
@@ -7,7 +7,8 @@ const localStorage = window.localStorage || {};
 
 /* Links */
 
-export const PROJECTLINK = "https://portal.firecloud.org/"
+export const PROJECTLINK = "https://portal.firecloud.org/#workspaces/firecloud-biom-mass/"
+export const STORAGELINK = "https://storage.cloud.google.com/"
 
 /* API ENDPOINTS */