diff --git a/aquaculture/Finfish_Harvest.dbf b/aquaculture/Finfish_Harvest.dbf
index 80be1a6b655795e873086e3cf9bc926e181b56bd..cbfa16d4f3cc734a9ce7dd82dd60934d5c8b68b4 100644
Binary files a/aquaculture/Finfish_Harvest.dbf and b/aquaculture/Finfish_Harvest.dbf differ
diff --git a/aquaculture/Finfish_Harvest.prj b/aquaculture/Finfish_Harvest.prj
index 8ac4d0181fe43c116939ab6eaf9070ffc3387f0e..2d6fce0831c9fa6ab31c1bc58c23475b813df75d 100644
--- a/aquaculture/Finfish_Harvest.prj
+++ b/aquaculture/Finfish_Harvest.prj
@@ -1 +1 @@
-PROJCS["WGS_1984_UTM_Zone_10N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-123.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
+PROJCS["WGS_1984_UTM_Zone_10N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-123],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]
\ No newline at end of file
diff --git a/aquaculture/Finfish_Harvest.shp b/aquaculture/Finfish_Harvest.shp
index 5551abe7653d62f2b9aa473173a91704d4a3faf2..97fae1cf446b8bc24136d90ed99bc6a9f4852dcb 100644
Binary files a/aquaculture/Finfish_Harvest.shp and b/aquaculture/Finfish_Harvest.shp differ
diff --git a/aquaculture/Finfish_Harvest.shx b/aquaculture/Finfish_Harvest.shx
index 614e5ae67631511cbe296e3d7a5516693c61ecc1..f6b2f0fd1cb2a1ea9fc05e75a8b38e6dc43cfdcd 100644
Binary files a/aquaculture/Finfish_Harvest.shx and b/aquaculture/Finfish_Harvest.shx differ
diff --git a/aquaculture/Finfish_Harvest_no_valuation.dbf b/aquaculture/Finfish_Harvest_no_valuation.dbf
index d89701496b9615e77b800564b495130f59b3fe2d..c21312dc8ef8cebd6981fdc71baa01aa0d7ab5f5 100644
Binary files a/aquaculture/Finfish_Harvest_no_valuation.dbf and b/aquaculture/Finfish_Harvest_no_valuation.dbf differ
diff --git a/aquaculture/Finfish_Harvest_no_valuation.prj b/aquaculture/Finfish_Harvest_no_valuation.prj
index 8ac4d0181fe43c116939ab6eaf9070ffc3387f0e..2d6fce0831c9fa6ab31c1bc58c23475b813df75d 100644
--- a/aquaculture/Finfish_Harvest_no_valuation.prj
+++ b/aquaculture/Finfish_Harvest_no_valuation.prj
@@ -1 +1 @@
-PROJCS["WGS_1984_UTM_Zone_10N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-123.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
+PROJCS["WGS_1984_UTM_Zone_10N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-123],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]
\ No newline at end of file
diff --git a/aquaculture/Finfish_Harvest_no_valuation.shp b/aquaculture/Finfish_Harvest_no_valuation.shp
index 5551abe7653d62f2b9aa473173a91704d4a3faf2..97fae1cf446b8bc24136d90ed99bc6a9f4852dcb 100644
Binary files a/aquaculture/Finfish_Harvest_no_valuation.shp and b/aquaculture/Finfish_Harvest_no_valuation.shp differ
diff --git a/aquaculture/Finfish_Harvest_no_valuation.shx b/aquaculture/Finfish_Harvest_no_valuation.shx
index 614e5ae67631511cbe296e3d7a5516693c61ecc1..f6b2f0fd1cb2a1ea9fc05e75a8b38e6dc43cfdcd 100644
Binary files a/aquaculture/Finfish_Harvest_no_valuation.shx and b/aquaculture/Finfish_Harvest_no_valuation.shx differ
diff --git a/aquaculture/Input/Farm_Operations.csv b/aquaculture/Input/Farm_Operations.csv
new file mode 100644
index 0000000000000000000000000000000000000000..97179a98e4f75dce429c5b634cfc41ac9c25d329
--- /dev/null
+++ b/aquaculture/Input/Farm_Operations.csv
@@ -0,0 +1,11 @@
+General Operations Parameters (applies to all farms);;;Instructions:;;;,,,
+"Fraction of fish remaining after processing;85%;;""When necessary"," modify values for farm operations and/or add new farms (beginning with row """"32"""").  Do not", however," modify the location of cells in this template."";;;Key:"
+Natural mortality rate on the farm (daily);0.000137;;;;;remove?,,,
+Duration of simulation (years);5;;;;;,,,
+;;;;;;,,,
+;;;;;;,,,
+;;;;;;,,,
+Farm-Specific Operations Parameters;;;;;;,,,
+Farm #:;weight of fish at start (kg);target weight of fish at harvest (kg);number of fish in farm;start day for growing;Length of Fallowing period;,,,
+1;0.06;5.4;600000;60;0;,,,
+2;0.06;5.4;590000;50;90;,,,
diff --git a/aquaculture/Input/Finfish_Netpens.dbf b/aquaculture/Input/Finfish_Netpens.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..37782b159ec9be150933c296de3d0b128c4392ae
Binary files /dev/null and b/aquaculture/Input/Finfish_Netpens.dbf differ
diff --git a/aquaculture/Input/Finfish_Netpens.prj b/aquaculture/Input/Finfish_Netpens.prj
new file mode 100644
index 0000000000000000000000000000000000000000..2d6fce0831c9fa6ab31c1bc58c23475b813df75d
--- /dev/null
+++ b/aquaculture/Input/Finfish_Netpens.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_10N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-123],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]
\ No newline at end of file
diff --git a/aquaculture/Input/Finfish_Netpens.shp b/aquaculture/Input/Finfish_Netpens.shp
new file mode 100644
index 0000000000000000000000000000000000000000..97fae1cf446b8bc24136d90ed99bc6a9f4852dcb
Binary files /dev/null and b/aquaculture/Input/Finfish_Netpens.shp differ
diff --git a/aquaculture/Input/Finfish_Netpens.shx b/aquaculture/Input/Finfish_Netpens.shx
new file mode 100644
index 0000000000000000000000000000000000000000..f6b2f0fd1cb2a1ea9fc05e75a8b38e6dc43cfdcd
Binary files /dev/null and b/aquaculture/Input/Finfish_Netpens.shx differ
diff --git a/aquaculture/Input/Temp_Daily.csv b/aquaculture/Input/Temp_Daily.csv
new file mode 100644
index 0000000000000000000000000000000000000000..d6f866dc44f6edccd758f174eb2d12fbaf24b5c8
--- /dev/null
+++ b/aquaculture/Input/Temp_Daily.csv
@@ -0,0 +1,370 @@
+,Instructions:,,,,,,
+,"1.  Ensure that the below numbers in row 5 (highlighted in yellow) correspond to integer values underneath the user-specified ""Farm Identifier Name"" in the Finfish Farm Location GIS shapefile (model input #2).  The below numbers must be unique, consecutive, positive integers, starting with a value of 1 in cell ""C,5"".",,,,,,
+,"2. When necessary, modify daily temperature values for each farm and/or add new farms (beginning with column ""Y"").  Do not, however, modify the location of cells in this template.",,,,,,
+,,,,,,,Farm #:
+Day #,Day/Month,1,2,,,,
+1,1-Jan,8.447,8.947,,,,
+2,2-Jan,8.406,8.906,,,,
+3,3-Jan,8.366,8.866,,,,
+4,4-Jan,8.326,8.826,,,,
+5,5-Jan,8.288,8.788,,,,
+6,6-Jan,8.25,8.75,,,,
+7,7-Jan,8.213,8.713,,,,
+8,8-Jan,8.177,8.677,,,,
+9,9-Jan,8.142,8.642,,,,
+10,10-Jan,8.108,8.608,,,,
+11,11-Jan,8.074,8.574,,,,
+12,12-Jan,8.042,8.542,,,,
+13,13-Jan,8.01,8.51,,,,
+14,14-Jan,7.979,8.479,,,,
+15,15-Jan,7.949,8.449,,,,
+16,16-Jan,7.92,8.42,,,,
+17,17-Jan,7.892,8.392,,,,
+18,18-Jan,7.865,8.365,,,,
+19,19-Jan,7.838,8.338,,,,
+20,20-Jan,7.813,8.313,,,,
+21,21-Jan,7.788,8.288,,,,
+22,22-Jan,7.765,8.265,,,,
+23,23-Jan,7.742,8.242,,,,
+24,24-Jan,7.721,8.221,,,,
+25,25-Jan,7.7,8.2,,,,
+26,26-Jan,7.681,8.181,,,,
+27,27-Jan,7.662,8.162,,,,
+28,28-Jan,7.644,8.144,,,,
+29,29-Jan,7.628,8.128,,,,
+30,30-Jan,7.612,8.112,,,,
+31,31-Jan,7.598,8.098,,,,
+32,1-Feb,7.584,8.084,,,,
+33,2-Feb,7.571,8.071,,,,
+34,3-Feb,7.56,8.06,,,,
+35,4-Feb,7.549,8.049,,,,
+36,5-Feb,7.54,8.04,,,,
+37,6-Feb,7.531,8.031,,,,
+38,7-Feb,7.524,8.024,,,,
+39,8-Feb,7.517,8.017,,,,
+40,9-Feb,7.512,8.012,,,,
+41,10-Feb,7.507,8.007,,,,
+42,11-Feb,7.504,8.004,,,,
+43,12-Feb,7.502,8.002,,,,
+44,13-Feb,7.5,8,,,,
+45,14-Feb,7.5,8,,,,
+46,15-Feb,7.501,8.001,,,,
+47,16-Feb,7.503,8.003,,,,
+48,17-Feb,7.505,8.005,,,,
+49,18-Feb,7.509,8.009,,,,
+50,19-Feb,7.514,8.014,,,,
+51,20-Feb,7.52,8.02,,,,
+52,21-Feb,7.527,8.027,,,,
+53,22-Feb,7.535,8.035,,,,
+54,23-Feb,7.544,8.044,,,,
+55,24-Feb,7.554,8.054,,,,
+56,25-Feb,7.565,8.065,,,,
+57,26-Feb,7.578,8.078,,,,
+58,27-Feb,7.591,8.091,,,,
+59,28-Feb,7.605,8.105,,,,
+60,1-Mar,7.62,8.12,,,,
+61,2-Mar,7.636,8.136,,,,
+62,3-Mar,7.653,8.153,,,,
+63,4-Mar,7.671,8.171,,,,
+64,5-Mar,7.69,8.19,,,,
+65,6-Mar,7.711,8.211,,,,
+66,7-Mar,7.732,8.232,,,,
+67,8-Mar,7.754,8.254,,,,
+68,9-Mar,7.777,8.277,,,,
+69,10-Mar,7.801,8.301,,,,
+70,11-Mar,7.825,8.325,,,,
+71,12-Mar,7.851,8.351,,,,
+72,13-Mar,7.878,8.378,,,,
+73,14-Mar,7.906,8.406,,,,
+74,15-Mar,7.934,8.434,,,,
+75,16-Mar,7.964,8.464,,,,
+76,17-Mar,7.994,8.494,,,,
+77,18-Mar,8.026,8.526,,,,
+78,19-Mar,8.058,8.558,,,,
+79,20-Mar,8.091,8.591,,,,
+80,21-Mar,8.125,8.625,,,,
+81,22-Mar,8.16,8.66,,,,
+82,23-Mar,8.195,8.695,,,,
+83,24-Mar,8.232,8.732,,,,
+84,25-Mar,8.269,8.769,,,,
+85,26-Mar,8.307,8.807,,,,
+86,27-Mar,8.346,8.846,,,,
+87,28-Mar,8.386,8.886,,,,
+88,29-Mar,8.426,8.926,,,,
+89,30-Mar,8.467,8.967,,,,
+90,31-Mar,8.509,9.009,,,,
+91,1-Apr,8.552,9.052,,,,
+92,2-Apr,8.595,9.095,,,,
+93,3-Apr,8.639,9.139,,,,
+94,4-Apr,8.684,9.184,,,,
+95,5-Apr,8.73,9.23,,,,
+96,6-Apr,8.776,9.276,,,,
+97,7-Apr,8.823,9.323,,,,
+98,8-Apr,8.87,9.37,,,,
+99,9-Apr,8.918,9.418,,,,
+100,10-Apr,8.967,9.467,,,,
+101,11-Apr,9.017,9.517,,,,
+102,12-Apr,9.066,9.566,,,,
+103,13-Apr,9.117,9.617,,,,
+104,14-Apr,9.168,9.668,,,,
+105,15-Apr,9.22,9.72,,,,
+106,16-Apr,9.272,9.772,,,,
+107,17-Apr,9.324,9.824,,,,
+108,18-Apr,9.378,9.878,,,,
+109,19-Apr,9.431,9.931,,,,
+110,20-Apr,9.485,9.985,,,,
+111,21-Apr,9.54,10.04,,,,
+112,22-Apr,9.595,10.095,,,,
+113,23-Apr,9.65,10.15,,,,
+114,24-Apr,9.706,10.206,,,,
+115,25-Apr,9.762,10.262,,,,
+116,26-Apr,9.819,10.319,,,,
+117,27-Apr,9.876,10.376,,,,
+118,28-Apr,9.933,10.433,,,,
+119,29-Apr,9.99,10.49,,,,
+120,30-Apr,10.048,10.548,,,,
+121,1-May,10.106,10.606,,,,
+122,2-May,10.165,10.665,,,,
+123,3-May,10.223,10.723,,,,
+124,4-May,10.282,10.782,,,,
+125,5-May,10.341,10.841,,,,
+126,6-May,10.4,10.9,,,,
+127,7-May,10.46,10.96,,,,
+128,8-May,10.52,11.02,,,,
+129,9-May,10.579,11.079,,,,
+130,10-May,10.639,11.139,,,,
+131,11-May,10.699,11.199,,,,
+132,12-May,10.759,11.259,,,,
+133,13-May,10.819,11.319,,,,
+134,14-May,10.88,11.38,,,,
+135,15-May,10.94,11.44,,,,
+136,16-May,11,11.5,,,,
+137,17-May,11.06,11.56,,,,
+138,18-May,11.12,11.62,,,,
+139,19-May,11.181,11.681,,,,
+140,20-May,11.241,11.741,,,,
+141,21-May,11.301,11.801,,,,
+142,22-May,11.361,11.861,,,,
+143,23-May,11.421,11.921,,,,
+144,24-May,11.48,11.98,,,,
+145,25-May,11.54,12.04,,,,
+146,26-May,11.6,12.1,,,,
+147,27-May,11.659,12.159,,,,
+148,28-May,11.718,12.218,,,,
+149,29-May,11.777,12.277,,,,
+150,30-May,11.835,12.335,,,,
+151,31-May,11.894,12.394,,,,
+152,1-Jun,11.952,12.452,,,,
+153,2-Jun,12.01,12.51,,,,
+154,3-Jun,12.067,12.567,,,,
+155,4-Jun,12.124,12.624,,,,
+156,5-Jun,12.181,12.681,,,,
+157,6-Jun,12.238,12.738,,,,
+158,7-Jun,12.294,12.794,,,,
+159,8-Jun,12.35,12.85,,,,
+160,9-Jun,12.405,12.905,,,,
+161,10-Jun,12.46,12.96,,,,
+162,11-Jun,12.515,13.015,,,,
+163,12-Jun,12.569,13.069,,,,
+164,13-Jun,12.622,13.122,,,,
+165,14-Jun,12.676,13.176,,,,
+166,15-Jun,12.728,13.228,,,,
+167,16-Jun,12.78,13.28,,,,
+168,17-Jun,12.832,13.332,,,,
+169,18-Jun,12.883,13.383,,,,
+170,19-Jun,12.934,13.434,,,,
+171,20-Jun,12.983,13.483,,,,
+172,21-Jun,13.033,13.533,,,,
+173,22-Jun,13.082,13.582,,,,
+174,23-Jun,13.13,13.63,,,,
+175,24-Jun,13.177,13.677,,,,
+176,25-Jun,13.224,13.724,,,,
+177,26-Jun,13.27,13.77,,,,
+178,27-Jun,13.316,13.816,,,,
+179,28-Jun,13.361,13.861,,,,
+180,29-Jun,13.405,13.905,,,,
+181,30-Jun,13.448,13.948,,,,
+182,1-Jul,13.491,13.991,,,,
+183,2-Jul,13.533,14.033,,,,
+184,3-Jul,13.574,14.074,,,,
+185,4-Jul,13.614,14.114,,,,
+186,5-Jul,13.654,14.154,,,,
+187,6-Jul,13.693,14.193,,,,
+188,7-Jul,13.731,14.231,,,,
+189,8-Jul,13.768,14.268,,,,
+190,9-Jul,13.805,14.305,,,,
+191,10-Jul,13.84,14.34,,,,
+192,11-Jul,13.875,14.375,,,,
+193,12-Jul,13.909,14.409,,,,
+194,13-Jul,13.942,14.442,,,,
+195,14-Jul,13.974,14.474,,,,
+196,15-Jul,14.006,14.506,,,,
+197,16-Jul,14.036,14.536,,,,
+198,17-Jul,14.066,14.566,,,,
+199,18-Jul,14.094,14.594,,,,
+200,19-Jul,14.122,14.622,,,,
+201,20-Jul,14.149,14.649,,,,
+202,21-Jul,14.175,14.675,,,,
+203,22-Jul,14.199,14.699,,,,
+204,23-Jul,14.223,14.723,,,,
+205,24-Jul,14.246,14.746,,,,
+206,25-Jul,14.268,14.768,,,,
+207,26-Jul,14.289,14.789,,,,
+208,27-Jul,14.31,14.81,,,,
+209,28-Jul,14.329,14.829,,,,
+210,29-Jul,14.347,14.847,,,,
+211,30-Jul,14.364,14.864,,,,
+212,31-Jul,14.38,14.88,,,,
+213,1-Aug,14.395,14.895,,,,
+214,2-Aug,14.409,14.909,,,,
+215,3-Aug,14.422,14.922,,,,
+216,4-Aug,14.435,14.935,,,,
+217,5-Aug,14.446,14.946,,,,
+218,6-Aug,14.456,14.956,,,,
+219,7-Aug,14.465,14.965,,,,
+220,8-Aug,14.473,14.973,,,,
+221,9-Aug,14.48,14.98,,,,
+222,10-Aug,14.486,14.986,,,,
+223,11-Aug,14.491,14.991,,,,
+224,12-Aug,14.495,14.995,,,,
+225,13-Aug,14.497,14.997,,,,
+226,14-Aug,14.499,14.999,,,,
+227,15-Aug,14.5,15,,,,
+228,16-Aug,14.5,15,,,,
+229,17-Aug,14.498,14.998,,,,
+230,18-Aug,14.496,14.996,,,,
+231,19-Aug,14.493,14.993,,,,
+232,20-Aug,14.488,14.988,,,,
+233,21-Aug,14.483,14.983,,,,
+234,22-Aug,14.476,14.976,,,,
+235,23-Aug,14.469,14.969,,,,
+236,24-Aug,14.46,14.96,,,,
+237,25-Aug,14.451,14.951,,,,
+238,26-Aug,14.44,14.94,,,,
+239,27-Aug,14.429,14.929,,,,
+240,28-Aug,14.416,14.916,,,,
+241,29-Aug,14.402,14.902,,,,
+242,30-Aug,14.388,14.888,,,,
+243,31-Aug,14.372,14.872,,,,
+244,1-Sep,14.356,14.856,,,,
+245,2-Sep,14.338,14.838,,,,
+246,3-Sep,14.319,14.819,,,,
+247,4-Sep,14.3,14.8,,,,
+248,5-Sep,14.279,14.779,,,,
+249,6-Sep,14.258,14.758,,,,
+250,7-Sep,14.235,14.735,,,,
+251,8-Sep,14.212,14.712,,,,
+252,9-Sep,14.187,14.687,,,,
+253,10-Sep,14.162,14.662,,,,
+254,11-Sep,14.135,14.635,,,,
+255,12-Sep,14.108,14.608,,,,
+256,13-Sep,14.08,14.58,,,,
+257,14-Sep,14.051,14.551,,,,
+258,15-Sep,14.021,14.521,,,,
+259,16-Sep,13.99,14.49,,,,
+260,17-Sep,13.958,14.458,,,,
+261,18-Sep,13.926,14.426,,,,
+262,19-Sep,13.892,14.392,,,,
+263,20-Sep,13.858,14.358,,,,
+264,21-Sep,13.823,14.323,,,,
+265,22-Sep,13.787,14.287,,,,
+266,23-Sep,13.75,14.25,,,,
+267,24-Sep,13.712,14.212,,,,
+268,25-Sep,13.674,14.174,,,,
+269,26-Sep,13.634,14.134,,,,
+270,27-Sep,13.594,14.094,,,,
+271,28-Sep,13.553,14.053,,,,
+272,29-Sep,13.512,14.012,,,,
+273,30-Sep,13.47,13.97,,,,
+274,1-Oct,13.426,13.926,,,,
+275,2-Oct,13.383,13.883,,,,
+276,3-Oct,13.338,13.838,,,,
+277,4-Oct,13.293,13.793,,,,
+278,5-Oct,13.247,13.747,,,,
+279,6-Oct,13.201,13.701,,,,
+280,7-Oct,13.153,13.653,,,,
+281,8-Oct,13.106,13.606,,,,
+282,9-Oct,13.057,13.557,,,,
+283,10-Oct,13.008,13.508,,,,
+284,11-Oct,12.959,13.459,,,,
+285,12-Oct,12.908,13.408,,,,
+286,13-Oct,12.858,13.358,,,,
+287,14-Oct,12.806,13.306,,,,
+288,15-Oct,12.754,13.254,,,,
+289,16-Oct,12.702,13.202,,,,
+290,17-Oct,12.649,13.149,,,,
+291,18-Oct,12.596,13.096,,,,
+292,19-Oct,12.542,13.042,,,,
+293,20-Oct,12.488,12.988,,,,
+294,21-Oct,12.433,12.933,,,,
+295,22-Oct,12.378,12.878,,,,
+296,23-Oct,12.322,12.822,,,,
+297,24-Oct,12.266,12.766,,,,
+298,25-Oct,12.21,12.71,,,,
+299,26-Oct,12.153,12.653,,,,
+300,27-Oct,12.096,12.596,,,,
+301,28-Oct,12.038,12.538,,,,
+302,29-Oct,11.981,12.481,,,,
+303,30-Oct,11.923,12.423,,,,
+304,31-Oct,11.865,12.365,,,,
+305,1-Nov,11.806,12.306,,,,
+306,2-Nov,11.747,12.247,,,,
+307,3-Nov,11.688,12.188,,,,
+308,4-Nov,11.629,12.129,,,,
+309,5-Nov,11.57,12.07,,,,
+310,6-Nov,11.51,12.01,,,,
+311,7-Nov,11.451,11.951,,,,
+312,8-Nov,11.391,11.891,,,,
+313,9-Nov,11.331,11.831,,,,
+314,10-Nov,11.271,11.771,,,,
+315,11-Nov,11.211,11.711,,,,
+316,12-Nov,11.151,11.651,,,,
+317,13-Nov,11.09,11.59,,,,
+318,14-Nov,11.03,11.53,,,,
+319,15-Nov,10.97,11.47,,,,
+320,16-Nov,10.91,11.41,,,,
+321,17-Nov,10.849,11.349,,,,
+322,18-Nov,10.789,11.289,,,,
+323,19-Nov,10.729,11.229,,,,
+324,20-Nov,10.669,11.169,,,,
+325,21-Nov,10.609,11.109,,,,
+326,22-Nov,10.549,11.049,,,,
+327,23-Nov,10.49,10.99,,,,
+328,24-Nov,10.43,10.93,,,,
+329,25-Nov,10.371,10.871,,,,
+330,26-Nov,10.312,10.812,,,,
+331,27-Nov,10.253,10.753,,,,
+332,28-Nov,10.194,10.694,,,,
+333,29-Nov,10.135,10.635,,,,
+334,30-Nov,10.077,10.577,,,,
+335,1-Dec,10.019,10.519,,,,
+336,2-Dec,9.962,10.462,,,,
+337,3-Dec,9.904,10.404,,,,
+338,4-Dec,9.847,10.347,,,,
+339,5-Dec,9.79,10.29,,,,
+340,6-Dec,9.734,10.234,,,,
+341,7-Dec,9.678,10.178,,,,
+342,8-Dec,9.622,10.122,,,,
+343,9-Dec,9.567,10.067,,,,
+344,10-Dec,9.512,10.012,,,,
+345,11-Dec,9.458,9.958,,,,
+346,12-Dec,9.404,9.904,,,,
+347,13-Dec,9.351,9.851,,,,
+348,14-Dec,9.298,9.798,,,,
+349,15-Dec,9.246,9.746,,,,
+350,16-Dec,9.194,9.694,,,,
+351,17-Dec,9.142,9.642,,,,
+352,18-Dec,9.092,9.592,,,,
+353,19-Dec,9.041,9.541,,,,
+354,20-Dec,8.992,9.492,,,,
+355,21-Dec,8.943,9.443,,,,
+356,22-Dec,8.894,9.394,,,,
+357,23-Dec,8.847,9.347,,,,
+358,24-Dec,8.799,9.299,,,,
+359,25-Dec,8.753,9.253,,,,
+360,26-Dec,8.707,9.207,,,,
+361,27-Dec,8.662,9.162,,,,
+362,28-Dec,8.617,9.117,,,,
+363,29-Dec,8.574,9.074,,,,
+364,30-Dec,8.53,9.03,,,,
+365,31-Dec,8.488,8.988,,,,
diff --git a/aquaculture/expected_file_list.txt b/aquaculture/expected_file_list.txt
index e55fa06f09389863096951d824f0298570ff57ca..6fd7273463233e44f5afa460e7dabc72808cc582 100644
--- a/aquaculture/expected_file_list.txt
+++ b/aquaculture/expected_file_list.txt
@@ -1,72 +1,13 @@
-output\Finfish_Harvest.shx
 output\Finfish_Harvest.dbf
 output\Finfish_Harvest.prj
 output\Finfish_Harvest.shp
-output\images\farm_22_cycles.png
-output\images\farm_22_value.png
-output\images\farm_22_weight.png
-output\images\total_value.png
-output\images\total_weight.png
+output\Finfish_Harvest.shx
+output\Harvest_Results.html
 output\images\farm_1_cycles.png
 output\images\farm_1_value.png
 output\images\farm_1_weight.png
 output\images\farm_2_cycles.png
 output\images\farm_2_value.png
 output\images\farm_2_weight.png
-output\images\farm_3_cycles.png
-output\images\farm_3_value.png
-output\images\farm_3_weight.png
-output\images\farm_4_cycles.png
-output\images\farm_4_value.png
-output\images\farm_4_weight.png
-output\images\farm_5_cycles.png
-output\images\farm_5_value.png
-output\images\farm_5_weight.png
-output\images\farm_6_cycles.png
-output\images\farm_6_value.png
-output\images\farm_6_weight.png
-output\images\farm_7_cycles.png
-output\images\farm_7_value.png
-output\images\farm_7_weight.png
-output\images\farm_8_cycles.png
-output\images\farm_8_value.png
-output\images\farm_8_weight.png
-output\images\farm_9_cycles.png
-output\images\farm_9_value.png
-output\images\farm_9_weight.png
-output\images\farm_10_cycles.png
-output\images\farm_10_value.png
-output\images\farm_10_weight.png
-output\images\farm_11_cycles.png
-output\images\farm_11_value.png
-output\images\farm_11_weight.png
-output\images\farm_12_cycles.png
-output\images\farm_12_value.png
-output\images\farm_12_weight.png
-output\images\farm_13_cycles.png
-output\images\farm_13_value.png
-output\images\farm_13_weight.png
-output\images\farm_14_cycles.png
-output\images\farm_14_value.png
-output\images\farm_14_weight.png
-output\images\farm_15_cycles.png
-output\images\farm_15_value.png
-output\images\farm_15_weight.png
-output\images\farm_16_cycles.png
-output\images\farm_16_value.png
-output\images\farm_16_weight.png
-output\images\farm_17_cycles.png
-output\images\farm_17_value.png
-output\images\farm_17_weight.png
-output\images\farm_18_cycles.png
-output\images\farm_18_value.png
-output\images\farm_18_weight.png
-output\images\farm_19_cycles.png
-output\images\farm_19_value.png
-output\images\farm_19_weight.png
-output\images\farm_20_cycles.png
-output\images\farm_20_value.png
-output\images\farm_20_weight.png
-output\images\farm_21_cycles.png
-output\images\farm_21_value.png
-output\images\farm_21_weight.png
+output\images\total_value.png
+output\images\total_weight.png
\ No newline at end of file
diff --git a/aquaculture/expected_file_list_no_valuation.txt b/aquaculture/expected_file_list_no_valuation.txt
index 8ad2d8567e344d0cda216e2b8151d310570cc9ab..a3278a977e934cf0ead99bf317ba39c9502b6ade 100644
--- a/aquaculture/expected_file_list_no_valuation.txt
+++ b/aquaculture/expected_file_list_no_valuation.txt
@@ -1,49 +1,10 @@
-output\Finfish_Harvest.shx
 output\Finfish_Harvest.dbf
 output\Finfish_Harvest.prj
 output\Finfish_Harvest.shp
-output\images\farm_22_cycles.png
-output\images\farm_22_weight.png
-output\images\total_weight.png
+output\Finfish_Harvest.shx
+output\Harvest_Results.html
 output\images\farm_1_cycles.png
 output\images\farm_1_weight.png
 output\images\farm_2_cycles.png
 output\images\farm_2_weight.png
-output\images\farm_3_cycles.png
-output\images\farm_3_weight.png
-output\images\farm_4_cycles.png
-output\images\farm_4_weight.png
-output\images\farm_5_cycles.png
-output\images\farm_5_weight.png
-output\images\farm_6_cycles.png
-output\images\farm_6_weight.png
-output\images\farm_7_cycles.png
-output\images\farm_7_weight.png
-output\images\farm_8_cycles.png
-output\images\farm_8_weight.png
-output\images\farm_9_cycles.png
-output\images\farm_9_weight.png
-output\images\farm_10_cycles.png
-output\images\farm_10_weight.png
-output\images\farm_11_cycles.png
-output\images\farm_11_weight.png
-output\images\farm_12_cycles.png
-output\images\farm_12_weight.png
-output\images\farm_13_cycles.png
-output\images\farm_13_weight.png
-output\images\farm_14_cycles.png
-output\images\farm_14_weight.png
-output\images\farm_15_cycles.png
-output\images\farm_15_weight.png
-output\images\farm_16_cycles.png
-output\images\farm_16_weight.png
-output\images\farm_17_cycles.png
-output\images\farm_17_weight.png
-output\images\farm_18_cycles.png
-output\images\farm_18_weight.png
-output\images\farm_19_cycles.png
-output\images\farm_19_weight.png
-output\images\farm_20_cycles.png
-output\images\farm_20_weight.png
-output\images\farm_21_cycles.png
-output\images\farm_21_weight.png
+output\images\total_weight.png
\ No newline at end of file
diff --git a/aquaculture/expected_file_list_simple.txt b/aquaculture/expected_file_list_simple.txt
deleted file mode 100644
index 04ff04d38bbb7c240f255f0155be2ce19e162629..0000000000000000000000000000000000000000
--- a/aquaculture/expected_file_list_simple.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-output\Finfish_Harvest.shx
-output\Finfish_Harvest.dbf
-output\Finfish_Harvest.prj
-output\Finfish_Harvest.shp