diff --git a/Studies/resources/queries/study/assignment.query.xml b/Studies/resources/queries/study/assignment.query.xml
new file mode 100644
index 000000000..4885dec2e
--- /dev/null
+++ b/Studies/resources/queries/study/assignment.query.xml
@@ -0,0 +1,28 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="assignment" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date Added</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="enddate">
+                        <columnTitle>End Date</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="study">
+                        <columnTitle>Study</columnTitle>
+                    </column>
+                    <column columnName="subgroup">
+                        <columnTitle>Sub-Group</columnTitle>
+                    </column>
+                    <column columnName="category">
+                        <columnTitle>Category</columnTitle>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/Studies/resources/query/study/demographics.query.xml b/Studies/resources/queries/study/demographics.query.xml
similarity index 53%
rename from Studies/resources/query/study/demographics.query.xml
rename to Studies/resources/queries/study/demographics.query.xml
index 9df49a04a..5b516500b 100644
--- a/Studies/resources/query/study/demographics.query.xml
+++ b/Studies/resources/queries/study/demographics.query.xml
@@ -28,6 +28,34 @@
                             query.Id~eq=${Id}
                         </url>
                     </column>
+                    <column columnName="objectId">
+                        <isHidden>true</isHidden>
+                        <isKeyField>true</isKeyField>
+                    </column>
+                    <column columnName="sex">
+                        <columnTitle>Sex</columnTitle>
+                    </column>
+                    <column columnName="geographic_origin">
+                        <columnTitle>Geographic Origin</columnTitle>
+                    </column>
+                    <column columnName="birth">
+                        <columnTitle>Birth</columnTitle>
+                    </column>
+                    <column columnName="death">
+                        <columnTitle>Death</columnTitle>
+                    </column>
+                    <column columnName="species">
+                        <columnTitle>Species</columnTitle>
+                    </column>
+                    <column columnName="mother">
+                        <columnTitle>Mother</columnTitle>
+                    </column>
+                    <column columnName="father">
+                        <columnTitle>Father</columnTitle>
+                    </column>
+                    <column columnName="calculated_status">
+                        <columnTitle>Status</columnTitle>
+                    </column>
                 </columns>
             </table>
         </tables>
diff --git a/Studies/resources/queries/study/flags.query.xml b/Studies/resources/queries/study/flags.query.xml
new file mode 100644
index 000000000..6e2b23eda
--- /dev/null
+++ b/Studies/resources/queries/study/flags.query.xml
@@ -0,0 +1,22 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="flags" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date Added</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="enddate">
+                        <columnTitle>End Date</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="flag">
+                        <columnTitle>Flag</columnTitle>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/Studies/resources/queries/study/genetics.query.xml b/Studies/resources/queries/study/genetics.query.xml
new file mode 100644
index 000000000..54b08daef
--- /dev/null
+++ b/Studies/resources/queries/study/genetics.query.xml
@@ -0,0 +1,30 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="flags" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date Added</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="category">
+                        <columnTitle>Category</columnTitle>
+                    </column>
+                    <column columnName="assayType">
+                        <columnTitle>Assay Type</columnTitle>
+                    </column>
+                    <column columnName="marker">
+                        <columnTitle>Marker/Allele</columnTitle>
+                    </column>
+                    <column columnName="result">
+                        <columnTitle>Result</columnTitle>
+                    </column>
+                    <column columnName="score">
+                        <columnTitle>Score</columnTitle>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/Studies/resources/queries/study/immunizations.query.xml b/Studies/resources/queries/study/immunizations.query.xml
new file mode 100644
index 000000000..833d0fde2
--- /dev/null
+++ b/Studies/resources/queries/study/immunizations.query.xml
@@ -0,0 +1,33 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="immunizations" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date Added</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="category">
+                        <columnTitle>Category</columnTitle>
+                    </column>
+                    <column columnName="treatment">
+                        <columnTitle>Treatment</columnTitle>
+                    </column>
+                    <column columnName="route">
+                        <columnTitle>Route</columnTitle>
+                    </column>
+                    <column columnName="quantity">
+                        <columnTitle>Quantity</columnTitle>
+                    </column>
+                    <column columnName="quantity_units">
+                        <columnTitle>Quantity Units</columnTitle>
+                    </column>
+                    <column columnName="reason">
+                        <columnTitle>Reason</columnTitle>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
\ No newline at end of file
diff --git a/Studies/resources/queries/study/labwork.query.xml b/Studies/resources/queries/study/labwork.query.xml
new file mode 100644
index 000000000..0e07d77e1
--- /dev/null
+++ b/Studies/resources/queries/study/labwork.query.xml
@@ -0,0 +1,34 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="labwork" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="category">
+                        <columnTitle>Category</columnTitle>
+                    </column>
+                    <column columnName="test">
+                        <columnTitle>Test</columnTitle>
+                    </column>
+                    <column columnName="result">
+                        <columnTitle>Result</columnTitle>
+                    </column>
+                    <column columnName="units">
+                        <columnTitle>Units</columnTitle>
+                    </column>
+                    <column columnName="qualResult">
+                        <columnTitle>Qualitative Result</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="method">
+                        <columnTitle>Method</columnTitle>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/Studies/resources/queries/study/procedures.query.xml b/Studies/resources/queries/study/procedures.query.xml
new file mode 100644
index 000000000..b866f8b5f
--- /dev/null
+++ b/Studies/resources/queries/study/procedures.query.xml
@@ -0,0 +1,22 @@
+ <query xmlns="http://labkey.org/data/xml/query">
+    <metadata> 
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="procedures" tableDbType="TABLE">
+                <columns>
+                    <column columnName="Id">
+                        <url />
+                    </column>
+                    <column columnName="date">
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="category">
+                        <columnTitle>Category</columnTitle>
+                    </column>
+                    <column columnName="procedure">
+                        <columnTitle>Procedure</columnTitle>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
\ No newline at end of file
diff --git a/Studies/resources/queries/study/samples.query.xml b/Studies/resources/queries/study/samples.query.xml
new file mode 100644
index 000000000..87ac54943
--- /dev/null
+++ b/Studies/resources/queries/study/samples.query.xml
@@ -0,0 +1,31 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="samples" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date Added</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="sampleid">
+                        <columnTitle>Sample ID</columnTitle>
+                    </column>
+                    <column columnName="sampleType">
+                        <columnTitle>Sample Type</columnTitle>
+                    </column>
+                    <column columnName="preservation">
+                        <columnTitle>Preservation</columnTitle>
+                    </column>
+                    <column columnName="quantity">
+                        <columnTitle>Quantity</columnTitle>
+                    </column>
+                    <column columnName="quantity_units">
+                        <columnTitle>Quantity Units</columnTitle>
+                    </column>
+
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
\ No newline at end of file
diff --git a/Studies/resources/query/study/studyData.query.xml b/Studies/resources/queries/study/studyData.query.xml
similarity index 100%
rename from Studies/resources/query/study/studyData.query.xml
rename to Studies/resources/queries/study/studyData.query.xml
diff --git a/Studies/resources/queries/study/treatments.query.xml b/Studies/resources/queries/study/treatments.query.xml
new file mode 100644
index 000000000..c92ad7063
--- /dev/null
+++ b/Studies/resources/queries/study/treatments.query.xml
@@ -0,0 +1,65 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="treatments" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="enddate">
+                        <columnTitle>End Date</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="category">
+                        <columnTitle>Category</columnTitle>
+                    </column>
+                    <column columnName="treatment">
+                        <columnTitle>Treatment</columnTitle>
+                    </column>
+                    <column columnName="route">
+                        <columnTitle>Route</columnTitle>
+                    </column>
+                    <column columnName="frequency">
+                        <columnTitle>Frequency</columnTitle>
+                    </column>
+                    <column columnName="amount">
+                        <columnTitle>Amount</columnTitle>
+                    </column>
+                    <column columnName="amountUnits">
+                        <columnTitle>Amount Units</columnTitle>
+                    </column>
+                    <column columnName="volume">
+                        <columnTitle>Volume</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="vol_units">
+                        <columnTitle>Volume Units</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="concentration">
+                        <columnTitle>Concentration</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="conc_units">
+                        <columnTitle>Conc. Units</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="dosage">
+                        <columnTitle>Dosage</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="dosage_units">
+                        <columnTitle>Dosage Units</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="reason">
+                        <columnTitle>Reason</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/Studies/resources/queries/study/viralloads.query.xml b/Studies/resources/queries/study/viralloads.query.xml
new file mode 100644
index 000000000..8699aa8f5
--- /dev/null
+++ b/Studies/resources/queries/study/viralloads.query.xml
@@ -0,0 +1,40 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="flags" tableDbType="TABLE" useColumnOrder="true">
+                <columns>
+                    <column columnName="Id"/>
+                    <column columnName="date">
+                        <columnTitle>Date</columnTitle>
+                        <formatString>Date</formatString>
+                    </column>
+                    <column columnName="sampleType">
+                        <columnTitle>Sample Type</columnTitle>
+                    </column>
+                    <column columnName="assayType">
+                        <columnTitle>Assay Type</columnTitle>
+                    </column>
+                    <column columnName="target">
+                        <columnTitle>target</columnTitle>
+                    </column>
+                    <column columnName="lod">
+                        <columnTitle>LOD</columnTitle>
+                    </column>
+                    <column columnName="result">
+                        <columnTitle>Result</columnTitle>
+                    </column>
+                    <column columnName="units">
+                        <columnTitle>Units</columnTitle>
+                    </column>
+                    <column columnName="qualResult">
+                        <columnTitle>Qualitative Result</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="resultOORIndicator">
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>
diff --git a/Studies/resources/query/study/weight.query.xml b/Studies/resources/queries/study/weight.query.xml
similarity index 67%
rename from Studies/resources/query/study/weight.query.xml
rename to Studies/resources/queries/study/weight.query.xml
index 929c141e3..24e484dd7 100644
--- a/Studies/resources/query/study/weight.query.xml
+++ b/Studies/resources/queries/study/weight.query.xml
@@ -3,6 +3,12 @@
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="weight" tableDbType="TABLE">
                 <columns>
+                    <column columnName="Id">
+                        <url />
+                    </column>
+                    <column columnName="date">
+                        <isHidden>true</isHidden>
+                    </column>
                     <column columnName="weight">
                         <columnTitle>Weight (kg)</columnTitle>
                         <formatString>0.####</formatString>
diff --git a/Studies/resources/query/study/flags.query.xml b/Studies/resources/query/study/flags.query.xml
deleted file mode 100644
index e8d0348bf..000000000
--- a/Studies/resources/query/study/flags.query.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<query xmlns="http://labkey.org/data/xml/query">
-    <metadata>
-        <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="flags" tableDbType="TABLE" useColumnOrder="true">
-                <columns>
-                    <column columnName="Id"/>
-                    <column columnName="date">
-                        <columnTitle>Date Added</columnTitle>
-                        <formatString>Date</formatString>
-                    </column>
-                    <column columnName="enddate">
-                        <columnTitle>Date Removed</columnTitle>
-                        <isHidden>false</isHidden>
-                        <formatString>Date</formatString>
-                    </column>
-<!--                    <column columnName="category">-->
-<!--                        <columnTitle>Category</columnTitle>-->
-<!--                        <isHidden>true</isHidden>-->
-<!--                        <fk>-->
-<!--                            <fkDbSchema>ehr_lookups</fkDbSchema>-->
-<!--                            <fkTable>flag_categories</fkTable>-->
-<!--                            <fkColumnName>category</fkColumnName>-->
-<!--                            <fkDisplayColumnName useRawValue="true"/>-->
-<!--                        </fk>-->
-<!--                    </column>-->
-<!--                    <column columnName="flag">-->
-<!--                        <columnTitle>Flag</columnTitle>-->
-<!--                        <fk>-->
-<!--                            <fkDbSchema>ehr_lookups</fkDbSchema>-->
-<!--                            <fkTable>flag_values</fkTable>-->
-<!--                            <fkColumnName>objectid</fkColumnName>-->
-<!--                            <fkDisplayColumnName>value</fkDisplayColumnName>-->
-<!--                        </fk>-->
-<!--                    </column>-->
-                    <column columnName="value">
-                        <columnTitle>Value</columnTitle>
-                        <isHidden>true</isHidden>
-                    </column>
-                </columns>
-            </table>
-        </tables>
-    </metadata>
-</query>
diff --git a/Studies/resources/query/study/samples.query.xml b/Studies/resources/query/study/samples.query.xml
deleted file mode 100644
index b3f9fa380..000000000
--- a/Studies/resources/query/study/samples.query.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<query xmlns="http://labkey.org/data/xml/query">
-    <metadata>
-        <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="samples" tableDbType="TABLE" useColumnOrder="true">
-                <columns>
-
-                </columns>
-            </table>
-        </tables>
-    </metadata>
-</query>
\ No newline at end of file
diff --git a/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml b/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml
index de46c5955..346bd0300 100644
--- a/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml
+++ b/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml
@@ -31,5 +31,11 @@
         <dataset name="immunizations" showByDefault="true" category="Research" type="Standard" id="10">
             <tags/>
         </dataset>
+        <dataset name="genetics" showByDefault="true" category="Research" type="Standard" id="11">
+            <tags/>
+        </dataset>
+        <dataset name="procedures" showByDefault="true" category="Research" type="Standard" id="12">
+            <tags/>
+        </dataset>
     </datasets>
 </datasets>
diff --git a/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml b/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml
index 4db53dd2a..d536f5c76 100644
--- a/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml
+++ b/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -334,4 +334,59 @@
         </columns>
         <tableTitle>Samples</tableTitle>
     </table>
+    <table tableName="genetics" tableDbType="TABLE">
+        <columns>
+            <column columnName="Id">
+                <datatype>varchar</datatype>
+                <conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
+            </column>
+            <column columnName="date">
+                <datatype>timestamp</datatype>
+                <conceptURI>http://cpas.labkey.com/laboratory#sampleDate</conceptURI>
+            </column>
+            <column columnName="objectid">
+                <datatype>entityid</datatype>
+                <isKeyField>true</isKeyField>
+            </column>
+            <column columnName="category">
+                <datatype>varchar</datatype>
+            </column>
+            <column columnName="assayType">
+                <datatype>varchar</datatype>
+            </column>
+            <column columnName="marker">
+                <datatype>varchar</datatype>
+            </column>
+            <column columnName="result">
+                <datatype>varchar</datatype>
+            </column>
+            <column columnName="score">
+                <datatype>double</datatype>
+            </column>
+        </columns>
+        <tableTitle>Genetic Data</tableTitle>
+    </table>
+    <table tableName="procedures" tableDbType="TABLE">
+        <columns>
+            <column columnName="Id">
+                <datatype>varchar</datatype>
+                <conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
+            </column>
+            <column columnName="date">
+                <datatype>timestamp</datatype>
+                <conceptURI>http://cpas.labkey.com/laboratory#sampleDate</conceptURI>
+            </column>
+            <column columnName="objectid">
+                <datatype>entityid</datatype>
+                <isKeyField>true</isKeyField>
+            </column>
+            <column columnName="category">
+                <datatype>varchar</datatype>
+            </column>
+            <column columnName="procedure">
+                <datatype>varchar</datatype>
+            </column>
+        </columns>
+        <tableTitle>Procedures</tableTitle>
+    </table>
 </tables>