diff --git a/.gitignore b/.gitignore
index 26e52bcb..1e07dd0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@ docker-compose.yml
 /src/WebSDL/WebSDL/settings/settings.json
 settings.json
 settings.*.json
+src/odm2/modelcache.pkl
diff --git a/environment.yml b/environment.yml
index 1b66bc44..3b1eb10e 100644
--- a/environment.yml
+++ b/environment.yml
@@ -39,4 +39,5 @@ dependencies:
         - django-cprofile-middleware
         #used for unicode_compatiblity 
         #should confirm if this is still a dependency
-        - django-utils-six
\ No newline at end of file
+        - django-utils-six
+        - django-formtools
\ No newline at end of file
diff --git a/src/WebSDL/settings/base.py b/src/WebSDL/settings/base.py
index 5ebb36d6..3e02529e 100644
--- a/src/WebSDL/settings/base.py
+++ b/src/WebSDL/settings/base.py
@@ -51,6 +51,7 @@
     'dataloaderinterface.apps.DataloaderinterfaceConfig',
     'hydroshare',
     'leafpack',
+    'streamwatch',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -60,7 +61,9 @@
     'widget_tweaks',
     'requests',
     'reset_migrations',
-    'timeseries_visualization'
+    'timeseries_visualization',
+    'formtools',
+    
 ]
 
 MIDDLEWARE = [
diff --git a/src/dataloaderinterface/ajax.py b/src/dataloaderinterface/ajax.py
index 93dc12a9..a5316342 100644
--- a/src/dataloaderinterface/ajax.py
+++ b/src/dataloaderinterface/ajax.py
@@ -1,18 +1,10 @@
-import json
-from tkinter import E
 from typing import List, Dict, Any
 
-#PRT - temporarily avoiding the Django models because there appears to be a mismatch for the foreign key
-#from dataloaderinterface.models import SensorMeasurement, SiteSensor 
-#SiteSensor -> odm2.results
-#SensorMeasurement -> odm2.resulttimeseries
+from odm2 import odm2datamodels
+odm2_engine = odm2datamodels.odm2_engine
+models = odm2datamodels.models
 
-from odm2 import Session
-from odm2 import engine as _db_engine
-from odm2.models.core import SamplingFeatures, Variables, FeatureActions, Units, Results
-from odm2.models.results import TimeSeriesResultValues
-
-import sqlalchemy as sqla
+import sqlalchemy
 from sqlalchemy.sql import func
 import pandas as pd
 import datetime 
@@ -26,35 +18,33 @@ def get_result_timeseries(request_data:Dict[str,Any]) -> str:
 	end_date = request_data['end_date'] if 'end_date' in request_data.keys() else None
 	if end_date: end_date = datetime.datetime.fromisoformat(end_date.rstrip('Z')) 
 
+	query = sqlalchemy.select(models.TimeSeriesResultValues.valueid, 
+				models.TimeSeriesResultValues.datavalue,
+				models.TimeSeriesResultValues.valuedatetime,
+				models.TimeSeriesResultValues.valuedatetimeutcoffset).\
+			filter(models.TimeSeriesResultValues.resultid == resultid)
+	if interval is not None:
+		filter_args = [models.TimeSeriesResultValues.resultid == resultid]
+		subquery = sqlalchemy.select(func.max(models.TimeSeriesResultValues.valuedatetime) 
+				- datetime.timedelta(days=interval)).\
+			filter(models.TimeSeriesResultValues.resultid == resultid).scalar_subquery()
+		filter_args.append(models.TimeSeriesResultValues.valuedatetime >= subquery)
+		query = query.filter(*filter_args).\
+			order_by(models.TimeSeriesResultValues.valuedatetime.asc())
+	elif start_date is not None and end_date is not None:
+		query = query.filter(models.TimeSeriesResultValues.valuedatetime >= start_date) \
+			.filter(models.TimeSeriesResultValues.valuedatetime <= end_date) \
+			.order_by(models.TimeSeriesResultValues.valuedatetime.asc())
 
-	with Session() as session:
-		filter_args = [TimeSeriesResultValues.resultid == resultid]
-		query = session.query(TimeSeriesResultValues.valueid, 
-					TimeSeriesResultValues.datavalue,
-					TimeSeriesResultValues.valuedatetime,
-					TimeSeriesResultValues.valuedatetimeutcoffset).\
-				filter(TimeSeriesResultValues.resultid == resultid)
-		if interval is not None:
-			subquery = session.query(func.max(TimeSeriesResultValues.valuedatetime) 
-					- datetime.timedelta(days=interval)).\
-				filter(TimeSeriesResultValues.resultid == resultid).scalar_subquery()
-			filter_args.append(TimeSeriesResultValues.valuedatetime >= subquery)
-			query = query.filter(*filter_args).\
-				order_by(TimeSeriesResultValues.valuedatetime.asc())
-		elif start_date is not None and end_date is not None:
-			query = query.filter(TimeSeriesResultValues.valuedatetime >= start_date) \
-				.filter(TimeSeriesResultValues.valuedatetime <= end_date) \
-				.order_by(TimeSeriesResultValues.valuedatetime.asc())
-
-		df = pd.read_sql(query.statement, session.bind)
-		df['valuedatetime'] = df['valuedatetime'] + pd.to_timedelta(df['valuedatetimeutcoffset'], unit='hours')
-		
-		return df.to_json(orient=orient, default_handler=str)
+	df = odm2_engine.read_query(query, output_format='dataframe') 
+	df['valuedatetime'] = df['valuedatetime'] + pd.to_timedelta(df['valuedatetimeutcoffset'], unit='hours')
+	return df.to_json(orient=orient, default_handler=str)
 
 def get_sampling_feature_metadata(request_data:Dict[str,Any]) -> str:
 	sampling_feature_code = str(request_data['sampling_feature_code'])
 
-	with _db_engine.connect() as connection:
+	#TODO - we should convert this to models instead of raw SQL
+	with odm2_engine.session_maker() as session:
 		query = f"SELECT  rs.resultid, rs.resultuuid, samplingfeaturecode, "\
 			"samplingfeaturename, sampledmediumcv, un.unitsabbreviation, "\
 			"un.unitsname, variablenamecv, variablecode, zlocation, " \
@@ -67,14 +57,12 @@ def get_sampling_feature_metadata(request_data:Dict[str,Any]) -> str:
 			f"LEFT JOIN odm2.timeseriesresults AS tsr ON tsr.resultid = rs.resultid " \
 			f"LEFT JOIN odm2.units AS untrs ON untrs.unitsid = tsr.zlocationunitsid "\
 			f"WHERE sf.samplingfeaturecode = '{sampling_feature_code}'; " 
-		df = pd.read_sql(query, connection)
+		df = pd.read_sql(query, session.bind)
 		return df.to_json(orient='records', default_handler=str)
 
 def get_sampling_features(request_data:Dict[str,Any]) -> str:
-	with Session() as session:
-		query = session.query(SamplingFeatures.samplingfeatureuuid, 
-			SamplingFeatures.samplingfeaturecode,
-			SamplingFeatures.samplingfeaturename).\
-			order_by(SamplingFeatures.samplingfeaturecode)
-		df = pd.read_sql(query.statement, session.bind)
-		return df.to_json(orient='records', default_handler=str)	
\ No newline at end of file
+	query = sqlalchemy.select(models.SamplingFeatures.samplingfeatureuuid, 
+		models.SamplingFeatures.samplingfeaturecode,
+		models.SamplingFeatures.samplingfeaturename).\
+		order_by(models.SamplingFeatures.samplingfeaturecode)
+	return odm2_engine.read_query(query)
\ No newline at end of file
diff --git a/src/dataloaderinterface/static/dataloaderinterface/css/style.css b/src/dataloaderinterface/static/dataloaderinterface/css/style.css
index 1ea2823f..b4608a4e 100644
--- a/src/dataloaderinterface/static/dataloaderinterface/css/style.css
+++ b/src/dataloaderinterface/static/dataloaderinterface/css/style.css
@@ -137,6 +137,26 @@ a:hover {
     color: rgb(23, 190, 207);
 }
 
+.icon-dark-blue {
+    color: rgb(0, 53, 71);
+}
+
+.icon-medium-orange {
+    color: rgb(237, 139, 22);;
+}
+
+.icon-teal {
+    color: rgb(0, 94, 84);
+}
+
+.icon-brown-green {
+    color: rgb(133, 128, 1);
+}
+
+.icon-bright-red {
+    color: rgb(225, 82, 60);
+}
+
 .map-container {
     height: 410px;
 }
@@ -980,7 +1000,7 @@ i.material-icons.site-card-icon {
     margin-bottom: 30px;
 }
 
-#new-result-button, #new-leaf-pack-btn {
+#new-result-button, #new-leaf-pack-btn, #new-streamwatch-btn {
     margin-left: 10px;
     margin-bottom: -10px;
     vertical-align: sub;
@@ -1226,6 +1246,21 @@ div#followedSites .mdl-card__menu {
     width: 100px;
 }
 
+.form-streamwatch .field-table input[type="number"] {
+    width: 100%;
+}
+
+.form-streamwatch .num-input .num-field label {
+    width: 100%;
+}
+
+.field-table div.form-field {
+    padding-bottom: 2px;
+    padding-left: 5px;
+    padding-right: 5px;
+
+}
+
 .form-leafpack .fa {
     margin-right: 4px;
 }
@@ -1241,6 +1276,12 @@ div#followedSites .mdl-card__menu {
     padding-bottom: 40px;
 }
 
+.form-leafpack .std-row {
+    margin-left: 20px;
+    padding-left: 20px;
+    padding-bottom: 40px;
+}
+
 .form-leafpack .step-icon {
     font-size: 48px;
     color: #048a8a;
@@ -1294,6 +1335,13 @@ td.label, p.label {
     font-weight: 700;
 }
 
+td.block-label {
+    color: #66CCCC;
+    /* font-weight: 700; */
+    font-style: italic;
+    font-size: 15px
+}
+
 .form-leafpack .step-number {
     display: inline-block;
     border-radius: 50%;
@@ -1475,4 +1523,19 @@ i.file-icon {
     box-shadow: none !important;
     pointer-events: none !important;
     cursor: default !important;
-}
\ No newline at end of file
+}
+
+/* Detail Page Styling */
+.block-label {
+    color: #66CCCC
+}
+
+/* StreamWatch Site Detail Summary Table */
+.streamwatch-site-summary .mdl-data-table th{
+    text-align: center;
+}
+
+.streamwatch-site-summary .mdl-data-table td{
+    text-align: center;
+}
+
diff --git a/src/dataloaderinterface/static/dataloaderinterface/images/WSI_logo_blue_no_circle.png b/src/dataloaderinterface/static/dataloaderinterface/images/WSI_logo_blue_no_circle.png
new file mode 100644
index 00000000..dff8a3fe
Binary files /dev/null and b/src/dataloaderinterface/static/dataloaderinterface/images/WSI_logo_blue_no_circle.png differ
diff --git a/src/dataloaderinterface/static/dataloaderinterface/images/WSI_logo_white_no_circle_unofficial.png b/src/dataloaderinterface/static/dataloaderinterface/images/WSI_logo_white_no_circle_unofficial.png
new file mode 100644
index 00000000..2869bacf
Binary files /dev/null and b/src/dataloaderinterface/static/dataloaderinterface/images/WSI_logo_white_no_circle_unofficial.png differ
diff --git a/src/dataloaderinterface/static/dataloaderinterface/js/manage-streamwatch.js b/src/dataloaderinterface/static/dataloaderinterface/js/manage-streamwatch.js
new file mode 100644
index 00000000..c0f80e10
--- /dev/null
+++ b/src/dataloaderinterface/static/dataloaderinterface/js/manage-streamwatch.js
@@ -0,0 +1,43 @@
+function defaultExperimentsMessage() {
+    $("tr.no-experiments-row").toggleClass("hidden", !!$("tr.leafpack-form:not(.deleted-row)").length);
+}
+
+$(document).ready(function() {
+    $(".btn-delete-experiment").click(function () {
+        var experiment = $(this).parents('tr');
+        $('#confirm-delete-experiment').data('to-delete', experiment).modal('show');
+    });
+
+    $("#btn-confirm-delete-experiment").click(function () {
+        const dialog = $('#confirm-delete-experiment');
+        const row = dialog.data('to-delete');
+        $("#btn-confirm-delete-experiment").prop("disabled", true).text("DELETING ...");
+
+        const sampling_feature_code = $('#sampling_feature_code').attr('sampling_feature_code');
+
+        $.ajax({
+            url: `/sites/${sampling_feature_code}/streamwatch/delete/`,
+            type: 'post',
+            data: {
+                csrfmiddlewaretoken: $('fieldset.form-fieldset input[name="csrfmiddlewaretoken"]').val(),
+                id: row.data('id')
+            }
+        }).done(function (data, message, xhr) {
+            if (xhr.status === 202) {
+                // Valid
+                row.remove();
+                snackbarMsg('StreamWatch assessment has been deleted!');
+
+            } else if (xhr.status === 206) {
+                // Invalid
+                snackbarMsg('StreamWatch assessment could not be deleted!');
+            }
+        }).fail(function (xhr, error) {
+            console.log(error);
+        }).always(function (response, status, xhr) {
+            $("#btn-confirm-delete-experiment").prop("disabled", false).text("DELETE");
+            defaultExperimentsMessage();
+            dialog.modal('hide');
+        });
+    });
+});
\ No newline at end of file
diff --git a/src/dataloaderinterface/static/dataloaderinterface/js/streamwatch-create.js b/src/dataloaderinterface/static/dataloaderinterface/js/streamwatch-create.js
new file mode 100644
index 00000000..29b634ad
--- /dev/null
+++ b/src/dataloaderinterface/static/dataloaderinterface/js/streamwatch-create.js
@@ -0,0 +1,97 @@
+/**
+ * Created by HTAO on 6/7/2022.
+ */
+ $(document).ready(function () {
+    $('.datepicker').datepicker({
+        format: 'yyyy-mm-dd',
+        startDate: '0d'
+    });
+
+    // Validation for placement date
+    $('#id_placement_date, #id_retrieval_date').change(function () {
+        var placement = $('#id_placement_date').val();
+        var retrieval = $('#id_retrieval_date').val();
+        if (placement && retrieval) {
+            var placementDate = new Date(placement);
+            var retrievalDate = new Date(retrieval);
+            if (placementDate > retrievalDate) {
+                $('#id_placement_date')[0].setCustomValidity('Placement date has to be before the retrieval date.');
+            }
+            else {
+                $('#id_placement_date')[0].setCustomValidity('');
+                $('#id_retrieval_date')[0].setCustomValidity('');
+            }
+        }
+        else if (!$(this).val()) {
+            this.setCustomValidity('Please fill out this field.');
+        }
+    });
+
+    favorite =[];
+    //totalForms = $('#id_2_TOTAL_FORMS');
+    let totalForms = document.querySelector("#id_para-TOTAL_FORMS")
+    let sensorForm = document.querySelectorAll(".parameter-form")
+    let container = document.querySelector("#para-container")
+    let addButton = document.querySelector("#para-end")
+
+    let formNum = sensorForm.length-1 // Get the number of the last form on the page with zero-based indexing
+    //alert("My selected types are: " + favorite.join(", "));
+
+    $("input[name='0-activity_type']").click(function() {
+        favorite =[];
+        $.each($("input[name='0-activity_type']:checked"), function(){
+            favorite.push($(this).val());
+        });
+        //alert("My selected types are: " + favorite.join(", "));
+    });
+
+    $("form").submit(function() {
+        // favorite =[];
+        // $.each($("input[name='0-activity_type']:checked"), function(){
+        //     favorite.push($(this).val());
+        // });
+        //alert("My selected types are: " + favorite.join(", "));
+    });
+
+    $("#id_sensor-test_method").change(function() {
+        //alert("My selected types are: " + $(this).find(":selected").text());
+
+        if($(this).find(":selected").text()!="Meter") { //3rd radiobutton
+            $("#id_sensor-calibration_date").attr("disabled", "disabled"); 
+            $("#id_sensor-meter").attr("disabled", "disabled"); 
+        }
+        else {
+            $("#id_sensor-calibration_date").removeAttr("disabled"); 
+            $("#id_sensor-meter").removeAttr("disabled"); 
+        }
+
+    });
+
+    $(".btn-add-parameter").click(function(){
+        //alert("Add method clicked!");
+        AddSensorParameterForm();
+    }); 
+
+
+    // tutorial for dynamically adding Forms in Django with Formsets and JavaScript
+    // https://www.brennantymrak.com/articles/django-dynamic-formsets-javascript
+    
+    function AddSensorParameterForm() {
+        //e.preventDefault()
+    
+        const newForm = sensorForm[0].cloneNode(true) //Clone the bird form
+        $(newForm).attr('class','row parameter-form');
+        let formRegex = RegExp(`parameter-(\\d){1}-`,'g') //Regex to find all instances of the form number
+
+        formNum++ //Increment the form number
+        newForm.innerHTML = newForm.innerHTML.replace(formRegex, `para-${formNum}-`) //Update the new form to have the correct form number
+
+        //container.insertBefore(newForm, addButton) //Insert the new form at the end of the list of forms
+        //$(newForm).insertBefore( "#btn-add-parameter" );
+        $(newForm).val('');
+        $('.parameter-card').append($(newForm));
+    
+        totalForms.setAttribute('value', `${formNum+1}`) //Increment the number of total forms in the management form
+
+    }
+});
\ No newline at end of file
diff --git a/src/dataloaderinterface/static/dataloaderinterface/js/streamwatch-detail.js b/src/dataloaderinterface/static/dataloaderinterface/js/streamwatch-detail.js
new file mode 100644
index 00000000..7bcf9746
--- /dev/null
+++ b/src/dataloaderinterface/static/dataloaderinterface/js/streamwatch-detail.js
@@ -0,0 +1,6 @@
+$(document).ready(function () {
+
+    $( "#accordion" ).accordion();
+
+
+});
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/dataloaderinterface/footer.html b/src/dataloaderinterface/templates/dataloaderinterface/footer.html
index 7ca196fc..39646139 100644
--- a/src/dataloaderinterface/templates/dataloaderinterface/footer.html
+++ b/src/dataloaderinterface/templates/dataloaderinterface/footer.html
@@ -40,9 +40,9 @@ <h5>Monitor My Watershed® is presented by <a href="https://www.stroudcenter.org
 
         <div class="col-sm-12 col-md-3">
             <h5 class="footer-section-title">DEVELOPED BY</h5>
-            <h5>Utah Water Research Laboratory at Utah State University with contributions from <a
-                    href="https://www.stroudcenter.org/" target="_blank">Stroud Water Research Center</a> and <a
-                    href="https://www.limno.com/" target="_blank">LimnoTech</a></h5>
+            <h5><a
+                href="https://www.limno.com/" target="_blank">LimnoTech</a> with contributions from Utah Water Research Laboratory at Utah State University and <a
+                    href="https://www.stroudcenter.org/" target="_blank">Stroud Water Research Center</a>.</h5>
             <hr class="d-none d-md-block">
             <br class="d-block d-md-none">
 
@@ -59,14 +59,14 @@ <h5>Utah Water Research Laboratory at Utah State University with contributions f
             <br class="d-block d-md-none">
 
             <div class="row">
-                <div class="col-6">
-                    <img class="img-fluid"  alt="Utah State University Logo"
-                         src="{% static 'dataloaderinterface/images/USUlogo.png' %}">
-                </div>
                 <div class="col-6" style="margin-top: 20px;">
                     <img class="img-fluid"  alt="LimnoTech Logo"
                          src="{% static 'dataloaderinterface/images/LimnoTech_Logo_white.png' %}">
                 </div>
+                <div class="col-6">
+                    <img class="img-fluid"  alt="Utah State University Logo"
+                         src="{% static 'dataloaderinterface/images/USUlogo.png' %}">
+                </div>        
             </div>
         </div>
 
@@ -75,13 +75,21 @@ <h5>Utah Water Research Laboratory at Utah State University with contributions f
         </div>
 
         <div class="col-sm-12 col-md-3">
+            <h5 class="footer-section-title">IN PARTNERSHIP WITH</h5>
+            <div class="col-6">
+                <img class="img-fluid"  alt="Utah State University Logo"
+                     src="{% static 'dataloaderinterface/images/WSI_logo_white_no_circle_unofficial.png' %}">
+            </div>
+            <br>
             <h5 class="footer-section-title">WITH SUPPORT FROM</h5>
-            <h5><a href="https://www.williampennfoundation.org/" target="_blank">William Penn Foundation</a></h5>
-            <h5><a href="https://www.nsf.gov/index.jsp" target="_blank">National Science Foundation</a> awards <a
+            <h5><a href="https://www.williampennfoundation.org/" target="_blank">William Penn Foundation</a>, 
+                <a href="https://www.stroudcenter.org/" target="_blank">Stroud Water Research Center</a>, 
+                <a href="https://thewatershed.org/" target="_blank">The Watershed Institute</a>, 
+                <a href="https://www.nsf.gov/index.jsp" target="_blank">National Science Foundation</a> awards <a
                     href="https://www.nsf.gov/awardsearch/showAward?AWD_ID=1331856" target="_blank">EAR-1331856</a>
-                and <a href="https://www.nsf.gov/awardsearch/showAward?AWD_ID=1339834" target="_blank">ACI-1339834</a>
-            </h5>
-            <h5><a href="https://www.stroudcenter.org/" target="_blank">Stroud Water Research Center</a></h5>
+                and <a href="https://www.nsf.gov/awardsearch/showAward?AWD_ID=1339834" target="_blank">ACI-1339834</a>, and                 
+                <a href="https://aws.amazon.com/government-education/nonprofits/aws-imagine-grant-program/" target="_blank">AWS IMAGINE Grant</a>.
+            </h5>            
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/dataloaderinterface/home.html b/src/dataloaderinterface/templates/dataloaderinterface/home.html
index 10222783..1f79c32f 100644
--- a/src/dataloaderinterface/templates/dataloaderinterface/home.html
+++ b/src/dataloaderinterface/templates/dataloaderinterface/home.html
@@ -168,6 +168,66 @@ <h4><a href="{% url 'browse_sites' %}">Explore</a> your data and those contribut
                             </div>
                         </div>
                     </div>
+
+                    
+                    <br><br><br>
+
+                    <div class="row">
+                        <div class="col-sm-8 offset-sm-2 col-md-4 offset-md-2 col-8 offset-2">
+                            <br><br>
+                            <span class="img-row">
+                                <img class="img-fluid"
+                                     src="{% static 'dataloaderinterface/images/WSI_logo_blue_no_circle.png' %}"
+                                     alt="Watershed Institute logo">
+                            </span>
+                        </div>
+                        <div class="col-sm-12 col-md-4">
+                            <div class="mdl-card card-border-left" style="min-height: initial;">
+                                <div class="mdl-card__title">
+                                    Share and Explore Stream Watch Datasets
+                                </div>
+                                <div class="mdl-card__supporting-text">
+                                    <p class="lead"><a href="https://thewatershed.org/" target="_blank">The Watershed Institute</a> is a team focused on keeping water clean, safe and healthy through conservation, advocacy, science and education.
+                                    </p>
+                                </div>
+                            </div>
+                            <br><br><br>
+                        </div>
+                        <div class="col-sm-12 col-lg-8 offset-lg-2">
+                            <div class="row text-center">
+                            
+                                <div class="col-sm-12 col-md-4 text-center row-eq-height">
+                                    <div class="card">
+                                        <h3 class="step-number bg-light-teal">1</h3>
+                                        <i class="fa fa-laptop step-icon bg-dark-teal" aria-hidden="true"></i>
+                                        {% if user.is_authenticated %}
+                                            <h4><a href="{% url 'site_registration' %}">Register</a>
+                                        {% else %}
+                                            <h4><a href="{% url 'login' %}">Register</a>
+                                        {% endif %}
+                                            or find your site.</h4>
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-12 col-md-4 text-center row-eq-height">
+                                    <div class="card">
+                                        <h3 class="step-number bg-light-teal">2</h3>
+                                        <i class="fa fa-search step-icon bg-dark-teal" aria-hidden="true"></i>
+                                        <h4>Conduct your <a href="https://thewatershed.org/streamwatchers-gather-water-quality-data/"
+                                                            target="_blank">Stream Watch Assessment</a> and enter your data.</h4>
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-12 col-md-4 text-center row-eq-height">
+                                    <div class="card">
+                                        <h3 class="step-number bg-light-teal">3</h3>
+                                        <i class="fa fa-map step-icon bg-dark-teal" aria-hidden="true"></i>
+                                        <h4><a href="{% url 'browse_sites' %}">Explore</a> your data and those contributed by others.</h4>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </section>
             </div>
         </div>
diff --git a/src/dataloaderinterface/templates/dataloaderinterface/manage_streamwatch.html b/src/dataloaderinterface/templates/dataloaderinterface/manage_streamwatch.html
new file mode 100644
index 00000000..2ad53360
--- /dev/null
+++ b/src/dataloaderinterface/templates/dataloaderinterface/manage_streamwatch.html
@@ -0,0 +1,132 @@
+{% extends 'dataloaderinterface/base.html' %}
+{% load static %}
+{#{% load helpers %}#}
+{% load widget_tweaks %}
+
+{% block page_title %}
+    <title>Manage StreamWatch Assessments at {{ siteregistration.sampling_feature_code }}</title>
+{% endblock %}
+
+{% block content %}
+    <div class="ribbon bg-medium-teal"></div>
+
+    <div class="ribbon-container">
+        <div class="container main-content ribbon-content mdl-color--white mdl-shadow--4dp">
+            <div class="page-title">Manage StreamWatch Assessments at  
+                <a id="sampling_feature_code" sampling_feature_code="{{ siteregistration.sampling_feature_code|urlencode }}"  style="color: rgb(4, 138, 138);" href="{% autoescape on %}{% url 'site_detail' siteregistration.sampling_feature_code %}{% endautoescape %}">
+                {{ siteregistration.sampling_feature_code }}
+                </a>
+            </div>
+            <fieldset class="form-fieldset">
+                {% csrf_token %}
+                <div class="row">
+                    <div class="col-12">
+                        <a id="new-streamwatch-btn"
+                           href="{% url 'streamwatch:create' siteregistration.sampling_feature_code %}"
+                           class="link-button mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect mdl-button--colored">
+                            <i class="material-icons">add</i>
+                        </a>
+
+                        <div class="mdl-tooltip" data-mdl-for="new-streamwatch-btn">
+                            Add New StreamWatch Assessment
+                        </div>
+
+                        <br><br>
+
+                        <div style="overflow: auto;">
+                            <table class="no-hover mdl-data-table mdl-js-data-table macroinvertebrate">
+                                <thead>
+                                <tr class="full-width">
+                                    <th class="mdl-data-table__cell--non-numeric">Begin Date</th>
+                                    {#<th class="mdl-data-table__cell--non-numeric">Content</th>#}
+                                    <th class="mdl-data-table__cell--non-numeric">Edit</th>
+                                    <th class="mdl-data-table__cell--non-numeric">Delete</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                {% if streamwatchsurveys %}
+                                    {% for survey in streamwatchsurveys %}
+                                        <tr class="bg-white leafpack-form" data-id="{{ survey.actionid }}">
+                                            <td class="mdl-data-table__cell--non-numeric">{{ survey.begindatetime }}</td>
+                                            {#<td class="mdl-data-table__cell--non-numeric">{{ survey.actiontypecv|default:"NA" }}</td>#}
+                                            <td class="mdl-data-table__cell--non-numeric">
+                                                <a href="{% url 'streamwatch:update' siteregistration.sampling_feature_code survey.actionid %}"
+                                                   class="mdl-button mdl-button--accent">
+                                                    <i class="material-icons center-icon">mode_edit</i>
+                                                </a>
+                                            </td>
+                                            <td class="mdl-data-table__cell--non-numeric">
+                                                {% csrf_token %}
+                                                <button class="mdl-button btn-delete-experiment"
+                                                        style="color: #d9534f"
+                                                        type="button">
+                                                    <i class="material-icons center-icon">delete_forever</i>
+                                                </button>
+                                            </td>
+                                            <td class="mdl-data-table__cell--non-numeric">
+                                                <a class="mdl-button mdl-js-button button-link mdl-button--primary"
+                                                   href="{% url 'streamwatch:view' siteregistration.sampling_feature_code survey.actionid %}">
+                                                    View Details
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                {% else %}
+                                <tr class="no-experiments-row bg-white">
+                                    <td colspan="6" class="text-center">
+                                        No assessments have been recorded at this site.
+                                    </td>
+                                </tr>
+                                {% endif %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </fieldset>
+
+            <br><br>
+            <a class="button-link mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect"
+               href="{% autoescape on %}{% url 'site_detail' siteregistration.sampling_feature_code %}{% endautoescape %}">
+                Back to site details
+            </a>
+        </div>
+    </div>
+
+    <div class="modal fade" id="confirm-delete-experiment" role="dialog" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content mdl-modal-content mdl-shadow--4dp">
+                <h4 class="mdl-dialog__title">Delete Survey?</h4>
+
+                <div class="mdl-dialog__content">
+                    <div class="alert alert-danger hidden">All stored data corresponding to
+                        this survey will be deleted.<br/></div>
+                    <p>Are you sure you want to remove this survey?</p>
+                </div>
+                <div class="mdl-dialog__actions text-right">
+                    <button type="button" class="mdl-button mdl-button--raised" id="btn-confirm-delete-experiment">
+                        Delete
+                    </button>
+                    <button type="button" class="mdl-button mdl-button--raised" data-dismiss="modal">Cancel</button>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block services_urls %}
+    {{ block.super }}
+    <input id="leafpack-delete-api" type="hidden" value="{% url 'delete_leafpack_service' %}">
+{% endblock %}
+
+{% block styles %}
+    {{ block.super }}
+{% endblock %}
+
+{% block scripts %}
+    {{ block.super }}
+{#    <script src="{% static 'dataloaderinterface/js/bootstrap-toolkit.min.js' %}"></script>#}
+    <script src="{% static 'dataloaderinterface/js/websdl-utils.js' %}"></script>
+    <script src="{% static 'dataloaderinterface/js/manage-streamwatch.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/dataloaderinterface/site_details.html b/src/dataloaderinterface/templates/dataloaderinterface/site_details.html
index ee9f40e9..33dfa10f 100644
--- a/src/dataloaderinterface/templates/dataloaderinterface/site_details.html
+++ b/src/dataloaderinterface/templates/dataloaderinterface/site_details.html
@@ -532,6 +532,64 @@ <h5 class="page-title grid" style="grid-template-columns: auto auto;">
                 </div>
             </div>
         </div>
+
+        <div class="container ribbon-content mdl-color--white mdl-shadow--4dp">
+            <div class="row">
+                <div class="col-12">
+                    <h5 class="page-title grid" style="grid-template-columns: auto auto;">
+                        <span>StreamWatch Assessments at this Site</span>
+                        <img class="img-fluid img-branding"
+                             src="{% static 'dataloaderinterface/images/WSI_logo_blue_no_circle.png' %}"
+                             alt="Leaf Pack Network logo">
+                    </h5>
+
+                    {% if can_administer_site %}
+                    <div class="buttons-toolbar row">
+                        <div class="col-12 text-right">
+                            <a class="button-link mdl-button mdl-button--colored mdl-js-button mdl-button--raised mdl-js-ripple-effect"
+                               href="{% url 'streamwatches' site.sampling_feature_code %}">
+                                <i class="material-icons center-icon">assignment</i>
+                                Manage Assessments
+                            </a>
+                        </div>
+                        <br>
+                    </div>
+                    {% endif %}
+                </div>
+
+                <div class="col-12 streamwatch-site-summary">
+                    {% if streamwatch %}
+                        <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover" id="streamwatch-site-summary">
+                            <thead>
+                                <tr>                               
+                                    <th>Number of StreamWatch Schools Assessments</th>
+                                    <th>Number of CAT Assessments</th>
+                                    <th>Number of BAT Assessments</th>
+                                    <th>Number of BACT Assessments</th>
+                                    <th>Most Recent Assessment</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>                               
+                                    <td class="streamwatch-site-summary">{{ streamwatch.school }}</td>
+                                    <td >{{ streamwatch.chemical }}</td>
+                                    <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.biological }}</td>
+                                    <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.bacterial }}</td>
+                                    <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.most_recent }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    {% else %}
+                        <div class="grid" style="grid-template-columns: 60px auto;">
+                            <i class="material-icons no-data-icon center-icon" style=" align-self: center">
+                                cloud_off
+                            </i>
+                            <span style=" align-self: center" class="text-muted">No assessments have been added to this site.</span>
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
     </div>
 
     <div class="modal fade" id="data-table-dialog" role="contentinfo" aria-hidden="true">
@@ -605,12 +663,12 @@ <h4>Token and UUID List</h4>
                     <div class="modal-body">
 
                                 <pre class="form-control" id="code-output">
-const char *UUIDs[] =                                                      // UUID array for device sensors
-{{% for sensor in site.sensors.all %}
-    "{{ sensor.result_uuid }}"{% if not forloop.last %},  {% else %}   {% endif %} // {{ sensor.sensor_output.variable_name }} ({{ sensor.sensor_output.variable_code }}){% endfor %}
-};
-const char *registrationToken = "{{ site.registration_token }}";   // Device registration token
-const char *samplingFeature = "{{ site.sampling_feature.sampling_feature_uuid }}";     // Sampling feature UUID</pre>
+                                const char *UUIDs[] =                                                      // UUID array for device sensors
+                                {{% for sensor in site.sensors.all %}
+                                    "{{ sensor.result_uuid }}"{% if not forloop.last %},  {% else %}   {% endif %} // {{ sensor.sensor_output.variable_name }} ({{ sensor.sensor_output.variable_code }}){% endfor %}
+                                };
+                                const char *registrationToken = "{{ site.registration_token }}";   // Device registration token
+                                const char *samplingFeature = "{{ site.sampling_feature.sampling_feature_uuid }}";     // Sampling feature UUID</pre>
 
                     </div>
                     <div class="modal-footer">
diff --git a/src/dataloaderinterface/templates/includes/CAT_sensor_form.template.html b/src/dataloaderinterface/templates/includes/CAT_sensor_form.template.html
new file mode 100644
index 00000000..6c2912b8
--- /dev/null
+++ b/src/dataloaderinterface/templates/includes/CAT_sensor_form.template.html
@@ -0,0 +1,66 @@
+
+{% load widget_tweaks %}
+<div class="col-sm-12 col-md-6 sensor-form">
+    <div class="mdl-card mdl-shadow--2dp full-width">                                    
+        <div class="mdl-card__supporting-text default-font">
+
+            <div class="form-field col-6">
+                <label for="{{ form.test_method.id_for_label }}">{{ form.test_method.label }}</label>
+                {{ form.test_method|add_class:"form-control" }}
+            </div>
+
+            <div class="row">
+                <div class="form-field col-6">
+                    <label for="{{ form.meter.id_for_label }}">{{ form.meter.label }}</label>
+                    {{ form.meter|add_class:"form-control" }}
+                </div> 
+                <div class="form-field col-6">
+                    {{ form.calibration_date.errors }}
+                    <label for="{{ form.calibration_date.id_for_label }}">{{ form.calibration_date.label }}</label>                                               </label>
+                    {{ form.calibration_date|add_class:"form-control datepicker" }}
+                </div>
+            </div>
+            <br><br>
+
+            <div class="measurement-table">                                        
+                <div class="row">
+                    <div class="form-field col"><label>Parameter</label></div> 
+                    <div class="form-field col-3"><label>Measurement</label></div> 
+                    <div class="form-field col-4"><label>Unit</label></div> 
+                </div>
+
+                <div class="row">
+                    <div class="form-field col-5">
+                        {{ form.parameter_1|add_class:"form-control" }}
+                    </div> 
+
+                    <div class="form-field col-3">
+                        {{ form.measurement_1|add_class:"form-control" }}
+                    </div> 
+
+                    <div class="form-field col-4">
+                        {{ form.unit_1|add_class:"form-control" }}
+                    </div> 
+                </div>
+                <div class="row">
+                    <div class="form-field col-5">
+                        {{ form.parameter_2|add_class:"form-control" }}
+                    </div> 
+
+                    <div class="form-field col-3">
+                        {{ form.measurement_2|add_class:"form-control" }}
+                    </div> 
+
+                    <div class="form-field col-4">
+                        {{ form.unit_2|add_class:"form-control" }}
+                    </div> 
+                </div>
+
+            </div>
+            <br>
+
+            <button type="button" class="mdl-button mdl-button--raised mdl-button--colored">Add Parameter</button>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/leafpack/leafpack_detail.html b/src/dataloaderinterface/templates/leafpack/leafpack_detail.html
index 9db8c035..24aa5c81 100644
--- a/src/dataloaderinterface/templates/leafpack/leafpack_detail.html
+++ b/src/dataloaderinterface/templates/leafpack/leafpack_detail.html
@@ -328,7 +328,7 @@ <h4 class="mdl-dialog__title">Delete Leaf Pack Experiment?</h4>
                 </div>
                 <div class="mdl-dialog__actions text-right">
                     <form method="POST"
-                          action="{% autoescape off %}{% url 'leafpack:delete' sampling_feature_code leafpack.id %}{% endautoescape %}">
+                          action="{% autoescape off %}{% url 'leafpack:delete' sampling_feature_code %}{% endautoescape %}">
                         {% csrf_token %}
                         <button type="submit" class="mdl-button mdl-button--raised"
                                 style="background: #d9534f; color:#FFF;" id="btn-confirm-delete">Delete
diff --git a/src/dataloaderinterface/templates/streamwatch/streamwatch_detail.html b/src/dataloaderinterface/templates/streamwatch/streamwatch_detail.html
new file mode 100644
index 00000000..5e91f416
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/streamwatch_detail.html
@@ -0,0 +1,451 @@
+{% extends 'dataloaderinterface/base.html' %}
+{% load static %}
+{% load site %}
+{% load widget_tweaks %}
+
+{% block page_title %}
+    <title>StreamWatch Assessment Details at {{ streamwatch.site_registration.sampling_feature_name }}</title>
+{% endblock %}
+
+{% block content %}
+    <div class="ribbon ribbon-lightblue"></div>
+
+    <div class="ribbon-container">
+        <div class="container ribbon-content mdl-color--white mdl-shadow--4dp">
+            <div class="row">
+                <div class="col-12">
+                    <div class="page-title">
+                        StreamWatch Assessment Details at 
+                        <a href="{% url 'site_detail' sampling_feature_code %}"
+                           style="color: inherit;">
+                            {{ sampling_feature_code }}
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <div class="buttons-toolbar row">
+                <div class="col-12 text-right">
+                    <a href="{% url 'streamwatch:csv_download' sampling_feature_code action_id %}"
+                       class="button-link mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect">
+                        <i class="material-icons center-icon">cloud_download</i> Download CSV
+                    </a>
+
+                    {% if can_administer_site %}
+                        <a href="{% url 'streamwatch:update' sampling_feature_code action_id %}"
+                           id="btn-edit-StreamWatch-exp"
+                           class="button-link mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect">
+                            <i class="material-icons center-icon">mode_edit</i> Edit
+                        </a>
+
+                        <button id="btn-del-leaf-exp" type="button"
+                                data-toggle="modal" data-target="#experiment-delete-dialog"
+                                class="mdl-button mdl-js-ripple-effect mdl-button--raised mdl-button--colored">
+                            <i class="material-icons center-icon">delete_forever</i> Delete
+                        </button>
+                    {% endif %}
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-12 col-md-6">
+                    {# <code>{{ leafpack.uuid }}</code> #}
+                    <h6 class="title">General Information</h6>
+                    <hr class="dotted">
+                    <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                        <tr>
+                            <td class="mdl-data-table__cell--icon"><i class="fa fa-user-o icon-medium-orange" aria-hidden="true"></i></td>
+                            <td class="mdl-data-table__cell--non-numeric label">Investigator #1</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.investigator1 }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--icon"><i class="fa fa-user-o icon-teal" aria-hidden="true"></i></td>
+                            <td class="mdl-data-table__cell--non-numeric label">Investigator #2</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.investigator2 }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--icon"><i class="fa fa-calendar-plus-o icon-brown-green" aria-hidden="true"></i></td>
+                            <td class="mdl-data-table__cell--non-numeric label">Assessment Date</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.collect_date }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--icon"><i class="fa fa-clock-o icon-bright-red" aria-hidden="true"></i></td>
+                            <td class="mdl-data-table__cell--non-numeric label">Assessment Time</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.collect_time }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--icon"><i class="fa fa-file-o icon-blue" aria-hidden="true"></i></td>
+                            <td class="mdl-data-table__cell--non-numeric label">Assessment Type(s)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.assessment_type }}</td>
+                        </tr>
+                    </table>
+                    <br>
+                </div>
+            </div>
+
+                
+            <div class="row">
+                <div class="col-sm-12 col-md-6">
+                    <h6 class="title">Weather Condition and Visual Assessment</h6>
+                    <hr class="dotted">
+                    <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Current Weather</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.weather_cond|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Time Since Last Rain or Snowmelt</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.time_since_last_precip|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Water Color</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.water_color|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Water Odor</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.water_odor|default:"Unknown"}}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Turbidity</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.turbidity_obs|default:"Unknown"  }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Water Movement</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.water_movement|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Surface Coating</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.surface_coating|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Aquatic Vegetation Amount</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.aquatic_veg_amount|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Aquatic Vegetation Type</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.aquatic_veg_type|default:"Unknown"  }}</td>
+                        </tr>                        
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Algae Amount</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.algae_amount|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Algae Type</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.algae_type|default:"Unknown"  }}</td>
+                        </tr>
+                    </table>
+                    <br>
+                    <h6 class="title">Simple Habitat Assessment</h6>
+                    <hr class="dotted">
+                    <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Woody Debris Amount</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_woody_debris_amt|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Woody Debris Type</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_woody_debris_type|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Tree Canopy</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_tree_canopy|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Land Use Characteristics</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_land_use|default:"Unknown" }}</td>
+                        </tr>
+                    </table>
+                    <br>
+                    {% if 'biological' in streamwatch.assessment_type %}
+                    <h6 class="title">Flow Measurements</h6>
+                    <hr class="dotted">
+                    <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Representative Wetted Width</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.rep_wetted_width|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Representative Depth Profile 1</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.rep_depth1|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Representative Depth Profile 2</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.rep_depth2|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Representative Depth Profile 3</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.rep_depth3|default:"Unknown"  }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Representative Depth Profile 4</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.rep_depth4|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Representative Depth Profile 5</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.rep_depth5|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Average Depth</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.avg_depth|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Average Float Time</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.avg_float_time|default:"Unknown"  }}</td>
+                        </tr>                        
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Average Velocity</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.avg_velocity|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Physical Assessment Conducted</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.physical_assessment|default:"Unknown"  }}</td>
+                        </tr>
+                    </table>                    
+                    <br>
+                    {% endif%}
+                </div>
+
+                {% if 'biological' in streamwatch.assessment_type %}
+                <div class="col-sm-12 col-md-6">
+                    <h6 class="title">Detailed Habitat Assessment</h6>
+                    <hr class="dotted">
+                    <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric block-label">Stream Habitat Assessment</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Approximate Reach Length</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.reach_length|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">In-Stream Structures</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.instream_structure|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Stream Flow</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.stream_flow|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Riffle Morphology</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_riffle|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Run Morphology</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_run|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Pool Morphology</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_pool|default:"Unknown" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Woody Debris Amount</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.woody_debris_amt|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Macroinvertebrate Habitat Types</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.macroinvert_habitat_type|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Silt and Clay Substrate</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_silt_clay|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Sand Substrate</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_sand|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Gravel Substrate</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_gravel|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Cobble Substrate</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_cobble|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Boulder Substrate</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_boulder|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Percent Bedrock Substrate</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_bedrock|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric block-label">Riparian Habitat Assessment</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Bank Vegetation Types</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_silt_clay|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Tree Canopy Coverage</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_sand|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Land Uses in 1/4 Mile Radius</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_gravel|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Litter Concentration</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_cobble|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Wildlife Observations</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_boulder|default:"Unknown"  }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Macroinvertebrate Sample Collected?</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.percent_bedrock|default:"Unknown"  }}</td>
+                        </tr>
+                    </table>
+                </div>
+                {% endif %}
+                
+            </div>
+
+            <div class="row">
+                <div class="col-sm-12 col-md-6">
+                    <h6 class="title">Chemical Assessment Measurement(s)</h6>
+                    <hr class="dotted">
+
+                    <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Air Temperature (°C)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_air_temperature|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Water Temperature (°C)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_water_temperature|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Nitrate Nitrogen (ppm)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_nitrate|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Phosphates (ppm)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_phosphate|default:"Unknown"}}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">pH</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_ph|default:"Unknown" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Turbidity Sample Size (mL)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_turbidity_sample_size|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Amount of Turbidity Reagent Added (mL)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_turbidity_reagent_amt|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Turbidity (JTU)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_turbidity|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Dissolved Oxygen (ppm)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_dissolved_oxygen|default:"Unknown" }}</td>
+                        </tr>
+                        <tr>
+                            <td class="mdl-data-table__cell--non-numeric label">Salinity (ppt)</td>
+                            <td class="mdl-data-table__cell--non-numeric">{{ streamwatch.simple_salinity|default:"Unknown" }}</td>
+                        </tr>                        
+                    </table>
+
+                    <div id="accordion" class="title">
+                        {% for measurement  in streamwatch.CAT_measurements%}
+                            <h6>{{measurement.name}}</h6>
+                            <div>
+                                <table class="mdl-data-table mdl-js-data-table mdl-data-table-no-hover full-width no-borders">
+                                    <tr>
+                                        <td class="mdl-data-table__cell--non-numeric label">Test method</td>
+                                        <td class="mdl-data-table__cell--non-numeric">{{measurement.name}}</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="mdl-data-table__cell--non-numeric label">Meter</td>
+                                        <td class="mdl-data-table__cell--non-numeric">{{measurement.id}}</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="mdl-data-table__cell--non-numeric label">Calibration date</td>
+                                        <td class="mdl-data-table__cell--non-numeric">{{measurement.cal_date}}</td>
+                                    </tr>
+                                </table>
+
+                                <table class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp">
+                                    <thead>
+                                    <tr><th class = "mdl-data-table__cell--non-numeric">Parameter</th>
+                                        <th>Measurement</th><th>Unit</th></tr>
+                                    </thead>
+                                    
+                                    <tbody>
+                                        {% for par  in measurement.pars%}
+                                        <tr><td class = "mdl-data-table__cell--non-numeric">{{par.parName}}</td>
+                                            <td>{{par.measurement}}</td><td>{{par.unit}}</td></tr>
+                                        {%endfor%}
+                                    </tbody>
+                                </table>
+                            </div>
+                        {%endfor%}
+                    </div>
+                    
+                    <br><br>
+                </div>
+                
+            </div>
+
+            <div class="row">
+
+                {% if streamwatch.site_observation %}
+                    <div class="col-12">
+                        <h6 class="title">General Comments and Site Observations</h6>
+                        <hr class="dotted">
+                        <p><em>{{ streamwatch.site_observation }}</em></p>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" id="experiment-delete-dialog" role="dialog" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content mdl-modal-content mdl-shadow--4dp">
+                <h4 class="mdl-dialog__title">Delete StreamWatch Assessment?</h4>
+
+                <div class="mdl-dialog__content">
+                    <p>
+                        <strong>WARNING:</strong> All data associated with this experiment will be deleted.<br><br>
+                        <strong>Are you really really really sure you want to do this?</strong>
+                    </p>
+                </div>
+                <div class="mdl-dialog__actions text-right">
+                    <form method="POST"
+                          action="{% autoescape off %}{% url 'streamwatch:delete' sampling_feature_code %}{% endautoescape %}">
+                        {% csrf_token %}
+                        <button type="submit" class="mdl-button mdl-button--raised"
+                                style="background: #d9534f; color:#FFF;" id="btn-confirm-delete">Delete
+                        </button>
+                    </form>
+                    <button type="button" class="mdl-button mdl-button--raised" data-dismiss="modal">Cancel</button>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block styles %}
+    {{ block.super }}
+    <link href="{% static 'dataloaderinterface/css/barchart.css' %}" rel="stylesheet"/>
+{% endblock %}
+
+{% block scripts %}
+    {{ block.super }}
+    <script src="https://d3js.org/d3.v3.min.js"></script>
+    <script src="https://labratrevenge.com/d3-tip/javascripts/d3.tip.v0.6.3.js"></script>
+    <script src="{% static 'dataloaderinterface/js/barchart.js' %}"></script>
+    <script src="{% static 'dataloaderinterface/js/groupBarchart.js' %}"></script>
+    <script src="{% static 'dataloaderinterface/js/streamwatch-detail.js' %}"></script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/streamwatch/streamwatch_registration.html b/src/dataloaderinterface/templates/streamwatch/streamwatch_registration.html
new file mode 100644
index 00000000..d5cf0c71
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/streamwatch_registration.html
@@ -0,0 +1,64 @@
+{% extends 'dataloaderinterface/base.html' %}
+{% load static %}
+{% load site %}
+{% load widget_tweaks %}
+
+{% block page_title %}
+    <title>{% if request.resolver_match.view_name == "streamwatch:create" %}
+        Create StreamWatch Experiment at {{ sampling_feature_code }}
+    {% else %}
+        Edit StreamWatch Experiment at {{ streamwatch.site_registration.sampling_feature_name }}
+    {% endif %}</title>
+{% endblock %}
+
+{% block content %}
+    <div class="ribbon ribbon-lightblue"></div>
+
+    <div class="ribbon-container">
+        <div class="container ribbon-content mdl-color--white mdl-shadow--4dp">
+            <div class="row">
+                <div class="col-12">
+                    <div class="page-title">
+                        {% if request.resolver_match.view_name == "streamwatch:create" %}
+                            Create StreamWatch Experiment at {{ sampling_feature_code }}
+                        {% else %}
+                            Edit StreamWatch Experiment at {{ streamwatch.site_registration.sampling_feature_name }}
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+            <form class="form-streamwatch" method="POST">
+                {% csrf_token %}
+                {{ form.as_p }} 
+
+                <div class="row">
+                    <div class="col">
+                        <a class="button-link mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect"
+                                {% if streamwatch.pk is None %}
+                                    href="{% url 'streamwatches' sampling_feature_code %}"
+                                {% else %}
+                                    href="{% url 'streamwatch:view' sampling_feature_code streamwatch.id %}"
+                                {% endif %}
+                        >Cancel</a>
+                        <button type="submit" class="mdl-button mdl-button--raised mdl-button--colored button--disable-after">
+                            {% if streamwatch.pk is None %}Submit{% else %}Save Edits{% endif %}
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+{% block styles %}
+{{ block.super }}
+<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css" rel="stylesheet"/>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.6/select2-bootstrap.min.css" rel="stylesheet"/>
+{% endblock %}
+
+{% block scripts %}
+{{ block.super }}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.full.min.js"></script>
+<script src="{% static 'dataloaderinterface/js/common-forms.js' %}"></script>
+<script src="{% static 'dataloaderinterface/js/streamwatch-create.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/streamwatch/streamwatch_sensor.html b/src/dataloaderinterface/templates/streamwatch/streamwatch_sensor.html
new file mode 100644
index 00000000..2a418386
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/streamwatch_sensor.html
@@ -0,0 +1,131 @@
+{% extends 'dataloaderinterface/base.html' %}
+{% load static %}
+{% load site %}
+{% load widget_tweaks %}
+{% load i18n %}
+
+{% block page_title %}
+    <title>
+    {% if request.resolver_match.view_name == "streamwatch:create" %}
+        Create StreamWatch Experiment at {{ sampling_feature_code }}
+    {% else %}
+        Edit StreamWatch Experiment at {{ streamwatch.site_registration.sampling_feature_name }}
+    {% endif %}
+    </title>
+{% endblock %}
+
+{% block content %}
+    <div class="ribbon ribbon-lightblue"></div>
+
+    <div class="ribbon-container">
+        <div class="container ribbon-content mdl-color--white mdl-shadow--4dp">
+            <div class="row">
+                <div class="col-12">
+                    <div class="page-title text-center">
+                        {% if request.resolver_match.view_name == "streamwatch:create" %}
+                            <h3>StreamWatch Activity Form</h3>
+                            <h6>Site ID: {{ sampling_feature_code }}</h6>
+                            
+                        {% else %}
+                            <h3>StreamWatch Activity Form</h3>
+                            <h6>Site ID: {{ sampling_feature_code }} (Edit Form)</h6>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+           
+            <form class="form-leafpack form-streamwatch" id="form-container" method="POST" 
+                    {% if request.resolver_match.view_name == "streamwatch:create" %}
+                  action="{% url 'streamwatch:create' sampling_feature_code %}"
+                    {% else %}
+                  action="{% url 'streamwatch:addsensor' sampling_feature_code streamwatch.pk %}"
+                    {% endif %}>
+                {% csrf_token %}
+
+                <div class="row">
+                    <div class="col-12">
+                        <h5 class="headline d-inline-block">Enter measurements taken in the field. Select method then add parameters</h5>
+                    </div>
+                </div>
+
+                <div class="col-sm-12 col-md-6 sensor-form">
+                    <div class="mdl-card mdl-shadow--2dp full-width">                                    
+                        <div class="mdl-card__supporting-text default-font">
+                
+                            <div class="form-field col-6">
+                                <label for="{{ form.test_method.id_for_label }}">{{ form.test_method.label }}</label>
+                                {{ form.test_method|add_class:"form-control" }}
+                            </div>
+
+                            <div class="row">
+                                <div class="form-field col-6">
+                                    <label for="{{ form.meter.id_for_label }}">{{ form.meter.label }}</label>
+                                    {{ form.meter|add_class:"form-control" }}
+                                </div> 
+                                <div class="form-field col-6">
+                                    {{ form.calibration_date.errors }}
+                                    <label for="{{ form.calibration_date.id_for_label }}">{{ form.calibration_date.label }}</label>                                               </label>
+                                    {{ form.calibration_date|add_class:"form-control datepicker" }}
+                                </div>
+                            </div>
+                            <br><br>
+                
+                            <div class="measurement-table">                                        
+                                <div class="row">
+                                    <div class="form-field col"><label>Parameter</label></div> 
+                                    <div class="form-field col-3"><label>Measurement</label></div> 
+                                    <div class="form-field col-4"><label>Unit</label></div> 
+                                </div>
+
+                                {{parameter_forms.management_form}}
+                
+                                {% for pform in parameter_forms %}
+                                <div class="row parameter-form">
+
+                                    {% include 'includes/sensor_parameter_form.template.html' %}
+                                    {% comment %} {{pform.as_table}} {% endcomment %}
+                                </div>
+                                {% endfor %}
+                                
+                            </div>
+                
+                            <button type="button" class="mdl-button mdl-button--raised mdl-button--colored" id="btn-add-parameter">Add Parameter</button>
+                
+                        </div>
+                    </div>
+                </div>
+
+                <br><br>
+                <div class="row">
+                    <div class="col">
+                        <div class="d-flex justify-content-end">
+                        <a class="button-link mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect"
+                                {% if streamwatch.pk is None %}
+                                    href="{% url 'streamwatches' sampling_feature_code %}"
+                                {% else %}
+                                    href="{% url 'streamwatch:view' sampling_feature_code streamwatch.id %}"
+                                {% endif %}
+                        >Cancel</a>
+                        <button type="submit" class="mdl-button mdl-button--raised mdl-button--colored button--disable-after">
+                            {% if streamwatch.pk is None %}Save{% else %}Save Edits{% endif %}
+                        </button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+{% block styles %}
+    {{ block.super }}
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css" rel="stylesheet"/>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.6/select2-bootstrap.min.css" rel="stylesheet"/>
+{% endblock %}
+
+{% block scripts %}
+    {{ block.super }}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.full.min.js"></script>
+    <script src="{% static 'dataloaderinterface/js/common-forms.js' %}"></script>
+    <script src="{% static 'dataloaderinterface/js/streamwatch-create.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/streamwatch/streamwatch_wizard.html b/src/dataloaderinterface/templates/streamwatch/streamwatch_wizard.html
new file mode 100644
index 00000000..8aea0328
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/streamwatch_wizard.html
@@ -0,0 +1,100 @@
+{% extends 'dataloaderinterface/base.html' %}
+{% load static %}
+{% load site %}
+{% load widget_tweaks %}
+{% load i18n %}
+
+{% block page_title %}
+    <title>
+    {% if request.resolver_match.view_name == "streamwatch:create" %}
+        Create StreamWatch Assessment at {{ sampling_feature_code }}
+    {% else %}
+        Edit StreamWatch Assessment at {{ streamwatch.site_registration.sampling_feature_name }}
+    {% endif %}
+    </title>
+{% endblock %}
+
+{% block content %}
+    <div class="ribbon ribbon-lightblue"></div>
+
+    <div class="ribbon-container">
+        <div class="container ribbon-content mdl-color--white mdl-shadow--4dp">
+            <div class="row">
+                <div class="col-12">
+                    <div class="page-title text-center">
+                        {% if request.resolver_match.view_name == "streamwatch:create" %}
+                            <h3>StreamWatch Assessment</h3>
+                            <h6>Site ID: {{ sampling_feature_code }}</h6>
+                            
+                        {% else %}
+                            <h3>StreamWatch Assessment Form</h3>
+                            <h6>Site ID: {{ sampling_feature_code }} (Edit Form)</h6>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+            <form class="form-leafpack form-streamwatch" id="form-container" method="POST" 
+                    {% if request.resolver_match.view_name == "streamwatch:create" %}
+                  action="{% url 'streamwatch:create' sampling_feature_code %}"
+                    {% else %}
+                  action="{% url 'streamwatch:update' sampling_feature_code action_id %}"
+                    {% endif %}>
+                {% csrf_token %}
+
+                <table>
+                    {{ wizard.management_form }}
+                    {% if wizard.form.prefix == 'setup' %}
+                        {% include 'streamwatch/subforms/setup.html' with wizard=wizard %} 
+                    {% elif wizard.form.prefix == 'conditions' %}
+                        {% include 'streamwatch/subforms/conditions.html' with wizard=wizard %} 
+                    {% elif wizard.form.prefix == 'cat' %}
+                        {% include 'streamwatch/subforms/cat.html' with wizard=wizard %}
+                    {% elif wizard.form.prefix == 'simplewaterquality' %}
+                        {% include 'streamwatch/subforms/simple_waterquality.html' with wizard=wizard %}
+                    {% elif wizard.form.prefix == 'simplehabitat' %}
+                        {% include 'streamwatch/subforms/simple_habitat.html' with wizard=wizard %}  
+                    {% else %}
+                        {{wizard.form.as_p}}
+                    {% endif %}
+                </table>
+
+                <br><br>
+                <div class="row">
+                    <div class="col">
+                        <div class="d-flex justify-content-end">
+                        <a class="button-link mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect"
+                                {% if streamwatch.pk is None %}
+                                    href="{% url 'streamwatches' sampling_feature_code %}"
+                                {% else %}
+                                    href="{% url 'streamwatch:view' sampling_feature_code streamwatch.id %}"
+                                {% endif %}
+                        >Cancel</a>
+
+                        {% if wizard.steps.prev %}
+                        <button name="wizard_goto_step" type="submit" class="mdl-button mdl-button--raised mdl-button--colored button--disable-after" value="{{ wizard.steps.first }}">{% trans "first step" %}</button>
+                        <button name="wizard_goto_step" type="submit" class="mdl-button mdl-button--raised mdl-button--colored button--disable-after" value="{{ wizard.steps.prev }}">{% trans "prev step" %}</button>
+                        {% endif %}
+                        <button type="submit" class="mdl-button mdl-button--raised mdl-button--colored button--disable-after">
+                            {% comment %} {% if streamwatch.pk is None %}Next{% else %}Save Edits{% endif %} {% endcomment %}
+                            {% if wizard.steps.step1 < wizard.steps.count %}Next{% else %}Save Edits{% endif %}
+                        </button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+{% block styles %}
+    {{ block.super }}
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css" rel="stylesheet"/>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.6/select2-bootstrap.min.css" rel="stylesheet"/>
+{% endblock %}
+
+{% block scripts %}
+    {{ block.super }}
+    {# comment <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.full.min.js"></script> endcomment #}
+    <script src="{% static 'dataloaderinterface/js/common-forms.js' %}"></script>
+    <script src="{% static 'dataloaderinterface/js/streamwatch-create.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/streamwatch/subforms/cat.html b/src/dataloaderinterface/templates/streamwatch/subforms/cat.html
new file mode 100644
index 00000000..482062e9
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/subforms/cat.html
@@ -0,0 +1,54 @@
+{% load widget_tweaks %}
+
+<div class="row">
+    <div class="col-12">
+        <h5 class="headline d-inline-block">Enter measurements taken in the field. Select method  then add parameters</h5>
+    </div>
+</div>
+
+<div class="row std-row">
+    {{ wizard.form.site_registration }}
+   
+
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">               
+            
+            <div class="measurement-card mdl-card__supporting-text default-font">
+                <div class="row">                
+                    <div class="form-field col-6">
+                        <label for="{{ wizard.form.test_method.id_for_label }}">{{ wizard.form.test_method.label }}</label>
+                        {{ wizard.form.test_method|add_class:"form-control" }}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="form-field col-6">
+                        <label for="{{ wizard.form.meter.id_for_label }}">{{ wizard.form.meter.label }}</label>
+                        {{ wizard.form.meter|add_class:"form-control" }}
+                    </div> 
+                    <div class="form-field col-6">
+                        {{ wizard.form.calibration_date.errors }}
+                        <label for="{{ wizard.form.calibration_date.id_for_label }}">{{ wizard.form.calibration_date.label }}</label>
+                        {{ wizard.form.calibration_date|add_class:"form-control datepicker" }}
+                    </div>
+                </div>
+                <br><br>
+
+                <div class="parameter-card">                                        
+                    <div class="row">
+                        <div class="form-field col-5"><label>Parameter</label></div> 
+                        <div class="form-field col-3"><label>Measurement</label></div> 
+                        <div class="form-field col-4"><label>Unit</label></div> 
+                    </div>
+                    {% for parameter_form in wizard.form.parameters %}
+                    <div class="row parameter-form">
+                        {% include 'streamwatch/subforms/sensor_parameter.html' with pform=parameter_form%}
+                    </div>
+                    {% endfor %}
+                </div>
+                <button type="button" class="btn-add-parameter mdl-button mdl-button--raised mdl-button--colored" >Add Parameter</button>
+            </div>
+            <br><br>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/streamwatch/subforms/conditions.html b/src/dataloaderinterface/templates/streamwatch/subforms/conditions.html
new file mode 100644
index 00000000..0f591d2c
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/subforms/conditions.html
@@ -0,0 +1,135 @@
+{% load widget_tweaks %}
+
+<div class="row">
+    <div class="col-12">
+        <span class="step-number center-icon">1</span>
+        <h5 class="headline d-inline-block">Enter information about the current weather conditions</h5>
+    </div>
+</div>
+
+<div class="row step-row">
+    {{ wizard.form.site_registration }}
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">
+
+            <div class="mdl-card__supporting-text default-font">
+                <div class="form-field indent-left">
+                    <label for="{{ wizard.form.weather_cond.id_for_label }}">{{ wizard.form.weather_cond.label }}</label>
+                    {{ wizard.form.weather_cond.errors }}
+                    {{ wizard.form.weather_cond }}
+                </div>
+
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.time_since_last_precip.id_for_label }}">{{ wizard.form.time_since_last_precip.label }}</label>
+                    {{ wizard.form.time_since_last_precip|add_class:"form-control" }}
+                </div> 
+            </div>
+        </div>
+        <br><br>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-12">
+        <span class="step-number center-icon">2</span>
+        <h5 class="headline d-inline-block">Enter information about the current water conditions</h5>
+    </div>
+</div>
+
+<div class="row step-row">
+    {{ wizard.form.site_registration }}
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">        
+            <div class="mdl-card__supporting-text default-font">
+                <div class="row">
+                    <div class="form-field col-6">
+                        <label for="{{ wizard.form.turbidity_obs.id_for_label }}">{{ wizard.form.clarity.label }}</label>
+                        {{ wizard.form.clarity|add_class:"form-control" }}
+                    </div> 
+                    <div class="form-field col-6">
+                        <label for="{{ wizard.form.water_color.id_for_label }}">{{ wizard.form.water_color.label }}</label>
+                        {{ wizard.form.water_color|add_class:"form-control" }}
+                    </div>
+                </div>
+
+                <div class="form-field indent-left">
+                    <label for="{{ wizard.form.water_odor.id_for_label }}">{{ wizard.form.water_odor.label }}</label>
+                    {{ wizard.form.water_odor.errors }}
+                    {{ wizard.form.water_odor }}
+                </div>
+            </div>
+        </div>
+        <br><br>
+    </div>
+
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">        
+            <div class="mdl-card__supporting-text default-font">
+
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.water_movement.id_for_label }}">{{ wizard.form.water_movement.label }}</label>
+                    {{ wizard.form.water_movement|add_class:"form-control" }}
+                </div>
+
+                <div class="form-field indent-left">
+                    <label for="{{ wizard.form.surface_coating.id_for_label }}">{{ wizard.form.surface_coating.label }}</label>
+                    {{ wizard.form.surface_coating.errors }}
+                    {{ wizard.form.surface_coating }}
+                </div>
+
+                
+
+            </div>
+        </div>
+        <br><br>
+    </div>
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">        
+            <div class="mdl-card__supporting-text default-font">
+                
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.aquatic_veg_amount.id_for_label }}">{{ wizard.form.aquatic_veg_amount.label }}</label>
+                    {{ wizard.form.aquatic_veg_amount|add_class:"form-control" }}
+                </div>
+                <div class="form-field indent-left">
+                    <label for="{{ wizard.form.aquatic_veg_type.id_for_label }}">{{ wizard.form.aquatic_veg_type.label }}</label>
+                    {{ wizard.form.aquatic_veg_type.errors }}
+                    {{ wizard.form.aquatic_veg_type }}
+                </div>
+            </div>
+        </div>
+        <br><br>
+    </div>
+
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">        
+            <div class="mdl-card__supporting-text default-font">
+                
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.algae_amount.id_for_label }}">{{ wizard.form.algae_amount.label }}</label>
+                    {{ wizard.form.algae_amount|add_class:"form-control" }}
+                </div>
+                <div class="form-field indent-left">
+                    <label for="{{ wizard.form.algae_type.id_for_label }}">{{ wizard.form.algae_type.label }}</label>
+                    {{ wizard.form.algae_type.errors }}
+                    {{ wizard.form.algae_type }}
+                </div>
+            </div>
+        </div>
+        <br><br>
+    </div>
+
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">                                     
+            <div class="mdl-card__supporting-text mdl-card--border default-font">  
+
+                <div class="form-field">
+                    <label for="{{ wizard.form.site_observation.id_for_label }}">{{ wizard.form.site_observation.label }}</label>
+                    {{ wizard.form.site_observation|add_class:"form-control" }}
+                </div>
+                
+            </div>
+        </div>
+        <br><br>
+    </div>
+</div>
diff --git a/src/dataloaderinterface/templates/streamwatch/subforms/sensor_parameter.html b/src/dataloaderinterface/templates/streamwatch/subforms/sensor_parameter.html
new file mode 100644
index 00000000..9b8b7b62
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/subforms/sensor_parameter.html
@@ -0,0 +1,13 @@
+{% load widget_tweaks %}
+<div class="form-field col-5">
+    {{ pform.parameter|add_class:"form-control" }}
+    {% comment %} htao notes: when use form-control, dropdown added in runtime won't work {% endcomment %}
+</div> 
+
+<div class="form-field col-3">
+    {{ pform.measurement|add_class:"form-control" }}
+</div> 
+
+<div class="form-field col-4">
+    {{ pform.unit|add_class:"form-control" }}
+</div> 
diff --git a/src/dataloaderinterface/templates/streamwatch/subforms/setup.html b/src/dataloaderinterface/templates/streamwatch/subforms/setup.html
new file mode 100644
index 00000000..068f5beb
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/subforms/setup.html
@@ -0,0 +1,64 @@
+{% load widget_tweaks %}
+
+<div class="row">
+    <div class="col-12">
+        <h5 class="headline d-inline-block">Enter information to setup the form. The assessment type(s) selected will determine the form questions on subsequent pages.</h5>
+    </div>
+</div>
+
+<div class="row std-row">
+    {{ wizard.form.site_registration }}
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">
+
+            <div class="mdl-card__supporting-text default-font">
+                <div class="form-group">
+                    <div class="form-field">
+                        <label for="{{ wizard.form.investigator1.id_for_label }}">{{ wizard.form.investigator1.label }}</label>
+                        {{ wizard.form.investigator1|add_class:"form-control" }}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="form-field" >
+                        <label for="{{ wizard.form.investigator2.id_for_label }}">{{ wizard.form.investigator2.label }}</label>
+                        {{ wizard.form.investigator2|add_class:"form-control" }}
+                    </div>
+                </div>
+                    
+                <div class="row">
+                    <div class="form-field col-6">
+                        {{ wizard.form.collect_date.errors }}
+                        <label for="{{ wizard.form.collect_date.id_for_label }}">{{ wizard.form.collect_date.label }}</label>                                               </label>
+                        {{ wizard.form.collect_date|add_class:"form-control datepicker" }}
+                    </div>
+
+                    <div class="form-field col-6" >
+                        <label for="{{ wizard.form.collect_time.id_for_label }}">{{ wizard.form.collect_time.label }}</label>
+                        {{ wizard.form.collect_time|add_class:"form-control" }}
+                    </div>
+                </div>
+                
+                <div class="form-group">
+                    <div class="form-field" >
+                        <label for="{{ wizard.form.collect_time.id_for_label }}">{{ wizard.form.collect_tz.label }}</label>
+                        {{ wizard.form.collect_tz|add_class:"form-control" }}
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <br><br>
+    </div>
+
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">
+            <div class="mdl-card__supporting-text default-font">
+                <div class="form-field">
+                    <label for="{{ wizard.form.assessment_type.id_for_label }}">{{ wizard.form.assessment_type.label }}</label>
+                    {{ wizard.form.assessment_type.errors }}
+                    {{ wizard.form.assessment_type }}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/dataloaderinterface/templates/streamwatch/subforms/simple_habitat.html b/src/dataloaderinterface/templates/streamwatch/subforms/simple_habitat.html
new file mode 100644
index 00000000..f35a5cbd
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/subforms/simple_habitat.html
@@ -0,0 +1,46 @@
+{% load widget_tweaks %}
+
+<div class="row">
+    <div class="col-12">
+        <h5 class="headline d-inline-block">Enter information about the site habitat</h5>
+    </div>
+</div>
+
+<div class="row">
+    {{ wizard.form.site_registration }}
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">
+
+            <div class="mdl-card__supporting-text default-font">
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.simple_woody_debris_amt.id_for_label }}">{{ wizard.form.simple_woody_debris_amt.label }}</label>
+                    {{ wizard.form.simple_woody_debris_amt|add_class:"form-control" }}
+                </div> 
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.simple_woody_debris_type.id_for_label }}">{{ wizard.form.simple_woody_debris_type.label }}</label>
+                    {{ wizard.form.simple_woody_debris_type|add_class:"form-control" }}
+                </div> 
+                <div class="form-field col-6">
+                    <label for="{{ wizard.form.simple_tree_canopy.id_for_label }}">{{ wizard.form.simple_tree_canopy.label }}</label>
+                    {{ wizard.form.simple_tree_canopy|add_class:"form-control" }}
+                </div>   
+            </div>
+        </div>
+        <br><br>
+    </div>
+    <div class="col-sm-12 col-md-6">
+        <div class="mdl-card mdl-shadow--2dp full-width">
+
+            <div class="mdl-card__supporting-text default-font">                              
+                <div class="form-field indent-left">
+                    <label for="{{ wizard.form.simple_land_use.id_for_label }}">{{ wizard.form.simple_land_use.label }}</label>
+                    {{ wizard.form.simple_land_use.errors }}
+                    {{ wizard.form.simple_land_use }}
+                </div>
+            </div>
+        </div>
+        <br><br>
+    </div>
+</div>
+    
+</div>
diff --git a/src/dataloaderinterface/templates/streamwatch/subforms/simple_waterquality.html b/src/dataloaderinterface/templates/streamwatch/subforms/simple_waterquality.html
new file mode 100644
index 00000000..d617b9cb
--- /dev/null
+++ b/src/dataloaderinterface/templates/streamwatch/subforms/simple_waterquality.html
@@ -0,0 +1,102 @@
+{% load widget_tweaks %}
+<div class="form-streamwatch">
+    <div class="row">
+        <div class="col-12">
+            <h5 class="headline d-inline-block">Enter chemical measurements taken in the field.</h5>
+        </div>
+    </div>
+
+
+    <div class="row std-row">
+        {{ wizard.form.site_registration }}
+        <div class="col-sm-12 col-md-6">
+            <div class="mdl-card mdl-shadow--2dp full-width">
+                <div class="mdl-card__supporting-text default-font">
+                        
+                    <div class="row num-input">
+                        <div class="form-field col-6 num-field" >
+                            {{ wizard.form.simple_air_temperature.errors }}
+                            <label for="{{ wizard.form.simple_air_temperature.id_for_label }}">{{ wizard.form.simple_air_temperature.label }}</label>                                               </label>
+                            {{ wizard.form.simple_air_temperature|add_class:"form-control d-inline" }}
+                            <small>°C</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_ph.errors }}
+                            <label for="{{ wizard.form.simple_ph.id_for_label }}">{{ wizard.form.simple_ph.label }}</label>                                               </label>
+                            {{ wizard.form.simple_ph|add_class:"form-control d-inline" }}
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_water_temperature.errors }}
+                            <label for="{{ wizard.form.simple_water_temperature.id_for_label }}">{{ wizard.form.simple_water_temperature.label }}</label>                                               </label>
+                            {{ wizard.form.simple_water_temperature|add_class:"form-control d-inline" }}
+                            <small>°C</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_dissolved_oxygen.errors }}
+                            <label for="{{ wizard.form.simple_dissolved_oxygen.id_for_label }}">{{ wizard.form.simple_dissolved_oxygen.label }}</label>                                               </label>
+                            {{ wizard.form.simple_dissolved_oxygen|add_class:"form-control d-inline" }}
+                            <small>ppm</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_nitrate.errors }}
+                            <label for="{{ wizard.form.simple_nitrate.id_for_label }}">{{ wizard.form.simple_nitrate.label }}</label>                                               </label>
+                            {{ wizard.form.simple_nitrate|add_class:"form-control d-inline" }}
+                            <small>ppm</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_salinity.errors }}
+                            <label for="{{ wizard.form.simple_salinity.id_for_label }}">{{ wizard.form.simple_salinity.label }}</label>                                               </label>
+                            {{ wizard.form.simple_salinity|add_class:"form-control d-inline" }}
+                            <small>ppt</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_phosphate.errors }}
+                            <label for="{{ wizard.form.simple_phosphate.id_for_label }}">{{ wizard.form.simple_phosphate.label }}</label>                                               </label>
+                            {{ wizard.form.simple_phosphate|add_class:"form-control d-inline" }}
+                            <small>ppm</small>
+                        </div>                  
+                    
+                    </div>                    
+                                       
+                </div>
+            </div>
+            <br><br>
+        </div>
+
+        <div class="col-sm-12 col-md-6">
+            <div class="mdl-card mdl-shadow--2dp full-width">
+                <div class="mdl-card__supporting-text default-font">
+                    <div class="row num-input">
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_turbidity_sample_size.errors }}
+                            <label for="{{ wizard.form.simple_turbidity_sample_size.id_for_label }}">{{ wizard.form.simple_turbidity_sample_size.label }}</label>                                               </label>
+                            {{ wizard.form.simple_turbidity_sample_size|add_class:"form-control d-inline" }}
+                            <small>mL</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_turbidity_reagent_amt.errors }}
+                            <label for="{{ wizard.form.simple_turbidity_reagent_amt.id_for_label }}">{{ wizard.form.simple_turbidity_reagent_amt.label }}</label>                                               </label>
+                            {{ wizard.form.simple_turbidity_reagent_amt|add_class:"form-control d-inline" }}
+                            <small>mL</small>
+                        </div>
+
+                        <div class="form-field col-6 num-field">
+                            {{ wizard.form.simple_turbidity.errors }}
+                            <label for="{{ wizard.form.simple_turbidity.id_for_label }}">{{ wizard.form.simple_turbidity.label }}</label>                                               </label>
+                            {{ wizard.form.simple_turbidity|add_class:"form-control d-inline" }}
+                            <small>JTU</small>
+                        </div>
+                    </div> 
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
diff --git a/src/dataloaderinterface/urls.py b/src/dataloaderinterface/urls.py
index 954f7278..e6d9e13c 100644
--- a/src/dataloaderinterface/urls.py
+++ b/src/dataloaderinterface/urls.py
@@ -19,6 +19,9 @@
     HomeView, BrowseSitesListView, SiteUpdateView, SiteDeleteView, StatusListView, LeafPackListUpdateView, \
     TermsOfUseView, DMCAView, PrivacyView, CookiePolicyView
 
+from streamwatch import views as streamwatchviews
+
+
 import dataloaderinterface.views as views
 
 urlpatterns = [
@@ -33,9 +36,11 @@
     url(r'^sites/register/$', SiteRegistrationView.as_view(), name='site_registration'),
     url(r'^sites/update/(?P<sampling_feature_code>.*?)/sensors/$', SensorListUpdateView.as_view(), name='sensors'),
     url(r'^sites/update/(?P<sampling_feature_code>.*?)/leafpacks/$', LeafPackListUpdateView.as_view(), name='leafpacks'),
+    url(r'^sites/update/(?P<sampling_feature_code>.*?)/streamwatches/$', streamwatchviews.ListUpdateView.as_view(), name='streamwatches'),
     url(r'^sites/update/(?P<sampling_feature_code>.*)/$', SiteUpdateView.as_view(), name='site_update'),
     url(r'^sites/delete/(?P<sampling_feature_code>.*)/$', SiteDeleteView.as_view(), name='site_delete'),
     url(r'^sites/(?P<sampling_feature_code>.*)/leafpack/', include(('leafpack.urls', 'leafpack'), namespace='leafpack')),
+    url(r'^sites/(?P<sampling_feature_code>.*)/streamwatch/', include(('streamwatch.urls', 'streamwatch'), namespace='streamwatch')),
     url(r'^sites/(?P<sampling_feature_code>.*)/$', SiteDetailView.as_view(), name='site_detail'),
     url(r'^dataloader/ajax/', views.ajax_router, name='ajax'),
 
diff --git a/src/dataloaderinterface/views.py b/src/dataloaderinterface/views.py
index c9a75c3f..eed38d36 100644
--- a/src/dataloaderinterface/views.py
+++ b/src/dataloaderinterface/views.py
@@ -28,6 +28,7 @@
 import json
 from django.http import HttpResponse, JsonResponse
 from typing import Union
+import streamwatch
 
 class LoginRequiredMixin(object):
     @classmethod
@@ -128,6 +129,7 @@ def get_context_data(self, **kwargs):
         context['is_site_owner'] = self.request.user == self.object.django_user
 
         context['leafpacks'] = LeafPack.objects.filter(site_registration=context['site'].pk).order_by('-placement_date')
+        context['streamwatch'] = streamwatch.models.get_assessment_summary_information(self.kwargs[self.slug_field])
 
         try:
             context["hydroshare_account"] = self.request.user.hydroshare_account
diff --git a/src/leafpack/urls.py b/src/leafpack/urls.py
index 25aaaa66..650ba352 100644
--- a/src/leafpack/urls.py
+++ b/src/leafpack/urls.py
@@ -5,7 +5,8 @@
 urlpatterns = [
     url(r'create/$', LeafPackCreateView.as_view(), name='create'),
     url(r'(?P<pk>.*?)/update/$', LeafPackUpdateView.as_view(), name='update'),
-    url(r'(?P<pk>.*?)/delete/$', LeafPackDeleteView.as_view(), name='delete'),
+    #url(r'(?P<pk>.*?)/delete/$', LeafPackDeleteView.as_view(), name='delete'),
     url(r'(?P<pk>.*?)/csv/$', download_leafpack_csv, name='csv_download'),
     url(r'(?P<pk>.*?)/$', LeafPackDetailView.as_view(), name='view'),
+    url(r'delete/$', LeafPackDeleteView.as_view(), name='delete'),
 ]
diff --git a/src/odm2/__init__.py b/src/odm2/__init__.py
index d1dbfcda..d1ec8027 100644
--- a/src/odm2/__init__.py
+++ b/src/odm2/__init__.py
@@ -1,11 +1,10 @@
-from odm2 import base as _base
-import pickle as _pickle
-import odm2.models as models 
+from odm2.base import ODM2DataModels
+from django.conf import settings
+import sqlalchemy
 
-engine = _base.engine
-Session = _base.Session
+_dbsettings = settings.DATABASES['default']
+_connection_str = f"postgresql://{_dbsettings['USER']}:{_dbsettings['PASSWORD']}@{_dbsettings['HOST']}:{_dbsettings['PORT']}/{_dbsettings['NAME']}"
+_engine = sqlalchemy.create_engine(_connection_str, pool_size=10)
+_cache_path = settings.DATAMODELCACHE
 
-if not _base.cached:
-	_base._model_base.prepare(engine)
-	with open(_base.cache_path, 'wb') as file:
-		_pickle.dump(_base._model_base.metadata, file)
+odm2datamodels = ODM2DataModels(_engine, cache_path=_cache_path)
\ No newline at end of file
diff --git a/src/odm2/base.py b/src/odm2/base.py
index f629b68c..57a83106 100644
--- a/src/odm2/base.py
+++ b/src/odm2/base.py
@@ -1,17 +1,30 @@
 import sqlalchemy
+from sqlalchemy.sql.expression import Select
+from sqlalchemy.orm import Query    
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy.ext.declarative import declared_attr, declarative_base
 
 import pickle
+from typing import Dict, Union, Any, Type, List
+import warnings
 
-from django.conf import settings
+import pandas as pd
 
-_dbsettings = settings.DATABASES['default']
-_connection_str = f"postgresql://{_dbsettings['USER']}:{_dbsettings['PASSWORD']}@{_dbsettings['HOST']}:{_dbsettings['PORT']}/{_dbsettings['NAME']}"
-engine = sqlalchemy.create_engine(_connection_str, pool_size=10)
-Session = sqlalchemy.orm.sessionmaker(engine)
+from .exceptions import ObjectNotFound
+from .models import annotations
+from .models import core
+from .models import cv
+from .models import dataquality
+from .models import equipment
+from .models import extensionproperties
+from .models import externalidentifiers
+from .models import labanalyses
+from .models import provenance
+from .models import results
+from .models import samplingfeatures
+from .models import simulation
 
-cache_path = settings.DATAMODELCACHE
+OUTPUT_FORMATS = ('json', 'dataframe', 'dict','records')
 
 class Base():
     
@@ -20,13 +33,221 @@ def __tablename__(self) -> str:
         cls_name = str(self.__name__)
         return cls_name.lower()
 
-_model_base = None
-cached = None
-try:
-    with open(cache_path, 'rb') as file:
-        metadata = pickle.load(file=file)
-        _model_base = declarative_base(cls=Base, bind=engine, metadata=metadata)
-        cached = True
-except: 
-    metadata = sqlalchemy.MetaData(schema='odm2')
-    _model_base = automap_base(cls=Base, metadata=metadata)
\ No newline at end of file
+    @classmethod
+    def from_dict(cls, attributes_dict:Dict) -> object:
+        """Alternative constructor that uses dictionary to populate attributes"""
+        instance = cls.__new__(cls)
+        instance.__init__()
+        for key, value in attributes_dict.items():
+            if hasattr(instance, key):
+                if value == '': value = None
+                setattr(instance, key, value)
+        return instance
+
+    def to_dict(self) -> Dict[str,Any]:
+        """Converts attributes into a dictionary"""
+        columns = self.__table__.columns.keys()
+        output_dict = {}
+        for column in columns:
+            output_dict[column] = getattr(self,column)
+        return output_dict
+    
+    def update_from_dict(self, attributes_dict:Dict[str, any]) -> None:
+        """Updates instance attributes based on provided dictionary"""
+        for key, value in attributes_dict.items():
+            if hasattr(self, key):
+                if value == '': value = None
+                setattr(self, key, value)
+
+    @classmethod
+    def get_pkey_name(cls) -> Union[str,None]:
+        """ Returns the primary key field name for a given model"""
+        columns = cls.__table__.columns
+        for column in columns:
+            if column.primary_key: return column.name 
+        return None
+
+class ODM2Engine:
+
+    def __init__(self, session_maker:sqlalchemy.orm.sessionmaker) -> None:
+        self.session_maker = session_maker
+
+    def read_query(self, 
+            query: Union[Query, Select],
+            output_format:str='json',
+            orient:str='records') -> Union[str, pd.DataFrame]:
+
+        # guard against invalid output_format strings
+        if output_format not in OUTPUT_FORMATS:
+            raise ValueError(f':argument output_format={output_format}, is not a valid output_format strings: {OUTPUT_FORMATS}')
+        
+        # use SQLAlchemy session to read_query and return response in the designated output_format
+        with self.session_maker() as session:
+            if isinstance(query, Select):
+                df = pd.read_sql(query, session.bind)
+            else:
+                df = pd.read_sql(query.statement, session.bind)
+            
+            if output_format == 'json':
+                return df.to_json(orient=orient)
+            elif output_format == 'dataframe':
+                return df
+            elif output_format == 'dict':
+                return df.to_dict(orient=orient)
+            elif output_format == 'records':
+                return df.to_records(index=False)
+            raise TypeError("Unknown output format")
+
+    def insert_query(self, objs:List[object]) -> None:
+        with self.session_maker() as session:
+            session.add_all(objs)
+            session.commit()
+
+    def create_object(self, obj:object, preserve_pkey:bool=False) -> Union[int, str]:
+        """ Accepts an ORM mapped model and created a corresponding database record
+
+        Accepts on one of the ORM mapped models and creates the corresponding database 
+        record, returning the primary key of the newly created record.
+
+        Arguments:
+            obj:object - The ORM mapped model
+            preserve_pkey:bool - Default=False - flag indicating if the primary key for 
+                the object should be preserved. Avoid in general use cases where database has 
+                a serial that auto assigned primary key, however this can be set to True to
+                specify you own the primary key value.  
+
+        Returns:
+            primary key: Union[int, str]        
+
+        """
+        
+        pkey_name = obj.get_pkey_name()
+        if not preserve_pkey:
+            setattr(obj, pkey_name, None)
+
+        with self.session_maker() as session:
+            session.add(obj)
+            session.commit()
+            pkey_value = getattr(obj, pkey_name)
+            return pkey_value
+
+    def read_object(self, model:Type[Base], pkey:Union[int, str], 
+            output_format:str='dict', 
+            orient:str='records') -> Dict[str, Any]:
+
+        with self.session_maker() as session:
+            obj = session.get(model, pkey)
+            pkey_name = model.get_pkey_name()
+            if obj is None: raise ObjectNotFound(f"No '{model.__name__}' object found with {pkey_name} = {pkey}")
+            session.commit()
+
+            # convert obj_dict to a dictionary if it isn't one already
+            obj_dict = obj.to_dict()
+
+            # guard against invalid output_format strings
+            if output_format not in OUTPUT_FORMATS:
+                raise ValueError(f':param output_format = {output_format}, which is not one of the following valid output_format strings: {OUTPUT_FORMATS}')
+
+            if output_format == 'dict':
+                return obj_dict
+
+            else:
+                # convert to series if only one row
+                keys = list(obj_dict.keys())
+                if not isinstance(obj_dict[keys[0]], list):
+                    for key in keys:
+                        new_value = [obj_dict[key]]
+                        obj_dict[key] = new_value
+
+                obj_df = pd.DataFrame.from_dict(obj_dict)
+                if output_format == 'dataframe':
+                    return obj_df
+                elif output_format == 'json':
+                    return obj_df.to_json(orient=orient)
+                raise TypeError("Unknown output format")
+
+    def update_object(self, model:Type[Base], pkey:Union[int,str], data:Dict[str, Any]) -> None:
+        if not isinstance(data, dict):
+            data = data.dict()
+        pkey_name = model.get_pkey_name()
+        if pkey_name in data:
+            data.pop(pkey_name)
+        with self.session_maker() as session:
+            obj = session.get(model, pkey)
+            if obj is None: raise ObjectNotFound(f"No '{model.__name__}' object found with {pkey_name} = {pkey}")
+            obj.update_from_dict(data)
+            session.commit()
+
+    def delete_object(self, model:Type[Base], pkey:Union[int, str]) -> None:
+        with self.session_maker() as session:
+            obj = session.get(model, pkey)
+            pkey_name = model.get_pkey_name()
+            if obj is None: raise ObjectNotFound(f"No '{model.__name__}' object found with {pkey_name} = {pkey}")
+            session.delete(obj)
+            session.commit()
+
+class Models:
+
+    def __init__(self, base_model) -> None:
+        self._base_model = base_model
+        self._process_schema(annotations)        
+        self._process_schema(core)        
+        self._process_schema(cv)        
+        self._process_schema(dataquality)        
+        self._process_schema(equipment)        
+        self._process_schema(extensionproperties)        
+        self._process_schema(externalidentifiers)        
+        self._process_schema(labanalyses)        
+        self._process_schema(provenance)        
+        self._process_schema(results)        
+        self._process_schema(samplingfeatures)        
+        self._process_schema(simulation)         
+
+    def _process_schema(self, schema:str) -> None:
+        classes = [c for c in dir(schema) if not c.startswith('__')]
+        base = tuple([self._base_model])
+        for class_name in classes:
+            model = getattr(schema, class_name)
+            model_attribs = self._trim_dunders(dict(model.__dict__.copy())) 
+            extended_model =  type(class_name, base, model_attribs) 
+            setattr(self, class_name, extended_model)
+
+    def _trim_dunders(self, dictionary:Dict[str, Any]) -> Dict[str, Any]:
+        return { k:v for k, v in dictionary.items() if not k.startswith('__') } 
+
+class ODM2DataModels():
+
+    def __init__(self, engine:sqlalchemy.engine, schema:str='odm2', cache_path:str=None) -> None:
+
+        self._schema = schema
+        self._cache_path = cache_path
+
+        self._engine = engine
+        self._session = sqlalchemy.orm.sessionmaker(self._engine)
+        self._cached= False
+        self.odm2_engine: ODM2Engine = ODM2Engine(self._session)
+
+        self._model_base = self._prepare_model_base()
+        self.models = Models(self._model_base)
+        if not self._cached:
+            self._prepare_automap_models()
+
+    def _prepare_model_base(self):
+        try:
+            with open(self._cache_path, 'rb') as file:
+                metadata = pickle.load(file=file)
+                self._cached = True
+                return declarative_base(cls=Base, bind=self._engine, metadata=metadata)
+        except FileNotFoundError: 
+            metadata = sqlalchemy.MetaData(schema=self._schema)
+            self._cached = False
+            return automap_base(cls=Base, metadata=metadata)
+
+    def _prepare_automap_models(self):
+        self._model_base.prepare(self._engine)
+        if not self._cache_path: return
+        try:
+            with open(self._cache_path, 'wb') as file:
+                pickle.dump(self._model_base.metadata, file)
+        except FileNotFoundError:
+            warnings.warn('Unable to cache models which may lead to degraded performance.', RuntimeWarning)
diff --git a/src/odm2/exceptions.py b/src/odm2/exceptions.py
new file mode 100644
index 00000000..39d0de96
--- /dev/null
+++ b/src/odm2/exceptions.py
@@ -0,0 +1,6 @@
+class ObjectNotFound(Exception):
+
+    def __init__(self, message:str) -> None:
+        self.message = message
+        super().__init__()
+
diff --git a/src/odm2/modelcache.pkl b/src/odm2/modelcache.pkl
deleted file mode 100644
index 275de06d..00000000
Binary files a/src/odm2/modelcache.pkl and /dev/null differ
diff --git a/src/odm2/models/annotations.py b/src/odm2/models/annotations.py
index 262b57c1..4b015078 100644
--- a/src/odm2/models/annotations.py
+++ b/src/odm2/models/annotations.py
@@ -1,48 +1,45 @@
-from odm2.base import _model_base as _model_base
-
-
 """Data models corresponding to the tables under the ODM2Annotations schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2Annotations.html
 """
 
-class ActionAnnotations(_model_base):
+class ActionAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_ActionAnnotations.html"""
 
-class Annotations(_model_base):
+class Annotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_Annotations.html"""
 
-class CategoricalResultValueAnnotations(_model_base):
+class CategoricalResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_CategoricalResultValueAnnotations.html"""
 
-class EquipmentAnnotations(_model_base):
+class EquipmentAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_EquipmentAnnotations.html"""
 
-class MethodAnnotations(_model_base):
+class MethodAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_MethodAnnotations.html"""
 
-class PointCoverageResultValueAnnotations(_model_base):
+class PointCoverageResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_PointCoverageEesultValueAnnotations.html"""
 
-class ProfileResultValueAnnotations(_model_base):
+class ProfileResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_ProfileResultValueAnnotations.html"""
 
-class ResultAnnotations(_model_base):
+class ResultAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_ResultAnnotations.html"""
 
-class SamplingFeatureAnnotations(_model_base):
+class SamplingFeatureAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_SamplingFeatureAnnotations.html"""
 
-class SectionResultValueAnnotations(_model_base):
+class SectionResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_SectionResultValueAnnotations.html"""
 
-class SpectraResultValueAnnotations(_model_base):
+class SpectraResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_SpectraResultValueAnnotations.html"""
 
-class TimeSeriesResultValueAnnotations(_model_base):
+class TimeSeriesResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_TimeSeriesResultValueAnnotations.html"""
 
-class TrajectoryResultValueAnnotations(_model_base):
+class TrajectoryResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_TrajectoryResultValueAnnotations.html"""
 
-class TransectResultValueAnnotations(_model_base):
+class TransectResultValueAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Annotations_TransectResultValueAnnotations.html"""
\ No newline at end of file
diff --git a/src/odm2/models/core.py b/src/odm2/models/core.py
index 313d10df..e19351a1 100644
--- a/src/odm2/models/core.py
+++ b/src/odm2/models/core.py
@@ -1,53 +1,51 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2Core schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2Core.html
 """
 
-class ActionBy(_model_base):
+class ActionBy():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_ActionBy.html"""
 
-class Actions(_model_base):
+class Actions():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Actions.html"""
 
-class Affiliations(_model_base):
+class Affiliations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Affiliations.html"""
 
-class Datasets(_model_base):
+class Datasets():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Datasets.html"""
 
-class DatasetsResults(_model_base):
+class DatasetsResults():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_DatasetsResults.html"""
 
-class FeatureActions(_model_base):
+class FeatureActions():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_FeatureActions.html"""
 
-class Methods(_model_base):
+class Methods():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Methods.html"""
 
-class Organizations(_model_base):
+class Organizations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Organizations.html"""
 
-class People(_model_base):
+class People():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_People.html"""
 
-class ProcessingLevels(_model_base):
+class ProcessingLevels():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_ProcessingLevels.html"""
 
-class RelatedActions(_model_base):
+class RelatedActions():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_RelatedActions.html"""
 
-class Results(_model_base):
+class Results():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Results.html"""
 
-class SamplingFeatures(_model_base):
+class SamplingFeatures():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_SamplingFeatures.html"""
 
-class TaxonomicClassifiers(_model_base):
+class TaxonomicClassifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_TaxonomicClassifiers.html"""
 
-class Units(_model_base):
+class Units():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Units.html"""
 
-class Variables(_model_base):
+class Variables():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Core_Variables.html"""
\ No newline at end of file
diff --git a/src/odm2/models/cv.py b/src/odm2/models/cv.py
index 8319d399..16120097 100644
--- a/src/odm2/models/cv.py
+++ b/src/odm2/models/cv.py
@@ -1,86 +1,84 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2CV schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2CV.html
 """
 
-class CV_ActionType(_model_base):
+class CV_ActionType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_ActionType.html"""
 
-class CV_AggregationStatistic(_model_base):
+class CV_AggregationStatistic():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_AggregationStatistic.html"""
 
-class CV_AnnotationType(_model_base):
+class CV_AnnotationType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_AnnotationType.html"""
 
-class CV_CensorCode(_model_base):
+class CV_CensorCode():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_CensorCode.html"""
 
-class CV_DataQualityType(_model_base):
+class CV_DataQualityType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_DataQualityType.html"""
 
-class CV_DatasetType(_model_base):
+class CV_DatasetType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_DatasetType.html"""
 
-class CV_DirectiveType(_model_base):
+class CV_DirectiveType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_DirectiveType.html"""
 
-class CV_ElevationDatum(_model_base):
+class CV_ElevationDatum():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_ElevationDatum.html"""
 
-class CV_EquipmentType(_model_base):
+class CV_EquipmentType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_EquipmentType.html"""
 
-class CV_Medium(_model_base):
+class CV_Medium():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_Medium.html"""
 
-class CV_MethodType(_model_base):
+class CV_MethodType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_MethodType.html"""
 
-class CV_OrganizationType(_model_base):
+class CV_OrganizationType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_OrganizationType.html"""
 
-class CV_PropertyDataType(_model_base):
+class CV_PropertyDataType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_PropertyDataType.html"""
 
-class CV_QualityCode(_model_base):
+class CV_QualityCode():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_QualityCode.html"""
 
-class CV_RelationshipType(_model_base):
+class CV_RelationshipType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_RelationshipType.html"""
 
-class CV_ResultType(_model_base):
+class CV_ResultType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_ResultType.html"""
 
-class CV_SamplingFeatureGeoType(_model_base):
+class CV_SamplingFeatureGeoType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_SamplingFeatureGeoType.html"""
 
-class CV_SamplingFeatureType(_model_base):
+class CV_SamplingFeatureType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_SamplingFeatureType.html"""
 
-class CV_SiteType(_model_base):
+class CV_SiteType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_SiteType.html"""
 
-class CV_SpatialOffsetType(_model_base):
+class CV_SpatialOffsetType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_SpatialOffsetType.html"""
 
-class CV_Speciation(_model_base):
+class CV_Speciation():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_Speciation.html"""
 
-class CV_SpecimenType(_model_base):
+class CV_SpecimenType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_SpecimenType.html"""
 
-class CV_Status(_model_base):
+class CV_Status():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_Status.html"""
 
-class CV_TaxonomicClassifierType(_model_base):
+class CV_TaxonomicClassifierType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_TaxonomicClassifierType.html"""
 
-class CV_UnitsType(_model_base):
+class CV_UnitsType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_UnitsType.html"""
 
-class CV_VariableName(_model_base):
+class CV_VariableName():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_VariableName.html"""
 
-class CV_VariableType(_model_base):
+class CV_VariableType():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2CV_CV_VariableType.html"""
\ No newline at end of file
diff --git a/src/odm2/models/dataquality.py b/src/odm2/models/dataquality.py
index bf15f43e..d29bb3e7 100644
--- a/src/odm2/models/dataquality.py
+++ b/src/odm2/models/dataquality.py
@@ -1,20 +1,18 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2DataQuality schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2DataQuality.html
 """
 
-class DataQuality(_model_base):
+class DataQuality():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2DataQuality_DataQuality.html"""
 
-class ReferenceMaterials(_model_base):
+class ReferenceMaterials():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2DataQuality_ReferenceMaterials.html"""
 
-class ReferenceMaterialValues(_model_base):
+class ReferenceMaterialValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2DataQuality_ReferenceMaterialValues.html"""
 
-class ResultNormalizationValues(_model_base):
+class ResultNormalizationValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2DataQuality_ResultNormalizationValues.html"""
 
-class ResultsDataQuality(_model_base):
+class ResultsDataQuality():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2DataQuality_ResultsDataQuality.html"""
\ No newline at end of file
diff --git a/src/odm2/models/equipment.py b/src/odm2/models/equipment.py
index bdc673bd..f21bc815 100644
--- a/src/odm2/models/equipment.py
+++ b/src/odm2/models/equipment.py
@@ -1,41 +1,39 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2Equipment schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2Equipment.html
 """
 
-class CalibrationActions(_model_base):
+class CalibrationActions():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_CalibrationActions.html"""
 
-class CalibrationReferenceEquipment(_model_base):
+class CalibrationReferenceEquipment():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_CalibrationReferenceEquipment.html"""
 
-class CalibrationStandards(_model_base):
+class CalibrationStandards():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_CalibrationStandards.html"""
 
-class DataloggerFileColumns(_model_base):
+class DataloggerFileColumns():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_DataloggerFileColumns.html"""
 
-class DataLoggerFiles(_model_base):
+class DataLoggerFiles():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_DataLoggerFiles.html"""
 
-class DataLoggerProgramFiles(_model_base):
+class DataLoggerProgramFiles():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_DataloggerProgramFiles.html"""
 
-class Equipment(_model_base):
+class Equipment():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_Equipment.html"""
 
-class EquipmentModels(_model_base):
+class EquipmentModels():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_EquipmentModels.html"""
 
-class EquipmentUsed(_model_base):
+class EquipmentUsed():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_EquipmentUsed.html"""
 
-class InstrumentOutputVariables(_model_base):
+class InstrumentOutputVariables():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_InstrumentOutputVariables.html"""
 
-class MaintenanceActions(_model_base):
+class MaintenanceActions():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_MaintenanceActions.html"""
 
-class RelatedEquipment(_model_base):
+class RelatedEquipment():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Equipment_RelatedEquipment.html"""
\ No newline at end of file
diff --git a/src/odm2/models/extensionproperties.py b/src/odm2/models/extensionproperties.py
index 882c700a..30dfe26d 100644
--- a/src/odm2/models/extensionproperties.py
+++ b/src/odm2/models/extensionproperties.py
@@ -1,26 +1,24 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2ExtensionProperties schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2ExtensionProperties.html
 """
 
-class ActionExtensionPropertyValues(_model_base):
+class ActionExtensionPropertyValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_ActionExtensionPropertyValues.html"""
 
-class CitationExtensionPropertyValues(_model_base):
+class CitationExtensionPropertyValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_CitationExtensionPropertyValues.html"""
 
-class ExtensionProperties(_model_base):
+class ExtensionProperties():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_ExtensionProperties.html"""
 
-class MethodExtensionPropertyValues(_model_base):
+class MethodExtensionPropertyValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_MethodExtensionPropertyValues.html"""
 
-class ResultExtensionPropertyValues(_model_base):
+class ResultExtensionPropertyValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_ResultExtensionPropertyValues.html"""
 
-class SamplingFeatureExtensionPropertyValues(_model_base):
+class SamplingFeatureExtensionPropertyValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_SamplingFeatureExtensionPropertyValues.html"""
 
-class VariableExtensionPropertyValues(_model_base):
+class VariableExtensionPropertyValues():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExtensionProperties_VariableExtensionPropertyValues.html"""
diff --git a/src/odm2/models/externalidentifiers.py b/src/odm2/models/externalidentifiers.py
index e0698f0a..b07a582e 100644
--- a/src/odm2/models/externalidentifiers.py
+++ b/src/odm2/models/externalidentifiers.py
@@ -1,32 +1,30 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2Core schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2ExternalIdentifiers.html
 """
 
-class CitationExternalIdentifiers(_model_base):
+class CitationExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_CitationExternalIdentifiers.html"""
 
-class ExternalIdentifierSystems(_model_base):
+class ExternalIdentifierSystems():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_ExternalIdentifierSystems.html"""
 
-class MethodExternalIdentifiers(_model_base):
+class MethodExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_MethodExternalIdentifiers.html"""
 
-class PersonExternalIdentifiers(_model_base):
+class PersonExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_PersonExternalIdentifiers.html"""
 
-class ReferenceMaterialExternalIdentifiers(_model_base):
+class ReferenceMaterialExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_ReferenceMaterialExternalIdentifiers.html"""
 
-class SamplingFeatureExternalIdentifiers(_model_base):
+class SamplingFeatureExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_SamplingFeatureExternalIdentifiers.html"""
 
-class SpatialReferenceExternalIdentifiers(_model_base):
+class SpatialReferenceExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_SpatialReferenceExternalIdentifiers.html"""
 
-class TaxonomicClassifierExternalIdentifiers(_model_base):
+class TaxonomicClassifierExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_TaxonomicClassifierExternalIdentifiers.html"""
 
-class VariableExternalIdentifiers(_model_base):
+class VariableExternalIdentifiers():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2ExternalIdentifiers_VariableExternalIdentifiers.html"""
diff --git a/src/odm2/models/labanalyses.py b/src/odm2/models/labanalyses.py
index 84d2a833..59a7bdb0 100644
--- a/src/odm2/models/labanalyses.py
+++ b/src/odm2/models/labanalyses.py
@@ -1,14 +1,12 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2LabAnalyses schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2LabAnalyses.html
 """
 
-class ActionDirectives(_model_base):
+class ActionDirectives():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2LabAnalyses_ActionDirectives.html"""
 
-class Directives(_model_base):
+class Directives():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2LabAnalyses_Directives.html"""
 
-class SpecimenBatchPositions(_model_base):
+class SpecimenBatchPostions():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2LabAnalyses_SpecimenBatchPostions.html"""
\ No newline at end of file
diff --git a/src/odm2/models/provenance.py b/src/odm2/models/provenance.py
index 7c5ef4c4..d3af104a 100644
--- a/src/odm2/models/provenance.py
+++ b/src/odm2/models/provenance.py
@@ -1,32 +1,30 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2Provenance schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2Provenance.html
 """
 
-class AuthorLists(_model_base):
+class AuthorLists():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_AuthorLists.html"""
 
-class Citations(_model_base):
+class Citations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_Citations.html"""
 
-class DataSetCitations(_model_base):
+class DataSetCitations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_DatasetCitations.html"""
 
-class DerivationEquations(_model_base):
+class DerivationEquations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_DerivationEquations.html"""
 
-class MethodCitations(_model_base):
+class MethodCitations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_MethodCitations.html"""
 	
-class RelatedAnnotations(_model_base):
+class RelatedAnnotations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_RelatedAnnotations.html"""
 
-class RelatedDatasets(_model_base):
+class RelatedDatasets():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_RelatedDatasets.html"""
 
-class RelatedResults(_model_base):
+class RelatedResults():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_RelatedResults.html"""
 
-class ResultDerivationEquations(_model_base):
+class ResultDerivationEquations():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Provenance_ResultDerivationEquations.html"""
\ No newline at end of file
diff --git a/src/odm2/models/results.py b/src/odm2/models/results.py
index e4d04425..f87e0045 100644
--- a/src/odm2/models/results.py
+++ b/src/odm2/models/results.py
@@ -1,59 +1,57 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2Results schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2Results.html
 """
 
-class CategoricalResults (_model_base):
+class CategoricalResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_CategoricalResults.html"""
 
-class CategoricalResultValues (_model_base):
+class CategoricalResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_CategoricalResultValues.html"""
 
-class MeasurementResults (_model_base):
+class MeasurementResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_MeasurementResults.html"""
 
-class MeasurementResultValues (_model_base):
+class MeasurementResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_MeasurementResultValues.html"""
 
-class PointCoverageResults (_model_base):
+class PointCoverageResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_PointCoverageResults.html"""
 
-class PointCoverageResultValues (_model_base):
+class PointCoverageResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_PointCoverageResultValues.html"""
 
-class ProfileResults (_model_base):
+class ProfileResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_ProfileResults.html"""
 
-class ProfileResultValues (_model_base):
+class ProfileResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_ProfileResultValues.html"""
 
-class SectionResults (_model_base):
+class SectionResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_SectionResults.html"""
 
-class SectionResultValues (_model_base):
+class SectionResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_SectionResultValues.html"""
 
-class SpectraResults (_model_base):
+class SpectraResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_SpectraResults.html"""
 
-class SpectraResultValues (_model_base):
+class SpectraResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_SpectraResultValues.html"""
 
-class TimeSeriesResults (_model_base):
+class TimeSeriesResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TimeSeriesResults.html"""
 
-class TimeSeriesResultValues (_model_base):
+class TimeSeriesResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TimeSeriesResultValues.html"""
 
-class TrajectoryResults (_model_base):
+class TrajectoryResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TrajectoryResults.html"""
 
-class TrajectoryResultValues (_model_base):
+class TrajectoryResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TrajectoryResultValues.html"""
 
-class TransectResults (_model_base):
+class TransectResults ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TransectResults.html"""
 
-class TransectResultValues (_model_base):
+class TransectResultValues ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TransectResultValues.html"""
\ No newline at end of file
diff --git a/src/odm2/models/samplingfeatures.py b/src/odm2/models/samplingfeatures.py
index e1b54f5b..f9e0ed8d 100644
--- a/src/odm2/models/samplingfeatures.py
+++ b/src/odm2/models/samplingfeatures.py
@@ -1,23 +1,21 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2SamplingFeatures schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2SamplingFeatures.html
 """
 
-class RelatedFeatures (_model_base):
+class RelatedFeatures ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2SamplingFeatures_RelatedFeatures.html"""
 
-class Sites (_model_base):
+class Sites ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2SamplingFeatures_Sites.html"""
 
-class SpatialOffsets (_model_base):
+class SpatialOffsets ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2SamplingFeatures_SpatialOffsets.html"""
 
-class SpatialReferences (_model_base):
+class SpatialReferences ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2SamplingFeatures_SpatialReferences.html"""
 
-class Specimens (_model_base):
+class Specimens ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2SamplingFeatures_Specimens.html"""
 
-class SpecimenTaxonomicClassifiers (_model_base):
+class SpecimenTaxonomicClassifiers ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2SamplingFeatures_SpecimenTaxonomicClassifiers.html"""
\ No newline at end of file
diff --git a/src/odm2/models/simulation.py b/src/odm2/models/simulation.py
index af1a0dc4..75097b25 100644
--- a/src/odm2/models/simulation.py
+++ b/src/odm2/models/simulation.py
@@ -1,17 +1,15 @@
-from odm2.base import _model_base
-
 """Data models corresponding to the tables under the ODM2Simulation schema
 	Reference: http://odm2.github.io/ODM2/schemas/ODM2_Current/schemas/ODM2Simulation.html
 """
 
-class ModelAffiliations (_model_base):
+class ModelAffiliations ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Simulation_ModelAffiliations.html"""
 
-class Models (_model_base):
+class Models ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Simulation_Models.html"""
 
-class RelatedModels (_model_base):
+class RelatedModels ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Simulation_RelatedModels.html"""
 
-class Simulations (_model_base):
+class Simulations ():
 	"""http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Simulation_Simulations.html"""
\ No newline at end of file
diff --git a/src/streamwatch/__init__.py b/src/streamwatch/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/streamwatch/admin.py b/src/streamwatch/admin.py
new file mode 100644
index 00000000..8c38f3f3
--- /dev/null
+++ b/src/streamwatch/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/src/streamwatch/apps.py b/src/streamwatch/apps.py
new file mode 100644
index 00000000..a443b8ba
--- /dev/null
+++ b/src/streamwatch/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class StreamwatchConfig(AppConfig):
+    name = 'streamwatch'
diff --git a/src/streamwatch/forms.py b/src/streamwatch/forms.py
new file mode 100644
index 00000000..0ae7eefb
--- /dev/null
+++ b/src/streamwatch/forms.py
@@ -0,0 +1,503 @@
+from django import forms
+from django.contrib.auth import get_user_model
+from django.forms import formset_factory
+
+from typing import Dict
+from typing import Any
+import datetime
+
+from dataloaderinterface.models import Affiliation
+from streamwatch import models
+from streamwatch import timeutils
+
+place_holder_choices = (
+        (1, 'Choice #1'), 
+        (2, 'Choice #2'),
+        (3, 'Choice #3')
+    )
+
+user_affiliations = [
+    affiliation[0]
+    for affiliation
+    in get_user_model().objects.filter(affiliation_id__isnull=False).values_list('affiliation_id')
+]
+measurement_method_choices = (('Meter','Meter'), ('Lamotte', 'Lamotte'))
+
+class MDLCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
+    template_name = 'mdl-checkbox-select-multiple.html'
+
+    def render(self, name, value, attrs=None, renderer=None):
+        context = self.get_context(name, value, attrs)
+        context['choices'] = [choice[1][0] for choice in context['widget']['optgroups']]
+        context['name'] = name
+        return self._render(self.template_name, context, renderer)
+
+class SetupForm(forms.Form):
+    
+    ASSESSMENT_TYPE_CHOICES = (
+            ('school', 'StreamWatch Schools'),
+            #PRT - disabled for the time being until these forms are fully implemented
+            #('chemical', 'Chemical Action Team'), 
+            #('biological', 'Biological Action Team'), 
+            #('baterial', 'Baterial Action Team'),
+        )
+
+    
+    investigator1 = forms.ModelChoiceField(
+        queryset=Affiliation.objects.filter(affiliation_id__in=(user_affiliations)).for_display(),
+        required=True,
+        help_text='Select a user as the main investigator',
+        label='Investigator #1'
+    )  
+    investigator2 = forms.ModelChoiceField(
+        queryset=Affiliation.objects.filter(affiliation_id__in=(user_affiliations)).for_display(),
+        required=False,
+        help_text='Select a user as the secondary investigator',
+        label='Investigator #2'
+    )   
+    collect_date = forms.DateField(
+        required=False,
+        label='Date',
+        initial=datetime.datetime.now().date(),
+    )
+    collect_time = forms.TimeField(
+        required=False,
+        label='Time',
+        input_formats=[
+            #see for acceptable formats https://docs.djangoproject.com/en/4.0/ref/templates/builtins/#date
+            '%H:%M',        # 14:30
+            '%H:%M:%S',     # 14:30:59
+            '%H:%M:%S.%f',  # 14:30:59.000200
+            '%I:%M %p',     # 02:30p.m.
+            '%I:%M%p',      # 02:30PM
+        ],
+        initial='00:00',
+
+    )
+    collect_tz = forms.ChoiceField(
+        required=False,
+        label='Timezone',
+        choices=[(None,'')] + timeutils.make_tz_tuple_list(timeutils.tz_key_shortlist, datetime.datetime(2022,1,1)),   
+        initial='US/Eastern',
+    )
+    assessment_type = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        label='Assessment type(s)',
+        required=True,
+        choices = ASSESSMENT_TYPE_CHOICES)    
+
+    
+    
+# Visual Assessment (All Forms)
+class VisualAssessmentForm(forms.Form):
+
+    # Weather Current Conditions
+    weather_cond = forms.TypedMultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Current Weather Conditions',
+        coerce=int,
+        choices= models.variable_choice_options('weather', False),
+    )
+    time_since_last_precip = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Time Since Last Rain or Snowmelt',
+        coerce=int,
+        choices= models.variable_choice_options('precipitation'),
+        initial='1'
+    )
+
+    # Water Conditions    
+    water_color = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Water Color:',
+        coerce=int,
+        choices= models.variable_choice_options('waterColor'),
+        initial='1'
+    )
+    water_odor = forms.TypedMultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Water Odor',
+        coerce=int,
+        choices= models.variable_choice_options('waterOdor', False),
+    )
+    clarity = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Clarity',
+        coerce=int,
+        choices= models.variable_choice_options('clarity'),
+        initial='1'
+    )
+    water_movement = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Water Movement',
+        coerce=int,
+        choices= models.variable_choice_options('waterMovement'),
+        initial='1'
+    )
+    surface_coating = forms.TypedMultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Surface Coating',
+        coerce=int,
+        choices= models.variable_choice_options('surfaceCoating', False),
+    )
+    aquatic_veg_amount = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Aquatic Vegetation Amount',
+        coerce=int,
+        choices= models.variable_choice_options('aquaticVegetation'),
+        initial='1'
+    )
+    aquatic_veg_type = forms.TypedMultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Aquatic Vegetation Type',
+        coerce=int,
+        choices= models.variable_choice_options('aquaticVegetationType', False),
+    )    
+    algae_amount = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Algae Amount',
+        coerce=int,
+        choices= models.variable_choice_options('algaeAmount'),
+        initial='1'
+    )
+    algae_type = forms.TypedMultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Algae Type',
+        coerce=int,
+        choices= models.variable_choice_options('algaeType', False),
+    )
+    site_observation = forms.CharField(
+        widget=forms.Textarea(),
+        required=False,
+        label='General Comments and Site Observations (maximum 255 characters)',
+        max_length=255
+    )
+
+class SimpleHabitatAssessmentForm(forms.Form):
+
+    # Simple Habitat Assesment (School form)
+    simple_woody_debris_amt = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Woody Debris Amount',
+        coerce=int,
+        choices= models.variable_choice_options('woodyDebris'),
+        initial='1'
+    )
+    simple_woody_debris_type = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Woody Debris Type',
+        coerce=int,
+        choices= models.variable_choice_options('woodyDebrisType'),
+        initial='1'
+    )
+    simple_tree_canopy = forms.TypedChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Tree Canopy',
+        coerce=int,
+        choices= models.variable_choice_options('treeCanopy'),
+        initial='1'
+    )
+    simple_land_use = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Land Use Characteristics',
+        choices= models.variable_choice_options('landUse', False),
+    )
+
+class StreamHabitatAssessmentForm(forms.Form):
+    
+    # Stream Habitat Assessment (BAT form)
+    reach_length = forms.FloatField(
+        label='Approximate Reach Length',
+        required=False,
+    )
+    instream_structure = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='In-Stream Structures',
+        choices= models.variable_choice_options('instreamStructures', False),
+    )
+    stream_flow = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Stream Flow',
+        choices= models.variable_choice_options('streamFlow'),
+        initial='1'
+    )
+    percent_riffle = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Riffle Morphology',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_run = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Run Morphology',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_pool = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Pool Morphology',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    woody_debris_amt = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Woody Debris Amount',
+        choices= models.variable_choice_options('woodyDebris'),
+        initial='1'
+    )
+    macroinvert_habitat_type = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Macroinvertebrate Habitat Types',
+        choices= models.variable_choice_options('macroinvertHabitat', False),
+    )
+    percent_silt_clay = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Silt and Clay Substrate',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_sand = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Sand Substrate',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_gravel = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Gravel Substrate',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_cobble = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Cobble Substrate',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_boulder = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Boulder Substrate',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    percent_bedrock = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Percent Bedrock Substrate',
+        choices= place_holder_choices,
+        initial='1'
+    )
+
+    # Riparian Habitat Assessment (BAT form)
+    bank_veg_type = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Bank Vegetation Type',
+        choices= models.variable_choice_options('bankVegetation', False),
+    )
+    tree_canopy = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Tree Canopy Coverage',
+        choices= models.variable_choice_options('treeCanopy'),
+        initial='1'
+    )
+    land_use = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Land Uses in 1/4 Mile Radius',
+        choices= models.variable_choice_options('landuseQuarterMile', False),
+    )
+    litter_amt = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Litter Concentration',
+        choices= models.variable_choice_options('litter'),
+        initial='1'
+    )
+    wildlife_obs = forms.MultipleChoiceField(
+        widget=MDLCheckboxSelectMultiple,
+        required=False,
+        label='Wildlife Observations',
+        choices= models.variable_choice_options('wildlife', False),
+    )
+    macroinvert_sample_collect = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Macroinvertebrate Sample Collected?',
+        choices= place_holder_choices,
+        initial='1'
+    )
+
+class SimpleWaterQualityForm(forms.Form):
+    
+    PARAMETER_CHOICES = (
+        ('simple_air_temperature', 'Air Temperature'),
+        ('simple_dissolved_oxygen', 'Dissolved Oxygen'),
+        ('simple_nitrate', 'Nitrate Nitrogen'),
+        ('simple_phosphate', 'Phosphate'),
+        ('simple_ph', 'pH'),
+        ('simple_salinity','Salinity'),
+        ('simple_turbidity', 'Turbidity'),
+        ('simple_turbidity_reagent_amt', 'Amount of Turbidity Reagent Added'),
+        ('simple_turbidity_sample_size', 'Turbidity Sample Size'),
+        ('simple_water_temperature', 'Water Temperature'))
+        
+    def __init__(self, *args, **kwargs):
+        super(SimpleWaterQualityForm, self).__init__(*args, **kwargs)
+        counter = 1
+        for keyname, plabel in self.PARAMETER_CHOICES:
+            self.fields[keyname] = forms.FloatField(label=plabel, required=False)
+            counter += 1
+
+class WaterQualityParametersForm(forms.Form):
+
+    #TODO convert index to variable ID  
+    PARAMETER_CHOICES = (
+        (1, 'Air Temperature'),
+        (2, 'Dissolved Oxygen (mg/L)'),
+        (3, 'Nitrate'),
+        (4, 'Phosphate'),
+        (5, 'pH'),
+        (6, 'Specific Conductivity (uL/cm)'),
+        (7, 'Total Dissolved Solids'),
+        (8, 'Turbidity (JTU)'),
+        (9, 'Water Temp (C)')
+    )
+    
+    parameter = forms.ChoiceField(
+        required=True,
+        widget=forms.Select,
+        label='Parameter',
+        choices= PARAMETER_CHOICES,
+        # initial='1'
+    )
+    
+    measurement = forms.FloatField(
+        label='Measurement',
+        required=True,
+    )
+    
+    unit = forms.ChoiceField(
+        required=True,
+        widget=forms.Select,
+        label='Unit',
+        choices= place_holder_choices,
+        # initial='1'
+    )
+
+
+class WaterQualityParametersSet(forms.BaseFormSet):
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, prefix='parameter', **kwargs)
+
+
+
+class WaterQualityForm(forms.Form):
+    meter = forms.CharField(
+        required=False,
+        label='pH Meter #'
+    )     
+    calibration_date = forms.DateField(
+        required=False,
+        label='Date of Last Calibration'
+    )
+    test_method = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Test Method',
+        choices= place_holder_choices,
+        initial='1'
+    )
+    parameters = formset_factory(WaterQualityParametersForm, formset=WaterQualityParametersSet, extra=3)
+
+    
+    def clean_data(self) -> Dict[str, Any]:
+        cleaned = self.cleaned_data
+        parameters  = {}
+        for key in self.data:
+            if 'parameter' not in key: continue
+            _, index, attribute = key.split('-')
+            if index not in parameters: parameters[index] = models.CATParameter()
+            setattr(parameters[index], attribute, self.data[key])
+        cleaned['parameters'] = list(parameters.values())
+        return cleaned
+
+
+
+class FlowMeasurementsForm(forms.Form):
+    
+    # Velocity (BAT form)
+    rep_wetted_width = forms.FloatField(
+        label='Representative Wetted Width',
+        required=False,
+    )
+    rep_depth1 = forms.FloatField(
+        label='Representative Depth Profile 1',
+        required=False,
+    )
+    rep_depth2 = forms.FloatField(
+        label='Representative Depth Profile 2',
+        required=False,
+    )
+    rep_depth3 = forms.FloatField(
+        label='Representative Depth Profile 3',
+        required=False,
+    )
+    rep_depth4 = forms.FloatField(
+        label='Representative Depth Profile 4',
+        required=False,
+    )
+    rep_depth5 = forms.FloatField(
+        label='Representative Depth Profile 5',
+        required=False,
+    )
+    avg_depth = forms.FloatField(
+        label='Average Depth',
+        required=False,
+    )
+    avg_float_time = forms.FloatField(
+        label='Average Float Time',
+        required=False,
+    )
+    avg_velocity = forms.FloatField(
+        label='Average Velocity',
+        required=False,
+    )
+    physical_assessment = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        label='Physical Assessment Conducted?',
+        choices= place_holder_choices,
+        initial='1'
+    )
+
+
diff --git a/src/streamwatch/models.py b/src/streamwatch/models.py
new file mode 100644
index 00000000..eaf3f6fb
--- /dev/null
+++ b/src/streamwatch/models.py
@@ -0,0 +1,669 @@
+from collections import namedtuple 
+import copy
+import datetime
+from typing import Dict, Any, Iterable, Tuple, Union, List
+
+import sqlalchemy
+
+from odm2 import odm2datamodels
+from streamwatch import timeutils
+
+odm2_engine = odm2datamodels.odm2_engine
+odm2_models = odm2datamodels.models
+
+STREAMWATCH_METHOD_ID = 1
+
+
+def variable_choice_options(variable_domain_cv:str, include_blank:bool=True) -> Iterable[Tuple]:
+    """Get categorical options from the variables table of the ODM2 database"""
+    query = (sqlalchemy.select(odm2_models.Variables.variableid, odm2_models.Variables.variabledefinition)
+            .where(odm2_models.Variables.variabletypecv == variable_domain_cv)
+            .order_by(odm2_models.Variables.variableid)
+        )
+    records = odm2_engine.read_query(query, output_format='records').tolist()
+    if include_blank:
+        records = [(None,'')] + records
+    return records
+
+
+def sampling_feature_code_to_id(code:str) -> Union[int,None]:
+    """Take a sampling_feature_code and finds the corresponding sampling_feature_id"""
+    query = (sqlalchemy.select(odm2_models.SamplingFeatures)
+        .where(odm2_models.SamplingFeatures.samplingfeaturecode == code)
+        )
+    result = odm2_engine.read_query(query, output_format='dict')
+    if result: return result[0]['samplingfeatureid']
+    return None
+
+
+def samplingfeature_assessments(sampling_feature_code:str) -> Dict[str,Any]:
+    """Get a joined list joined the featureactions and actions based on sampling_feature_code"""
+    sampling_feature_id = sampling_feature_code_to_id(sampling_feature_code)
+    if sampling_feature_id is None: return {}
+    
+    query = (sqlalchemy.select(odm2_models.FeatureActions, odm2_models.Actions)
+        .join(odm2_models.Actions, odm2_models.FeatureActions.actionid == odm2_models.Actions.actionid)
+        .where(odm2_models.FeatureActions.samplingfeatureid == sampling_feature_id)
+        .where(odm2_models.Actions.methodid == 1)
+        #.order_by(odm2_models.Actions.begindatetime)
+        )
+    results = odm2_engine.read_query(query, output_format='dict')
+
+    #convert UTC time to local time
+    for result in results:
+        result['begindatetime'] = result['begindatetime'] - datetime.timedelta(hours=result['begindatetimeutcoffset'])
+
+    return results
+
+
+def delete_streamwatch_assessment(action_id:int) -> None:
+    """Deletes a StreamWatch assessment from the database based on the parent action id"""
+    odm2_engine.delete_object(odm2_models.Actions, action_id)
+
+
+def get_odm2_units() -> Dict[int,Dict[str,Any]]:
+    """Get a dictionary of units in the ODM2 data"""
+    query = sqlalchemy.select(odm2_models.Units)
+    df = odm2_engine.read_query(query, output_format='dataframe')
+    df = df.set_index('unitsid')
+    return df.to_dict(orient='index')
+
+
+def get_odm2_variables() -> Dict[int, Dict[str,Any]]:
+    """Get a dictionary of variables in the ODM2 data"""
+    query = sqlalchemy.select(odm2_models.Variables)
+    df = odm2_engine.read_query(query, output_format='dataframe')
+    df = df.set_index('variableid')
+    return df.to_dict(orient='index')
+
+
+def affiliation_to_person(afflication_id:int) -> str:
+    """Returns the person name and organization for a given afflication"""
+    affiliation = odm2_engine.read_object(odm2_models.Affiliations, afflication_id)
+    organization = odm2_engine.read_object(odm2_models.Organizations, affiliation['organizationid'])
+    person = odm2_engine.read_object(odm2_models.People, affiliation['personid'])
+    return f"{person['personfirstname']} {person['personlastname']} ({organization['organizationname']})"
+
+
+def get_assessment_summary_information(sampling_feature_code:str) -> dict[str,Any]:
+    """Returns StreamWatch assessment information for a given sampling feature code"""
+    ASSESSMENT_TYPES = ['school','chemical','biological','bacterial']
+    
+    summary = {t:0 for t in ASSESSMENT_TYPES}
+    summary['most_recent'] = None
+    
+    sampling_feature_id = sampling_feature_code_to_id(sampling_feature_code)
+    query = (sqlalchemy.select(odm2_models.Actions)
+        .join(odm2_models.FeatureActions, odm2_models.FeatureActions.actionid==odm2_models.Actions.actionid)
+        .where(odm2_models.FeatureActions.samplingfeatureid==sampling_feature_id)
+        .where(odm2_models.Actions.methodid==STREAMWATCH_METHOD_ID)
+        .order_by(sqlalchemy.desc(odm2_models.Actions.begindatetime))
+        )
+    assessments = odm2_engine.read_query(query, output_format='dict', orient='records')
+    
+    if not assessments: return summary 
+    assessment_datetime = assessments[0]['begindatetime'] + datetime.timedelta(hours=assessments[0]['begindatetimeutcoffset'])
+    summary['most_recent'] = assessment_datetime 
+    for assessment in assessments:
+        for assessment_type in ASSESSMENT_TYPES:
+            if assessment_type in str(assessment['actiondescription']): 
+                summary[assessment_type] += 1
+    return summary
+
+
+FieldConfig = namedtuple('FieldConfig', ['variable_identifier','adapter_class','units','medium'])
+
+
+class CATParameter:
+    def __init__(self, parameter:str=None, measurement:float=None, unit:int=None) -> None:
+        self.parameter= parameter
+        self.measurement= measurement
+        self.unit= unit
+
+
+class CATMeasurement:
+        def __init__(self, name:str=None, id:str=None ,cal_date:datetime=None) -> None:
+            self.name= name
+            self.id=id
+            self.cal_date= cal_date
+
+
+class _BaseFieldAdapter():
+    
+    QUALITY_CODE_CV =  'None'
+    PROCESSING_LEVEL = 1 #Indicating raw results.
+    VALUE_FIELD_NAME = '' #The database field to return from read method, subclasses should implement this as class attribute.
+
+    @classmethod
+    def create_result(cls, feature_action_id:int, config:FieldConfig, result_type:str, variable_id:int=None) -> int:
+        """Create a ODM2 result record"""
+        result = odm2_models.Results()
+        result.featureactionid = feature_action_id
+        result.resulttypecv = result_type
+        result.variableid = variable_id if variable_id else config.variable_identifier
+        result.unitsid = config.units
+        result.processinglevelid = cls.PROCESSING_LEVEL
+        result.sampledmediumcv = config.medium
+        result.valuecount = -9999
+        return odm2_engine.create_object(result)
+
+    @classmethod
+    def read(cls, database_record:Dict[str, Any]) -> Any:
+        return database_record[cls.VALUE_FIELD_NAME]
+
+    @classmethod
+    def get_result_records(cls, feature_action_id:int, variable_id:int=None, variable_type_cv:str=None) -> List[Dict[str,Any]]:
+        query = (sqlalchemy.select(odm2_models.Results)
+            .join(odm2_models.FeatureActions, odm2_models.FeatureActions.featureactionid==odm2_models.Results.featureactionid)
+            .join(odm2_models.Variables, odm2_models.Variables.variableid==odm2_models.Results.variableid)
+            .where(odm2_models.FeatureActions.featureactionid==feature_action_id)
+            )
+        if variable_id: 
+            query = query.where(odm2_models.Results.variableid == variable_id)
+        if variable_type_cv: 
+            query = query.where(odm2_models.Variables.variabletypecv == variable_type_cv)
+        results = odm2_engine.read_query(query, output_format='dict')
+        return results
+
+        
+class _ChoiceFieldAdapter(_BaseFieldAdapter):
+    """Adapter class for translating single select field data into ODM2 results structure
+    
+        Implemented through the `results` table. Presence of a result record means a field
+        was populated, and the `variableid` of the result record indicates the categorical value
+        that was selected. 
+    """
+
+    RESULT_TYPE_CV = 'Category observation'
+    VALUE_FIELD_NAME = 'variableid'
+
+    @classmethod
+    def create(cls, value:Any, datetime:datetime.datetime, utc_offset:int, feature_action_id:int, config:FieldConfig) -> None:
+        if not value: return 
+        result_id = cls.create_result(feature_action_id, config, cls.RESULT_TYPE_CV, value)
+    
+    @classmethod
+    def update(cls, value:Any, feature_action_id:int, config:FieldConfig) -> None:
+        result_records = cls.get_result_records(feature_action_id, variable_type_cv=config.variable_identifier)
+        if not result_records: 
+            raise KeyError(f"No result records for feature_action_id:{feature_action_id} and variableid:{config.variable_identifier}")
+        result_id = result_records[0]['resultid']
+        if not value and result_records:
+            odm2_engine.delete_object(odm2_models.Results, result_id)
+            return
+        odm2_engine.update_object(odm2_models.Results, result_id, {'variableid':value})   
+
+
+class _MultiChoiceFieldAdapter(_BaseFieldAdapter):
+    """Adapter class for translating multi-select field into ODM2 results structure
+    
+        Implemented through the `results` table. Presence of a result record means an 
+        option was selected and the `variableid` of the result record indicates which 
+        categorical value was selected. As a multi-choice field, when two or more 
+        options are selected, each selected value will be stored in the database 
+        as distinct result record. Creating a full list of which options were selected 
+        requires reading the `variableid` from all result records with the same 
+        `variabletypecv` field.   
+    """
+    
+    RESULT_TYPE_CV = 'Category observation'
+    VALUE_FIELD_NAME = 'variableid'
+
+    @classmethod
+    def create(cls, value:Any, datetime:datetime.datetime, utc_offset:int, feature_action_id:int, config:FieldConfig) -> None:
+        if not value: return 
+        if not isinstance(value,list): value = [value] 
+        for selected in value:
+            cls.create_result(feature_action_id, config, cls.RESULT_TYPE_CV, selected) 
+
+    @classmethod
+    def update(cls, value:Any, feature_action_id:int, config:FieldConfig) -> None:
+        result_records = cls.get_result_records(feature_action_id, variable_type_cv=config.variable_identifier)
+        if not result_records: 
+            raise KeyError(f"No result records for feature_action_id:{feature_action_id} and variableid:{config.variable_identifier}")
+
+        saved_results = {r['variableid']:r['resultid'] for r in result_records  }
+        
+        if not isinstance(value, list) and value: value = [value]
+        for selected in value:
+            if int(selected) in saved_results: 
+                saved_results.pop(int(selected))
+            elif int(selected) not in saved_results:
+                cls.create_result(feature_action_id, config, cls.RESULT_TYPE_CV, selected)
+        
+        if saved_results:
+            for resultid in saved_results.values(): odm2_engine.delete_object(odm2_models.Results, resultid) 
+
+
+class _FloatFieldAdapter(_BaseFieldAdapter):
+    """Adapter for translating float value into ODM2 results structure
+    
+        Implemented through the `MeasurementResults` and `MeasurementResultValues` tables. 
+    """
+    
+    RESULT_TYPE_CV = 'Measurement'
+    CENSOR_CODE_CV = 'Unknown'
+    AGGREGATION_STATISTIC_CV = 'Sporadic'
+    TIME_AGGREGATION_INTERVAL = 1.0
+    TIME_AGGREGATION_INTERVAL_UNIT_ID = 2 #hour minute
+    VALUE_FIELD_NAME = 'measurement_datavalue'
+
+    @classmethod
+    def create(cls, value:Any, datetime:datetime.datetime, utc_offset:int, feature_action_id:int, config:FieldConfig) -> None:
+        if not value: return 
+        result_id = cls.create_result(feature_action_id, config, cls.RESULT_TYPE_CV)
+        
+        measurementresult = odm2_models.MeasurementResults()
+        measurementresult.resultid = result_id
+        measurementresult.censorcodecv = cls.CENSOR_CODE_CV
+        measurementresult.qualitycodecv = cls.QUALITY_CODE_CV
+        measurementresult.aggregationstatisticcv = cls.AGGREGATION_STATISTIC_CV
+        measurementresult.timeaggregationinterval = cls.TIME_AGGREGATION_INTERVAL
+        measurementresult.timeaggregationintervalunitsid = cls.TIME_AGGREGATION_INTERVAL_UNIT_ID
+        odm2_engine.create_object(measurementresult, preserve_pkey=True)
+
+        measurementresultvalue = odm2_models.MeasurementResultValues()
+        measurementresultvalue.resultid = result_id
+        measurementresultvalue.datavalue = value
+        measurementresultvalue.valuedatetime = datetime
+        measurementresultvalue.valuedatetimeutcoffset = utc_offset
+        odm2_engine.create_object(measurementresultvalue)    
+    
+    @classmethod
+    def update(cls, value:Any, feature_action_id:int, config:FieldConfig) -> None:
+        result_records = cls.get_result_records(feature_action_id, config.variable_identifier)
+        if not result_records: 
+            raise KeyError(f"No result records for feature_action_id:{feature_action_id} and variableid:{config.variable_identifier}")
+        result_id = result_records[0]['resultid']
+
+        if not value: 
+            odm2_engine.delete_object(odm2_models.Results, result_id)
+            return
+
+        #TODO: we should implemented an update_query method in ODM2Engine
+        query = (sqlalchemy.select(odm2_models.MeasurementResultValues)
+            .where(odm2_models.MeasurementResultValues.resultid==result_id)
+        )
+        measurement_result_value = odm2_engine.read_query(query, output_format='dict')
+        value_id = measurement_result_value[0]['valueid']
+        odm2_engine.update_object(odm2_models.MeasurementResultValues, value_id, {'datavalue':value})
+
+
+class _TextFieldAdapter(_BaseFieldAdapter):
+    """Adapter for translating string value into ODM2 results structure
+    
+       Implemented through the `CategoricalResults` and `CategoricalResultValues` tables. 
+    """
+    
+    RESULT_TYPE_CV = 'Category observation'
+    VALUE_FIELD_NAME = 'categorical_datavalue'
+
+    @classmethod
+    def create(cls, value:Any, datetime:datetime.datetime, utc_offset:int, feature_action_id:int, config:FieldConfig) -> None:
+        if not value: return 
+        result_id = cls.create_result(feature_action_id, config, cls.RESULT_TYPE_CV)
+        
+        categoricalresult = odm2_models.CategoricalResults()
+        categoricalresult.resultid = result_id
+        categoricalresult.qualitycodecv = cls.QUALITY_CODE_CV
+        odm2_engine.create_object(categoricalresult, preserve_pkey=True)
+
+        categoricalresultvalue = odm2_models.CategoricalResultValues()
+        categoricalresultvalue.resultid = result_id
+        categoricalresultvalue.datavalue = value
+        categoricalresultvalue.valuedatetime = datetime
+        categoricalresultvalue.valuedatetimeutcoffset = utc_offset
+        odm2_engine.create_object(categoricalresultvalue)
+    
+    @classmethod
+    def update(cls, value:Any, feature_action_id:int, config:FieldConfig) -> None:
+        result_records = cls.get_result_records(feature_action_id, config.variable_identifier)
+        if not result_records: 
+            raise KeyError(f"No result records for feature_action_id:{feature_action_id} and variableid:{config.variable_identifier}")
+        result_id = result_records[0]['resultid']
+
+        if not value: 
+            odm2_engine.delete_object(odm2_models.Results, result_id)
+            return
+
+        #TODO: we should implemented an update_query method in ODM2Engine
+        query = (sqlalchemy.select(odm2_models.CategoricalResultValues)
+            .where(odm2_models.CategoricalResultValues.resultid==result_id)
+        )
+        categorical_result_value = odm2_engine.read_query(query, output_format='dict')
+        value_id = categorical_result_value[0]['valueid']
+        odm2_engine.update_object(odm2_models.CategoricalResultValues, value_id, {'datavalue':value})   
+        
+
+class StreamWatchODM2Adapter():
+    """Adapter class for translating stream watch form data in and out of ODM2"""
+
+    ROOT_METHOD_ID = STREAMWATCH_METHOD_ID
+    PARENT_ACTION_TYPE_CV = 'Field activity'
+    VARIABLE_CODE = 'variableid'
+    VARIABLE_TYPE = 'variabletypecv'
+
+    #This is intended be more flexible way to map form field ODM2 data
+    #and limit the hardcoding to a single location
+    #FieldConfig(variable_identifier:str|int, adapterclass|Class, units:int, medium:str)
+    #for variable_identifier int corresponding to variableid should be populated for Text and Floats 
+    #   ans str corresponding to variabletypecv should be populated for Choice and MultiChoice 
+    PARAMETER_CROSSWALK = {
+        'algae_amount' : FieldConfig('algaeAmount',_ChoiceFieldAdapter,394,'Liquid aqueous'),
+        'algae_type' : FieldConfig('algaeType',_MultiChoiceFieldAdapter,394,'Liquid aqueous'),
+        'aquatic_veg_amount' : FieldConfig('aquaticVegetation',_ChoiceFieldAdapter,394,'Liquid aqueous'),
+        'aquatic_veg_type' : FieldConfig('aquaticVegetationType',_MultiChoiceFieldAdapter,394,'Liquid aqueous'),
+        'site_observation' : FieldConfig(540,_TextFieldAdapter,394,'Not applicable'),
+        'simple_air_temperature' : FieldConfig(541,_FloatFieldAdapter,362,'Air'),
+        'simple_dissolved_oxygen' : FieldConfig(544,_FloatFieldAdapter,404,'Liquid aqueous'),
+        'simple_nitrate' : FieldConfig(546,_FloatFieldAdapter,404,'Liquid aqueous'),
+        'simple_phosphate' : FieldConfig(547,_FloatFieldAdapter,404,'Liquid aqueous'),
+        'simple_ph' : FieldConfig(543,_FloatFieldAdapter,385,'Liquid aqueous'),
+        'simple_salinity' : FieldConfig(545,_FloatFieldAdapter,428,'Liquid aqueous'),
+        'simple_turbidity' : FieldConfig(550,_FloatFieldAdapter,364,'Liquid aqueous'),
+        'simple_turbidity_reagent_amt' : FieldConfig(548,_FloatFieldAdapter,364,'Liquid aqueous'),
+        'simple_turbidity_sample_size' : FieldConfig(549,_FloatFieldAdapter,364,'Liquid aqueous'),
+        'simple_water_temperature' : FieldConfig(542,_FloatFieldAdapter,362,'Liquid aqueous'),
+        'simple_woody_debris_amt' : FieldConfig('woodyDebris',_ChoiceFieldAdapter,394,'Other'),
+        'simple_woody_debris_type' : FieldConfig('woodyDebrisType',_ChoiceFieldAdapter,394,'Other'),
+        'simple_tree_canopy' : FieldConfig('treeCanopy',_ChoiceFieldAdapter,394,'Other'),
+        'simple_land_use' : FieldConfig('landUse',_MultiChoiceFieldAdapter,394,'Other'),
+        'surface_coating' : FieldConfig('surfaceCoating',_MultiChoiceFieldAdapter,394,'Liquid aqueous'),
+        'time_since_last_precip' : FieldConfig('precipitation',_ChoiceFieldAdapter,394,'Other'),
+        'clarity' : FieldConfig('clarity',_ChoiceFieldAdapter,394,'Liquid aqueous'),
+        'water_color' : FieldConfig('waterColor',_ChoiceFieldAdapter,394,'Liquid aqueous'),
+        'water_movement' : FieldConfig('waterMovement',_ChoiceFieldAdapter,394,'Liquid aqueous'),
+        'water_odor' : FieldConfig('waterOdor',_MultiChoiceFieldAdapter,394,'Liquid aqueous'),
+        'weather_cond' : FieldConfig('weather',_MultiChoiceFieldAdapter,394,'Air'),
+    }
+
+    def __init__(self, action_id:int) -> None:
+        self.action_id = action_id
+        self._attributes = {}
+
+    @classmethod
+    def _reverse_crosswalk(cls) -> Dict[str,Any]:
+        return {v[0]:(k,*v[1:]) for k,v in cls.PARAMETER_CROSSWALK.items() }
+
+    @classmethod 
+    def from_action_id(cls, action_id:int) -> "StreamWatchODM2Adapter":
+        """Constructor to retrieve existing form data from database based on assessment ActionId.
+        
+        input:
+            action_id:int - the `actionid` corresponding to the root action for the StreamWatch assessment.
+        
+        output:
+            StreamWatchODM2Adapter object
+        """
+        instance = cls(action_id)
+        instance._read_and_map_special_cases()
+        data = instance._read_from_database(action_id)
+        instance._map_database_to_dict(data)
+        return instance
+
+    @classmethod
+    def from_dict(cls, form_data:Dict[str,Any]) -> "StreamWatchODM2Adapter":
+        """Constructor to create new entry for a form on initial submittal
+        
+        inputs: 
+            form_data:Dict[str,Any] = a dictionary of data containing the form parameters
+                with the dictionary key being the form field name, and the dictionary value
+                being the user input value of the field from the form. 
+
+        output: 
+            StreamWatchODM2Adapter object
+        """
+        
+        def create_parent_action(form_data:Dict[str,Any]) -> None:
+            """Helper method to create a parent a new action StreamWatch parent action"""
+            datetime_info = cls._get_datetime_and_utcoffset(form_data)            
+
+            action = odm2_models.Actions()
+            action.actiontypecv = cls.PARENT_ACTION_TYPE_CV
+            action.methodid = cls.ROOT_METHOD_ID
+            action.begindatetime = datetime_info[0]
+            action.begindatetimeutcoffset = datetime_info[1] 
+            action.actiondescription = ','.join(form_data['assessment_type'])
+
+            action.actionid = odm2_engine.create_object(action)
+            return action
+
+        def create_investigator(action_id:int, afflication_id:int, is_lead=False) -> None:
+            actionby = odm2_models.ActionBy()
+            actionby.actionid = action_id
+            actionby.affiliationid = afflication_id
+            actionby.isactionlead = is_lead
+            odm2_engine.create_object(actionby)
+
+
+        parent_action = create_parent_action(form_data)
+        instance = StreamWatchODM2Adapter(parent_action.actionid)
+        instance._attributes = form_data    
+        feature_action_id = instance._create_feature_action(instance.action_id, form_data['sampling_feature_id']) 
+        create_investigator(instance.action_id, form_data['investigator1'].affiliation_id, True)
+        if form_data['investigator2'] is not None:
+            create_investigator(instance.action_id, form_data['investigator2'].affiliation_id, False)
+        
+        for key, value in form_data.items():
+            if key not in instance.PARAMETER_CROSSWALK: continue
+            config = instance.PARAMETER_CROSSWALK[key]
+            config.adapter_class.create(
+                value, 
+                parent_action.begindatetime, 
+                parent_action.begindatetimeutcoffset, 
+                feature_action_id,
+                config
+            )
+        return instance
+
+    def _read_from_database(self, parent_action_id:int) -> List[Dict[str,Any]]:
+        """Helper method to query the data from the database"""
+        query = (
+            sqlalchemy.select(
+                odm2_models.Actions, odm2_models.FeatureActions, odm2_models.Results, odm2_models.Variables,
+                odm2_models.MeasurementResultValues.datavalue.label('measurement_datavalue'), 
+                odm2_models.CategoricalResultValues.datavalue.label('categorical_datavalue'),
+                )
+            .join(odm2_models.FeatureActions, odm2_models.FeatureActions.actionid==odm2_models.Actions.actionid)
+            .join(odm2_models.Results, odm2_models.Results.featureactionid==odm2_models.FeatureActions.featureactionid)
+            .join(odm2_models.Variables, odm2_models.Variables.variableid==odm2_models.Results.variableid)
+            .outerjoin(odm2_models.MeasurementResults, odm2_models.MeasurementResults.resultid==odm2_models.Results.resultid)
+            .outerjoin(odm2_models.MeasurementResultValues, odm2_models.MeasurementResultValues.resultid==odm2_models.MeasurementResults.resultid)
+            .outerjoin(odm2_models.CategoricalResults, odm2_models.CategoricalResults.resultid==odm2_models.Results.resultid)
+            .outerjoin(odm2_models.CategoricalResultValues, odm2_models.CategoricalResultValues.resultid==odm2_models.CategoricalResults.resultid)
+            .where(odm2_models.Actions.actionid==parent_action_id) #TODO: this eventually need to be scaled to include related actions
+            )
+        data = odm2_engine.read_query(query, output_format='dict')
+        return data
+
+    def _map_database_to_dict(self, data:Dict[str,Any]) -> None:
+        """Reverses the database crosswalk to map data back to dictionary""" 
+
+        self._read_and_map_special_cases()
+        crosswalk = self._reverse_crosswalk()
+        for record in data:
+            if record[self.VARIABLE_CODE] in crosswalk:
+                parameter_information = crosswalk[record[self.VARIABLE_CODE]]
+                field_adapter = parameter_information[1]
+                self._attributes[parameter_information[0]] = field_adapter.read(record)
+            elif record[self.VARIABLE_TYPE] in crosswalk:
+                parameter_information = crosswalk[record[self.VARIABLE_TYPE]]
+                field_adapter = parameter_information[1]
+                if field_adapter is _MultiChoiceFieldAdapter:
+                    if parameter_information[0] not in self._attributes: 
+                        self._attributes[parameter_information[0]] = []
+                    self._attributes[parameter_information[0]].append(field_adapter.read(record))
+                else: 
+                    self._attributes[parameter_information[0]] = field_adapter.read(record)
+
+    def _read_and_map_special_cases(self) -> None:
+        action = odm2_engine.read_object(odm2_models.Actions, self.action_id)
+        self._attributes['assessment_type'] = [] 
+        if action['actiondescription']:
+            self._attributes['assessment_type'] = action['actiondescription'].split(',')
+        
+        action_datetime_local = action['begindatetime'] - datetime.timedelta(hours=action['begindatetimeutcoffset'])
+        self._attributes['collect_date'] = action_datetime_local.date()
+        self._attributes['collect_time'] = action_datetime_local.time() 
+
+        query = (sqlalchemy.select(odm2_models.ActionBy)
+            .where(odm2_models.ActionBy.actionid == self.action_id)
+            )
+        investigators = odm2_engine.read_query(query, output_format='dict') 
+        self._attributes['investigator1'] = None
+        self._attributes['investigator2'] = None
+        
+        for investigator in investigators:
+            if investigator['isactionlead']: 
+                self._attributes['investigator1'] = investigator['affiliationid']
+                continue
+            self._attributes['investigator2'] = investigator['affiliationid']
+
+    def _create_feature_action(self, actionid:int, sampling_feature_id:int) -> int:
+        """Helper method to register an action to the SamplingFeature"""
+        featureaction = odm2_models.FeatureActions.from_dict({
+            'samplingfeatureid':sampling_feature_id, 
+            'actionid':actionid
+            })
+        return odm2_engine.create_object(featureaction)
+
+    @classmethod
+    def _get_datetime_and_utcoffset(cls, form_data:Dict[str,Any]) -> Tuple[datetime.datetime, int]:
+        """Helper function to format datatime and utcoffset based on form provided values"""
+        date = form_data['collect_date']
+        time = form_data['collect_time']
+        timezone = form_data['collect_tz']
+
+        if date is None: date = datetime.datetime.now().date()
+        if time is None: time = datetime.time(0,0)
+        utc_offset = timeutils.get_utcoffset(timezone)
+        datetime_combined = datetime.datetime.combine(date, time)
+        datetime_combined = datetime_combined + datetime.timedelta(hours=utc_offset[0])
+        return datetime_combined, utc_offset[0]
+
+
+    def to_dict(self, string_format:bool=False) -> Dict[str,Any]:
+        """Return attributes as dictionary with form fields mapped as keys and user inputs as values
+        
+            inputs: 
+                string_format:boolean | optional | default=False
+                    Bool flag indicating if `variable` and `unit` parameters should be converted to strings
+
+            outputs:
+                Dict[str,Any]: 
+                    Dictionary of form data with form field names mapped as keys and 
+                    user inputs mapped to dictionary values. 
+        """
+        if not string_format: return self._attributes
+
+        data = copy.deepcopy(self._attributes)
+        variables = get_odm2_variables()
+        for key, value in data.items():
+            if key not in self.PARAMETER_CROSSWALK: continue
+            config = self.PARAMETER_CROSSWALK[key] 
+            if config.adapter_class is _ChoiceFieldAdapter: data[key] = variables[value]['variabledefinition']
+            elif config.adapter_class is _MultiChoiceFieldAdapter: data[key] = ', '.join([variables[x]['variabledefinition'] for x in value])
+
+        if data['investigator1']: 
+            data['investigator1'] = affiliation_to_person(data['investigator1'])
+        if data['investigator2']: 
+            data['investigator2'] = affiliation_to_person(data['investigator2'])
+
+        if data['assessment_type']:
+            assessment_types = []
+            for a_type in data['assessment_type']:
+                if a_type == 'school': assessment_types.append('StreamWatch Schools')  
+                elif a_type == 'chemical': assessment_types.append('Chemical Action Team')  
+                elif a_type == 'biological': assessment_types.append('Biological Action Team')  
+                elif a_type == 'baterial': assessment_types.append('Baterial Action Team')  
+            data['assessment_type'] = ', '.join(assessment_types)
+
+        return data
+
+    def update_from_dict(self, form_data:Dict[str,Any]) -> None:
+        """Method to take dictionary of data from the form and update the database records
+        
+            inputs: 
+                Dict[str,Any]: Dictionary of form data with form field names mapped as keys and
+                    user inputs mapped to dictionary values.
+            
+            outputs:
+                None
+        """
+        self._update_special_cases(form_data)
+        
+        parent_action = odm2_engine.read_object(odm2_models.Actions, self.action_id)
+        query = (sqlalchemy.select(odm2_models.FeatureActions)
+            .where(odm2_models.FeatureActions.actionid==parent_action['actionid'])
+        )
+        feature_action = odm2_engine.read_query(query,output_format='dict')
+        feature_action_id = feature_action[0]['featureactionid']
+        for key, value in form_data.items():
+            if key not in self.PARAMETER_CROSSWALK: continue
+            
+            config = self.PARAMETER_CROSSWALK[key]
+            if key not in self._attributes:
+                config.adapter_class.create(
+                    value, 
+                    parent_action['begindatetime'],
+                    parent_action['begindatetimeutcoffset'],
+                    feature_action_id, 
+                    config,
+                )
+                continue
+            if value != self._attributes[key]:
+                config.adapter_class.update(
+                    value, 
+                    feature_action_id, 
+                    config,
+                )
+                continue
+        
+    def _update_special_cases(self, form_data:Dict[str,Any]) -> None:
+        """Method to update form parameters that do not utilize a _BaseFieldAdapter subclass"""
+        if (form_data['collect_date'] != self._attributes['collect_date'] 
+            or form_data['collect_time'] != self._attributes['collect_time']
+        ):
+            datetime_info = self._get_datetime_and_utcoffset(form_data)
+            odm2_engine.update_object(
+                odm2_models.Actions, 
+                self.action_id, 
+                {
+                    'begindatetime': datetime_info[0],
+                    'begindatetimeutcoffset': datetime_info[1],
+                }
+            )
+
+        if form_data['assessment_type'] != self._attributes['assessment_type']:
+            odm2_engine.update_object(
+                odm2_models.Actions, 
+                self.action_id, 
+                {'actiondescription': ','.join(form_data['assessment_type'])}
+            )      
+
+        def get_actionby_bridgeid(action_id:int, lead:bool=True) -> List[Dict[str,Any]]:
+            query = (sqlalchemy.select(odm2_models.ActionBy.bridgeid)
+                .where(odm2_models.ActionBy.actionid == action_id)
+                .where(odm2_models.ActionBy.isactionlead == lead)
+                )
+            records = odm2_engine.read_query(query, output_format='dict')
+            return records[0]['bridgeid']
+
+        if form_data['investigator1'] != self._attributes['investigator1']:
+            bridge_id = get_actionby_bridgeid(self.action_id, True)
+            odm2_engine.update_object(odm2_models.ActionBy, bridge_id, {'affiliationid':form_data['investigator1'].affiliation_id})
+
+        if form_data['investigator2'] != self._attributes['investigator2']:
+            if form_data['investigator2'] and self._attributes['investigator2']:
+                bridge_id = get_actionby_bridgeid(self.action_id, False)
+                odm2_engine.update_object(odm2_models.ActionBy, bridge_id, {'affiliationid':form_data['investigator2'].affiliation_id})
+            elif form_data['investigator2'] and not self._attributes['investigator2']:
+                action_by = odm2_models.ActionBy()
+                action_by.actionid = self.action_id
+                action_by.affiliationid = form_data['investigator2'].affiliation_id 
+                action_by.isactionlead = False
+                odm2_engine.create_object(action_by)
+            elif not form_data['investigator2'] and self._attributes['investigator2']:
+                bridge_id = get_actionby_bridgeid(self.action_id, False)
+                odm2_engine.delete_object(odm2_models.ActionBy, bridge_id)
+
diff --git a/src/streamwatch/tests.py b/src/streamwatch/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/src/streamwatch/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/src/streamwatch/timeutils.py b/src/streamwatch/timeutils.py
new file mode 100644
index 00000000..f5f139be
--- /dev/null
+++ b/src/streamwatch/timeutils.py
@@ -0,0 +1,130 @@
+from datetime import datetime
+from math import trunc
+from typing import Tuple, List
+import zoneinfo
+
+# Calculate UTC Offset for a tz & dt
+def get_utcoffset(tz_key: str = None, 
+                  dt: datetime = None) -> Tuple[int, str, str]:
+    '''
+    Calculate standard time UTC offset integer, offset timedelta string, 
+    and short name for Standard Time for a given IANA timezone key and 
+    a given datetime.
+    
+    tz_key: a valid `zoneinfo` timezone key. 
+    If `None` it is based on timezone information from the operating system.
+
+    dt: the datetime used to determine the UTC offset for a given timezone, 
+    considering daylight savings vs. standard time. 
+    If `None` it is assumed to be January 1st 2022, to return Standard Time in the northern hemisphere
+    
+    WARNING: This providesConversion from daylight savings to standard time
+    will not likely work in the southern hemisphere. 
+    '''
+    if not dt:
+        dt = datetime.now()
+
+    if not tz_key:
+        # Get local timezone
+        dt_tz = dt.astimezone() 
+    else:
+        # Get local timezone
+        dt_tz = dt.astimezone(zoneinfo.ZoneInfo(tz_key)) 
+
+    
+    utc_offset = dt_tz.utcoffset().total_seconds() / (60*60)
+    utc_offset_int = trunc(utc_offset)
+    
+    return utc_offset_int, dt_tz.isoformat()[-6:], dt_tz.tzname()
+
+
+def make_tz_tuple_list(tz_key_list: list = None,
+                       dt: datetime = None) -> list:
+    '''
+    Creates a list of tuples with:
+    - `zoneinfo` timezone keys
+    - display field for timezone info, which is a concatenation of:
+      - UTC offset in hours
+      - `zoneinfo` timezone key
+      - `zoneinfo` timezone name/code, which often distinguishes
+      daylight savings (D) vs. standard time (S).
+
+    tz_key_list: a supplied list of `zoneinfo` timezone keys.
+        If None, then uses all >500 `zoneinfo` timezone keys 
+    '''
+    tz_tuple_list = []
+
+    if not tz_key_list:
+        tz_key_list = zoneinfo.available_timezones()
+    else:
+        tz_key_list
+    
+    if not dt:
+        dt = datetime.utcnow().astimezone(zoneinfo.ZoneInfo('UTC'))
+
+    for tz_key in tz_key_list:
+        tz_info = get_utcoffset(tz_key, dt)
+        tz_display = f"(UTC{tz_info[1]}) {tz_key} ({tz_info[2]})"
+        tz_tuple = (tz_key, tz_display)
+        tz_tuple_list.append(tz_tuple)
+    
+    def item2(tz_tuple):
+        return get_utcoffset(tz_tuple[0])[0]
+
+    tz_tuple_list_sorted = tz_tuple_list.sort(reverse=True, key=item2)
+    
+    return tz_tuple_list
+
+
+   # A very short list of all whole-hour UTC offsets, 
+# using biggest cities, with and without daylight savings
+# NOTE: many timezones have half-hour UTC offsets (and also 15 min);
+# these fractional-hour offsets will not work with ODM2.0
+tz_key_shortlist = [
+    'Pacific/Kiritimati',
+    'Pacific/Auckland',
+    'Pacific/Tongatapu',
+    'Pacific/Fiji',
+    'Australia/Sydney',
+    'Pacific/Noumea',
+    'Asia/Vladivostok',
+    'Pacific/Guam',
+    'Asia/Tokyo',
+    'Pacific/Palau',
+    'Asia/Shanghai',
+    'Asia/Singapore',
+    'Australia/Perth',
+    'Asia/Bangkok',
+    'Asia/Dhaka',
+    'Asia/Karachi',
+    'Asia/Dubai',
+    'Asia/Istanbul',
+    'Europe/Moscow',
+    'Africa/Nairobi',
+    'Europe/Athens',
+    'Asia/Jerusalem',
+    'Europe/Paris',
+    'Africa/Douala',
+    'Europe/London',
+    'UTC',
+    'Atlantic/Cape_Verde',
+    'Atlantic/South_Georgia',
+    'America/Sao_Paulo',
+    'America/Halifax',
+    'America/Manaus',
+    'US/Eastern',
+    'America/Bogota',
+    'US/Central',
+    'Pacific/Galapagos',
+    'US/Mountain',
+    'Etc/GMT+7',
+    'US/Pacific',
+    'Pacific/Pitcairn',
+    'US/Alaska',
+    'Pacific/Gambier',
+    'US/Hawaii',
+    'Pacific/Rarotonga',
+    'Pacific/Samoa',
+    'Pacific/Niue',
+    'Etc/GMT+12',
+]    
\ No newline at end of file
diff --git a/src/streamwatch/urls.py b/src/streamwatch/urls.py
new file mode 100644
index 00000000..ad3d8cf8
--- /dev/null
+++ b/src/streamwatch/urls.py
@@ -0,0 +1,12 @@
+from django.conf.urls import url
+
+from streamwatch import views
+
+urlpatterns = [
+    url(r'(?P<pk>.*?)/addsensor/$', views.StreamWatchCreateMeasurementView.as_view(), name='addsensor'),
+    url(r'create/$', views.CreateView.as_view(), name='create'),
+    url(r'delete/$', views.DeleteView.as_view(), name='delete'),
+    url(r'(?P<action_id>.*?)/update/$', views.UpdateView.as_view(), name='update'),
+    url(r'(?P<pk>.*?)/csv/$', views.download_StreamWatch_csv, name='csv_download'),
+    url(r'(?P<pk>.*?)/$', views.DetailView.as_view(), name='view'),
+]    
diff --git a/src/streamwatch/views.py b/src/streamwatch/views.py
new file mode 100644
index 00000000..976846c9
--- /dev/null
+++ b/src/streamwatch/views.py
@@ -0,0 +1,264 @@
+import django
+from django.shortcuts import reverse, redirect
+from django.http import HttpResponse
+from django.http import response
+from django.contrib.auth.decorators import login_required
+from formtools.wizard.views import SessionWizardView
+
+import datetime
+import csv
+from typing import List
+
+from dataloaderinterface.models import SiteRegistration
+from streamwatch import models
+from streamwatch import forms
+
+
+class LoginRequiredMixin(object):
+    @classmethod
+    def as_view(cls):
+        return login_required(super(LoginRequiredMixin, cls).as_view())
+
+
+class ListUpdateView(LoginRequiredMixin, django.views.generic.detail.DetailView):
+    template_name = 'dataloaderinterface/manage_streamwatch.html'
+    model = SiteRegistration
+    slug_field = 'sampling_feature_code'
+    slug_url_kwarg = 'sampling_feature_code'
+
+    def dispatch(self, request, *args, **kwargs) -> HttpResponse:
+        site = SiteRegistration.objects.get(sampling_feature_code=self.kwargs[self.slug_field])
+        if request.user.is_authenticated and not request.user.can_administer_site(site):
+            raise response.Http404
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        sampling_feature_code = self.kwargs[self.slug_field]
+        assessments = models.samplingfeature_assessments(sampling_feature_code)
+        context['streamwatchsurveys'] = assessments
+        return context
+
+
+def condition_cat(wizard):
+    setup_data = wizard.get_cleaned_data_for_step('setup')
+    if setup_data is not None:
+        return 'chemical' in setup_data['assessment_type']
+    return True
+
+
+def condition_school(wizard):
+    setup_data = wizard.get_cleaned_data_for_step('setup')
+    if setup_data is not None:
+        return 'school' in setup_data['assessment_type']
+    return True
+
+
+class CreateView(SessionWizardView):
+    form_list = [
+        ('setup',forms.SetupForm), 
+        ('conditions',forms.VisualAssessmentForm),
+        ('simplehabitat',forms.SimpleHabitatAssessmentForm),
+        ('simplewaterquality',forms.SimpleWaterQualityForm),        
+    ]
+    condition_dict = {
+        'simplewaterquality': condition_school,
+        'simplehabitat': condition_school
+    }
+    
+    template_name = 'streamwatch/streamwatch_wizard.html'
+    slug_field = 'sampling_feature_code'
+            
+    def get_context_data(self, form:django.forms.Form, **kwargs):
+        context = super().get_context_data(form=form, **kwargs)
+        context[self.slug_field] = self.kwargs[self.slug_field]
+        return context
+
+    def done(self, form_list:List[django.forms.Form], **kwargs):
+        sampling_feature_id = models.sampling_feature_code_to_id(self.kwargs[self.slug_field])
+        
+        form_data = {'sampling_feature_id':sampling_feature_id, 'cat_methods':[]}
+        for form in form_list: 
+            if isinstance(form,forms.WaterQualityForm):
+                form_data['cat_methods'].append(form.clean_data())    
+                continue
+            form_data.update(form.cleaned_data)
+        adapter = models.StreamWatchODM2Adapter.from_dict(form_data)
+
+        return redirect(reverse('streamwatches', kwargs={self.slug_field: self.kwargs[self.slug_field]}))
+
+
+class UpdateView(CreateView):
+
+    PRIMARY_KEY_FIELD = 'action_id'
+
+    def get(self, request, *args, **kwargs):
+        if self.PRIMARY_KEY_FIELD in kwargs.keys():
+            action_id = int(kwargs[self.PRIMARY_KEY_FIELD])
+            adapter = models.StreamWatchODM2Adapter.from_action_id(action_id)
+            form_data = adapter.to_dict()
+            self.initial_dict['setup'] = form_data
+            self.initial_dict['conditions'] = form_data
+            self.initial_dict['simplewaterquality'] = form_data
+            self.initial_dict['simplehabitat'] = form_data
+        
+        return super().get(request, *args, **kwargs)
+
+    def get_context_data(self, form:django.forms.Form, **kwargs):
+        context_data = super().get_context_data(form, **kwargs)
+        if self.PRIMARY_KEY_FIELD in self.kwargs:
+            context_data[self.PRIMARY_KEY_FIELD] = self.kwargs[self.PRIMARY_KEY_FIELD]
+        return context_data
+
+    def done(self, form_list:List[django.forms.Form], **kwargs):
+        sampling_feature_id = models.sampling_feature_code_to_id(self.kwargs[self.slug_field])
+        form_data = {'sampling_feature_id':sampling_feature_id, 'cat_methods':[]}
+        for form in form_list: 
+            if isinstance(form,forms.WaterQualityForm):
+                form_data['cat_methods'].append(form.clean_data())    
+                continue
+            form_data.update(form.cleaned_data)
+        
+        action_id = int(self.kwargs[self.PRIMARY_KEY_FIELD])
+        adapter = models.StreamWatchODM2Adapter.from_action_id(action_id)
+        adapter.update_from_dict(form_data)
+
+        return redirect(reverse('streamwatches', kwargs={self.slug_field: self.kwargs[self.slug_field]}))
+
+    
+class DetailView(django.views.generic.detail.DetailView):
+    template_name = 'streamwatch/streamwatch_detail.html'
+    slug_field = 'sampling_feature_code'
+    context_object_name ='streamwatch'
+
+    def get_object(self, queryset=None):
+        action_id = int(self.kwargs['pk'])
+        adapter = models.StreamWatchODM2Adapter.from_action_id(action_id)
+        data = adapter.to_dict(string_format=True)
+        return data
+    
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        registration = SiteRegistration.objects.get(sampling_feature_code=self.kwargs[self.slug_field])
+        user = self.request.user
+        context['can_administer_site'] = user.is_authenticated and user.can_administer_site(registration)
+        context['is_site_owner'] = self.request.user == registration.django_user
+        context['sampling_feature_code'] = self.kwargs[self.slug_field]
+        context['action_id'] = int(self.kwargs['pk'])
+        return context
+        
+
+class DeleteView(LoginRequiredMixin, django.views.generic.edit.DeleteView):
+    slug_field = 'sampling_feature_code'
+
+    def post(self, request, *args, **kwargs):
+        feature_action_id = request.POST.get('id')
+        models.delete_streamwatch_assessment(feature_action_id) 
+        return HttpResponse('Assessment deleted successfully', status=202)
+
+
+parameter_formset=django.forms.formset_factory(forms.WaterQualityParametersForm, extra=4)
+class StreamWatchCreateMeasurementView(django.views.generic.edit.FormView):
+    form_class = forms.WaterQualityForm
+    template_name = 'streamwatch/streamwatch_sensor.html'
+    slug_field = 'sampling_feature_code'
+    object = None
+    
+    def form_invalid(self, measurement_form, parameter_forms):
+        context = self.get_context_data(form=measurement_form, parameter_forms=parameter_forms)
+        return self.render_to_response(context)
+    
+    def get_context_data(self, **kwargs):
+            # if 'leafpack_form' is in kwargs, that means self.form_invalid was most likely called due to a failed POST request
+        if 'form' in kwargs:
+            self.object = kwargs['form']
+
+        context = super(StreamWatchCreateMeasurementView, self).get_context_data(**kwargs)
+
+        context[self.slug_field] = self.kwargs[self.slug_field]
+
+        if self.object is None:
+            site_registration = SiteRegistration.objects.get(sampling_feature_code=self.kwargs[self.slug_field])
+            context['form'] = forms.WaterQualityForm(initial={'site_registration': site_registration}, prefix='meas')
+            context['parameter_forms'] = parameter_formset(prefix ='para')
+
+        return context
+    
+    def post(self, request, *args, **kwargs):
+            
+        # to do: implement save current streamWatch assessment
+        
+        form = forms.WaterQualityForm(request.POST, prefix='meas')
+        parameter_forms = parameter_formset(request.POST, prefix='para')
+        if form.is_valid() and parameter_forms.is_valid():
+            # process the data …
+            #leafpack = self.get_object()
+            #leafpack.save()
+
+            
+            return redirect(reverse('streamwatches', kwargs={self.slug_field: self.kwargs[self.slug_field]}))
+        else:
+            
+            return self.form_invalid(form, parameter_forms)
+
+
+def download_StreamWatch_csv(request, sampling_feature_code, pk):
+    """
+    Download handler that uses csv_writer.py to parse out a StreamWatch assessment into a csv file.
+
+    :param request: the request object
+    :param sampling_feature_code: the first URL parameter
+    :param pk: the second URL parameter and id of the leafpack experiement to download 
+    """
+    DEFAULT_DASH_LENGTH = 20
+    HYPERLINK_BASE_URL = 'https://monitormywatershed.org'
+
+    action_id = int(pk)
+    form_data = models.StreamWatchODM2Adapter.from_action_id(action_id)
+    
+    site = SiteRegistration.objects.get(sampling_feature_code=sampling_feature_code)
+    
+    filename = '{}_{}_{:03d}.csv'.format(sampling_feature_code,
+                                         datetime.datetime.now(), action_id)
+    response = HttpResponse(content_type='text/csv')
+    response['Content-Disposition'] = 'attachment; filename="{}"'.format(filename)
+
+    writer = csv.writer(response)
+    
+    # Write file header
+    writer.writerow(['StreamWatch Survey Details'])
+    writer.writerow(['These data were copied to HydroShare from the WikiWatershed Data Sharing Portal.'])
+    writer.writerow(['-' * DEFAULT_DASH_LENGTH])
+    writer.writerow([])
+
+    # write site registration information
+    #writer.make_header(['Site Information'])
+    writer.writerow(['Site Information'])
+    writer.writerow(['-' * DEFAULT_DASH_LENGTH])
+
+    writer.writerow(['Site Code', site.sampling_feature_code])
+    writer.writerow(['Site Name', site.sampling_feature_name])
+    writer.writerow(['Site Description', site.sampling_feature.sampling_feature_description])
+    writer.writerow(['Latitude', site.latitude])
+    writer.writerow(['Longitude', site.longitude])
+    writer.writerow(['Elevation (m)', site.elevation_m])
+    writer.writerow(['Vertical Datum', site.sampling_feature.elevation_datum])
+    writer.writerow(['Site Type', site.site_type])
+
+    writer.writerow([])
+
+    # write streamwatch data
+    # todo: separate into different activities:
+    writer.writerow(['StreamWatch Survey Details'])
+    writer.writerow(['-' * DEFAULT_DASH_LENGTH])
+
+    for key, value in form_data.items():
+        writer.writerow([key.title(), value])
+    
+    writer.writerow(['URL', '{0}/sites/{1}/streamwatch/{2}'.format(HYPERLINK_BASE_URL,
+                                                     sampling_feature_code,
+                                                     action_id)])
+
+    return response