diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index b738420d..1f9d32c6 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -53,7 +53,7 @@ jobs:
             build_context: ./frontend
     steps:
       - uses: actions/checkout@v4
-      - uses: bcgov-nr/action-builder-ghcr@v2.0.1
+      - uses: bcgov-nr/action-builder-ghcr@v2.0.2
         with:
           package: ${{ matrix.package }}
           build_file: ${{ matrix.build_file }}
diff --git a/.gitignore b/.gitignore
index 09acafd2..e9734f58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,3 +109,6 @@ test-report.xml
 
 # Docker/Podman volumes
 .volumes
+
+# test files
+*.xlsx
diff --git a/HydRA Test Curves_20240115/RC_LCR2122.csv b/HydRA Test Curves_20240115/RC_LCR2122.csv
new file mode 100644
index 00000000..2917e17e
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_LCR2122.csv	
@@ -0,0 +1,20 @@
+datetime,discharge,stage,uncertainty,comments
+2021-11-24 10:27,0.9085,0.492,8,"23 panels, max 9.2%"
+2021-12-07 11:15,1.751439049,0.501,3.11,
+2021-12-16 10:59,1.1704,0.457,8,"22 panels, max 7.4%"
+2022-01-14 11:05,4.891958877,0.73,2.67,
+2022-02-07 11:38,1.127406583,0.459,3.27,
+2022-03-23 10:16,2.319489087,0.55,2.65,
+2022-03-30 14:45,0.843988357,0.515,2.94,
+2022-04-22 13:56,0.569,0.397,,"20 panels, max 13.8%"
+2022-05-03 17:29,0.465,0.377,,"20 panels, max 13.6%"
+2022-05-18 14:37,0.981925337,0.437,3.23,
+2022-07-19 9:53,0.131,0.277,,"20 panels, max 14.3%"
+2022-07-19 10:09,0.1472,0.278,3,
+2022-08-04 9:54,0.152,0.283,,"20 panels, max 11.9%"
+2022-08-04 12:30,0.183566024,0.286,3.17,
+2022-08-31 11:51,0.111,0.263,,"20 panels, max 9.2%"
+2022-09-09 10:02,0.101913626,0.261,2.59,
+2022-10-20 8:40,0.0813,0.243,2.9,
+2022-12-12 10:55,1.672120912,0.4875,3.13,
+2022-12-12 11:02,1.631,0.485,2.7,
diff --git a/HydRA Test Curves_20240115/RC_Lizard.csv b/HydRA Test Curves_20240115/RC_Lizard.csv
new file mode 100644
index 00000000..4a2e6201
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_Lizard.csv	
@@ -0,0 +1,6 @@
+datetime,discharge,stage,uncertainty,comments
+2021-08-19 11:45,0.364,0.302,0.05,"old control, do not use MMT"
+2022-07-20 8:54,0.612,0.225,0.05,suggested PZF -0.150
+2022-07-27 15:27,0.482,0.193,0.05,
+2022-09-07 11:00,0.383,0.125,0.05,
+2022-10-18 11:33,0.201,0.097,0.05,
diff --git a/HydRA Test Curves_20240115/RC_cook1.csv b/HydRA Test Curves_20240115/RC_cook1.csv
new file mode 100644
index 00000000..49fc7fea
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_cook1.csv	
@@ -0,0 +1,20 @@
+datetime,discharge,stage,uncertainty,comments
+2023-07-25 10:50:08,0.024789663,9.0635,0.099,approx PZF 9.0
+2023-05-08 13:23:17,0.468793188,9.193,0.031,
+2023-04-18 12:45:02,1.0337748,9.263,0.042,
+2023-02-06 12:00:00,1.080884219,9.27,0.032,
+2022-08-18 10:15:00,0.028,9.037,0.049,
+2022-07-19 10:11:16,0.093839378,9.065,0.03,
+2022-07-19 10:45:00,0.088,9.065,0.033,
+2022-04-13 13:00:00,0.557,9.177,0.03,
+2022-03-09 11:00:00,0.406728145,9.16,0.03,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
diff --git a/HydRA Test Curves_20240115/RC_cook2.csv b/HydRA Test Curves_20240115/RC_cook2.csv
new file mode 100644
index 00000000..9525aeef
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_cook2.csv	
@@ -0,0 +1,10 @@
+datetime,discharge,stage,stage_raw,uncertainty,comments
+2023-07-25 10:50,0.024789663,0.3085,9.0635,0.099,approx PZF .245
+2023-05-08 13:23,0.468793188,0.438,9.193,0.031,
+2023-04-18 12:45,1.0337748,0.508,9.263,0.042,
+2023-02-06 12:00,1.080884219,0.515,9.27,0.032,
+2022-08-18 10:15,0.028,0.282,9.037,0.049,
+2022-07-19 10:11,0.093839378,0.31,9.065,0.03,
+2022-07-19 10:45,0.088,0.31,9.065,0.033,
+2022-04-13 13:00,0.557,0.422,9.177,0.03,
+2022-03-09 11:00,0.406728145,0.405,9.16,0.03,
diff --git a/HydRA Test Curves_20240115/RC_grand.csv b/HydRA Test Curves_20240115/RC_grand.csv
new file mode 100644
index 00000000..5caaf451
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_grand.csv	
@@ -0,0 +1,24 @@
+datetime,stage,discharge,Uncertainty,Comments
+2023-07-26 12:57:30,0.186,0.002772154,,"PZF 0.018 , BP @ 0.395M"
+2023-05-26 13:02:30,0.198,0.005309356,,minor debris
+2023-04-19 13:51:15,0.2965,0.039120759,6.8,section
+2023-03-03 15:42:40,0.442,0.161655436,3.7,submerged
+2023-02-12 15:15:00,0.368,0.066844777,3.683071598,section
+2022-11-04 13:00:00,0.24,0.016708148,8,
+2022-09-19 16:00:00,0.188,0.00292457,8,
+2022-08-17 10:00:00,0.19,0.003312321,5,
+2022-07-18 15:00:00,0.21,0.004,,
+2021-08-17 09:00:00,0.285,0.002114971,,debris
+2019-09-19 13:45:00,0.23,0.01125648,10,
+2019-07-29 11:15:00,0.196,0.003352529,10,
+2019-06-10 10:40:00,0.209,0.00646972,8,
+2018-06-05 12:00:00,0.218,0.007823333,8,
+2017-11-27 13:30:00,0.54,0.4602,3.6,
+2017-07-12 13:30:00,0.205,0.004951,8,
+2017-06-13 16:00:00,0.215,0.007517333,8,
+2014-12-19 11:30:00,0.498,0.2883,,submerged
+2014-02-17 13:00:00,0.658,1.063,8,submerged
+2013-10-03 12:00:00,0.318,0.0388,5,
+2013-06-25 09:30:00,0.247,0.0162,8,
+2012-10-11 15:00:00,0.203,0.00382,5,
+2012-09-12 13:00:00,0.198,0.002749,8,
diff --git a/HydRA Test Curves_20240115/RC_random.csv b/HydRA Test Curves_20240115/RC_random.csv
new file mode 100644
index 00000000..8d8e49e9
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_random.csv	
@@ -0,0 +1,22 @@
+date,time,DateTime,discharge,stage,uncertainty,comments
+2022-03-25,12:00:00,2022-03-25 12:00,2.796,0.759,0.004,
+2021-06-25,0:48:23,2021-06-25 0:48,2.827,0.774,0.008,
+2020-11-04,14:45:54,2020-11-04 14:45,3.816,2.792,0.060,
+2020-09-23,6:43:37,2020-09-23 6:43,3.530,1.838,0.095,
+2020-08-22,3:12:13,2020-08-22 3:12,4.587,5.577,0.041,
+2020-03-24,11:10:33,2020-03-24 11:10,4.328,3.894,0.001,
+2019-05-30,3:34:14,2019-05-30 3:34,3.805,2.830,0.098,
+2018-08-31,12:10:31,2018-08-31 12:10,3.588,1.945,0.022,
+2017-09-15,2:11:41,2017-09-15 2:11,3.808,2.590,0.023,
+2017-06-13,5:36:18,2017-06-13 5:36,4.358,4.321,0.004,
+2016-06-18,14:06:14,2016-06-18 14:06,5.582,8.625,0.029,
+2016-02-14,8:54:33,2016-02-14 8:54,5.537,9.343,0.021,
+2015-06-18,1:21:39,2015-06-18 1:21,5.468,8.690,0.063,
+2015-02-16,13:05:51,2015-02-16 13:05,2.377,0.349,0.047,
+2014-09-30,0:54:20,2014-09-30 0:54,5.054,9.185,0.080,
+2014-03-14,22:27:11,2014-03-14 22:27,5.047,9.827,0.001,
+2013-03-26,21:35:10,2013-03-26 21:35,4.690,6.033,0.064,
+2013-03-04,0:46:13,2013-03-04 0:46,4.009,3.816,0.046,
+2012-05-21,21:36:24,2012-05-21 21:36,5.416,9.181,0.018,
+,,,,,,
+,,,,,,
diff --git a/HydRA Test Curves_20240115/RC_shelly.csv b/HydRA Test Curves_20240115/RC_shelly.csv
new file mode 100644
index 00000000..64f1f980
--- /dev/null
+++ b/HydRA Test Curves_20240115/RC_shelly.csv	
@@ -0,0 +1,11 @@
+datetime,discharge,stage,uncertainty,comments
+2021-11-22 10:00,0.13,0.33,0.05,"21 panels, some snow on ground"
+2021-04-06 14:00,0.01,0.24,0.05,19 panels
+2021-03-08 9:00,0.05,0.28,0.03,"35 panels, recent high flow event in December"
+2021-02-24 13:00,0.03,0.27,0.05,"21 panels, rain overnight"
+2021-01-28 14:00,0.12,0.32,0.04,"21 panels, good mmt"
+2021-01-11 10:00,0.18,0.39,0.04,"21 panels, recent high flows after consistent rain. High turbidity"
+2020-12-30 11:30,0.36,0.45,0.03,"24 panels, recent high flows and heavy rains"
+2020-11-24 13:30,0.03,0.26,0.04,21 panels. Rain overnight
+2021-12-13 8:00,0.29,0.4,0.04,20 panels
+2020-01-12 17:00,0.67,0.55,0.03,"23 panels, recent rain on snow event, creek rising during mmt"
diff --git a/frontend/rctool/functions/fit_linear_model.py b/frontend/rctool/functions/fit_linear_model.py
index 44d56d85..ad13185b 100644
--- a/frontend/rctool/functions/fit_linear_model.py
+++ b/frontend/rctool/functions/fit_linear_model.py
@@ -6,81 +6,121 @@
 
 
 def fit_linear_model(df, offset, label, weighted=None, intersect_points=None, *args):
-
     # input dataframe with columns H, Q, and U
     df_data = df.copy()
-    df_data.drop(['datetime', 'comments', 'toggle_point'], axis=1, inplace=True)
-    df_data = df_data.rename(columns={'discharge': 'Q', 'stage':'H', 'uncertainty':'U'})
-    df_data.sort_values('H', inplace=True)
+    df_data.drop(["datetime", "comments", "toggle_point"], axis=1, inplace=True)
+    df_data = df_data.rename(
+        columns={"discharge": "Q", "stage": "H", "uncertainty": "U"}
+    )
+    df_data.sort_values("H", inplace=True)
 
     # Apply offset
-    df_data['H0'] = df_data['H'] - offset
+    df_data["H0"] = df_data["H"] - offset
 
     # init model
     plm = models.PowerLawModel()
     # set initial condition for model parameters
     # params = plm.guess(df_data['Q'], x=df_data['H0'])
-    
+
     # JOHNS CODE FOR GUESSING OFFSET
     params = Parameters()
-    params.add('amplitude', value=0.1, min=0.001, max=100)
-    params.add('exponent', value=2, min=0.5, max=5)
-
-
+    params.add("amplitude", value=0.1, min=0.001, max=100)
+    params.add("exponent", value=2, min=0.5, max=5)
 
     # add constraint so model passes through intersect points
     if intersect_points:
         for idx, point in enumerate(intersect_points):
-            constraint_name = 'amplitude'
-            constraint_expression = '{0:g}*{1:g}**(-(exponent))'.format(point[1], point[0] - offset)
+            constraint_name = "amplitude"
+            constraint_expression = "{0:g}*{1:g}**(-(exponent))".format(
+                point[1], point[0] - offset
+            )
             params.add(constraint_name, expr=constraint_expression)
-    
-    result = plm.fit(df_data['Q'], params, x=df_data['H0'])
-        
 
-    unw_const = round(result.best_values['amplitude'], 4)
-    unw_exp = round(result.best_values['exponent'], 4)
+    result = plm.fit(df_data["Q"], params, x=df_data["H0"])
+
+    unw_const = result.best_values["amplitude"]
+    unw_exp = result.best_values["exponent"]
     unw_best = result.best_fit
-    unw_residual = list( 100 * (np.array(unw_best) - np.array(df_data['Q']) ) / np.array(df_data['Q']) )
-    unw_seg_nodes = [[round(np.array(df_data['H'])[0], 3), round(unw_best[0], 3)], [round(np.array(df_data['H'])[-1], 3), round(unw_best[-1], 3)]]
+
+    unw_residual = list(
+        100 * (np.array(unw_best) - np.array(df_data["Q"])) / np.array(df_data["Q"])
+    )
+    unw_seg_nodes = [
+        [np.array(df_data["H"])[0], unw_best[0]],
+        [np.array(df_data["H"])[-1], unw_best[-1]],
+    ]
 
     # set uncertianty to %
-    df_data['U'] = df_data['U'].apply(lambda x: x / 100.)
+    df_data["U"] = df_data["U"].apply(lambda x: x / 100.0)
     # set weights as 1 - % unc
-    df_data['W'] = df_data['U'].apply(lambda x: 1 - x)
+    df_data["W"] = df_data["U"].apply(lambda x: 1 - x)
     # try weighting
-    result = plm.fit(df_data['Q'], params, x=df_data['H0'], weights=df_data['W'])
-    wgt_const = round(result.best_values['amplitude'], 4)
-    wgt_exp = round(result.best_values['exponent'], 4)
+    result = plm.fit(df_data["Q"], params, x=df_data["H0"], weights=df_data["W"])
+    wgt_const = result.best_values["amplitude"]
+    wgt_exp = result.best_values["exponent"]
     wgt_best = result.best_fit
     wgt_sigs = result.eval_uncertainty(sigma=2)
-    wgt_residual = list( 100 * (np.array(wgt_best) - np.array(df_data['Q']) ) / np.array(df_data['Q']) )
-    wgt_seg_nodes = [[round(np.array(df_data['H'])[0], 3), round(wgt_best[0], 3)], [round(np.array(df_data['H'])[-1], 3), round(wgt_best[-1], 3)]]
+    wgt_residual = list(
+        100 * (np.array(wgt_best) - np.array(df_data["Q"])) / np.array(df_data["Q"])
+    )
+    wgt_seg_nodes = [
+        [np.array(df_data["H"])[0], wgt_best[0]],
+        [np.array(df_data["H"])[-1], wgt_best[-1]],
+    ]
 
     # calculate statistical parameters to analyze goodness of fit
-    unw_mse = mean_squared_error(df_data['Q'], unw_best)
-    unw_rmse = round(math.sqrt(unw_mse), 3)
+    unw_mse = mean_squared_error(df_data["Q"], unw_best)
+    unw_rmse = math.sqrt(unw_mse)
 
-    wgt_mse = mean_squared_error(df_data['Q'], wgt_best)
-    wgt_rmse = round(math.sqrt(wgt_mse), 3)
+    wgt_mse = mean_squared_error(df_data["Q"], wgt_best)
+    wgt_rmse = math.sqrt(wgt_mse)
 
     # Process and ship output
     mdl_param = {
-        'unw': {'label': label ,'const': unw_const, 'exp': unw_exp, 'seg_bounds':unw_seg_nodes, 'offset': offset, 'rmse': unw_rmse},
-        'wgt': {'label': label, 'const': wgt_const,'exp': wgt_exp, 'seg_bounds':wgt_seg_nodes,'offset': offset, 'rmse': wgt_rmse}
+        "unw": {
+            "label": label,
+            "const": unw_const,
+            "exp": unw_exp,
+            "seg_bounds": unw_seg_nodes,
+            "offset": offset,
+            "rmse": unw_rmse,
+        },
+        "wgt": {
+            "label": label,
+            "const": wgt_const,
+            "exp": wgt_exp,
+            "seg_bounds": wgt_seg_nodes,
+            "offset": offset,
+            "rmse": wgt_rmse,
+        },
     }
 
     if weighted:
-        mdl_param = {'label': label, 'const': wgt_const,'exp': wgt_exp, 'seg_bounds':wgt_seg_nodes,'offset': offset, 'rmse': wgt_rmse}
-        wgt_data = [[a,b, c] for a, b, c in zip(df_data['H'].tolist(), wgt_best, wgt_residual)] 
-        mdl_data = [{'label': label, 'data': wgt_data}]
+        mdl_param = {
+            "label": label,
+            "const": wgt_const,
+            "exp": wgt_exp,
+            "seg_bounds": wgt_seg_nodes,
+            "offset": offset,
+            "rmse": wgt_rmse,
+        }
+        wgt_data = [
+            [a, b, c] for a, b, c in zip(df_data["H"].tolist(), wgt_best, wgt_residual)
+        ]
+        mdl_data = [{"label": label, "data": wgt_data}]
     else:
         # unweighted
-        mdl_param = {'label': label ,'const': unw_const, 'exp': unw_exp, 'seg_bounds':unw_seg_nodes, 'offset': offset, 'rmse': unw_rmse}
-        unw_data = [[a,b, c] for a, b, c in zip(df_data['H'].tolist(), unw_best, unw_residual)] 
-        mdl_data = [{'label': label, 'data': unw_data}]
+        mdl_param = {
+            "label": label,
+            "const": unw_const,
+            "exp": unw_exp,
+            "seg_bounds": unw_seg_nodes,
+            "offset": offset,
+            "rmse": unw_rmse,
+        }
+        unw_data = [
+            [a, b, c] for a, b, c in zip(df_data["H"].tolist(), unw_best, unw_residual)
+        ]
+        mdl_data = [{"label": label, "data": unw_data}]
 
     return mdl_data, mdl_param
-
-
-
diff --git a/frontend/rctool/templates/rctool/rctool/develop/rctool_develop_js.html b/frontend/rctool/templates/rctool/rctool/develop/rctool_develop_js.html
index e4ce21a0..43309c6c 100644
--- a/frontend/rctool/templates/rctool/rctool/develop/rctool_develop_js.html
+++ b/frontend/rctool/templates/rctool/rctool/develop/rctool_develop_js.html
@@ -1,9 +1,18 @@
-{% load static %}
-{% load custom_tags %}
+{% load static %} {% load custom_tags %}
+<script
+    src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js"
+    integrity="sha512-ZwR1/gSZM3ai6vCdI+LVF1zSq/5HznD3ZSTk7kajkaj4D292NLuduDCO1c/NT8Id+jE58KYLKT7hXnbtryGmMg=="
+    crossorigin="anonymous"
+    referrerpolicy="no-referrer"
+></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.7.1/chart.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-dragdata@2.2.3/dist/chartjs-plugin-dragdata.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-zoom/1.2.1/chartjs-plugin-zoom.min.js"></script>
+<script
+    src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-zoom/2.0.1/chartjs-plugin-zoom.min.js"
+    integrity="sha512-wUYbRPLV5zs6IqvWd88HIqZU/b8TBx+I8LEioQ/UC0t5EMCLApqhIAnUg7EsAzdbhhdgW07TqYDdH3QEXRcPOQ=="
+    crossorigin="anonymous"
+    referrerpolicy="no-referrer"
+></script>
 
 <script>
 
@@ -25,6 +34,7 @@
 
     var axisFormat = 'logarithmic';
 
+    let interpolation_points = 1000;
 
     // update form variables
     updateFormVariables()
@@ -45,14 +55,14 @@
         const autofittedBreakPoint = rcParam[0]['seg_bounds'][1][0].toFixed(3);
         document.getElementById("breakpoint1").value = autofittedBreakPoint;
     };
-    
+
     // A.2 SHOW STATUS AND CHECK EXPONENT
 
     // function displayStatus(statusText) {
     //     document.getElementById("status-box").style.display = "block";
     //     document.getElementById('status-text').innerHTML = statusText
     //     setTimeout(
-    //         function() 
+    //         function()
     //         {
     //             $("#status-box").fadeOut(1500);
     //         }, 4000);
@@ -69,26 +79,19 @@
     B.0) USER INPUT - ADJUST RATING CURVE POINT
     ----------------------------------------------------------------------------------------------------------------------------------------------*/
 
-    // DATA FOR TESTING : WILL REMOVE
-    // var testSegmentBounds = {
-    //     segment1: [[0.075, 0.23],[3.3, 0.695]],
-    //     segment2: [[3.3, 0.695], [50, 1.5]]
-    // };
-    // var testOffsets = [0.1, 0.1];
-    
     function updateFormVariables(){
         // update form variables
         $('#fieldData_datetime').val(Object.values(fielddatacsv.datetime))
-        $('#fieldData_comments').val(Object.values(fielddatacsv.comments)) 
+        $('#fieldData_comments').val(Object.values(fielddatacsv.comments))
         $('#fieldData_uncertainty').val(Object.values(fielddatacsv.uncertainty))
-        $('#fieldData_stage').val(Object.values(fielddatacsv.stage))  
+        $('#fieldData_stage').val(Object.values(fielddatacsv.stage))
         $('#fieldData_discharge').val(Object.values(fielddatacsv.discharge))
         $('#fieldData_active').val(Object.values(fielddatacsv.toggle_point))
-        
+
         $('#fieldData_datetime_out').val(Object.values(fielddatacsv.datetime))
-        $('#fieldData_comments_out').val(Object.values(fielddatacsv.comments))  
+        $('#fieldData_comments_out').val(Object.values(fielddatacsv.comments))
         $('#fieldData_uncertainty_out').val(Object.values(fielddatacsv.uncertainty))
-        $('#fieldData_stage_out').val(Object.values(fielddatacsv.stage)) 
+        $('#fieldData_stage_out').val(Object.values(fielddatacsv.stage))
         $('#fieldData_discharge_out').val(Object.values(fielddatacsv.discharge))
         $('#fieldData_active_out').val(Object.values(fielddatacsv.toggle_point))
         //$('#rc_out').val(Object.entries(rcDict))
@@ -118,7 +121,6 @@
     }
 
     function adjustSeg(segmentBounds, offsets) {
-
         // INPUTS:
             // segmentBounds: dictionary where keys are segmentName and values are segmentData
                 // segmentName: formatted 'segmentn' where n is the segment number starting at 1
@@ -138,7 +140,7 @@
             lnh2 = Math.log(segmentData[1][0] - offset),
             lnQ1 = Math.log(segmentData[0][1]),
             lnQ2 = Math.log(segmentData[1][1]);
-            
+
             // 2. CALCULATE NEW RATING CURVE SEGMENT PARAMETERS
             const slope = (lnQ2 - lnQ1) / (lnh2 - lnh1);
             const intercept = lnQ2 - (slope * lnh2);
@@ -152,7 +154,7 @@
 
             // 3.2 Calculate model data from new rc equation, collect and prepaire output
             var stage = fieldDataFiltered.map( item => (item[0]));
-            var oldQ = fieldDataFiltered.map( item => (item[1])); 
+            var oldQ = fieldDataFiltered.map( item => (item[1]));
             var newQ = stage.map(s => C * (s - offset) ** slope);
             // Calculate statistical parameters; residuals
             var newResiduals = fieldDataFiltered.map(item => ( 100 * (C * (item[0] - offset) ** slope - item[1]) / item[1] ) );
@@ -242,13 +244,13 @@
 
         };
 
-                        
+
         rcDict = {'data':rcData, 'parameters':rcParam}
-        
+
         // update form variables
         updateFormVariables()
-        
-        // TOBIAS: update rcChart with new rcData
+
+        // update rcChart with new rcData
         updateChartFromGlobal()
 
         // update max bounds
@@ -259,6 +261,7 @@
 
         // update status
         // displayStatus('<strong>status: </strong> manual adjustment applied...')
+        toggleAxisFormat(document.getElementById("toggle_axis_format").checked)
 
     };
 
@@ -301,7 +304,7 @@
     function updateChartSegments(){
         // get all chart indices
         var datasetIndices = Object.keys(rcChart.data.datasets)
-        
+
         // find which scatter plot belongs to a line plot
         var bound_idx = 0
         var chart_idx_lookup = [];
@@ -309,7 +312,7 @@
             if (rcChart.data.datasets[idx].label != 'field' && rcChart.data.datasets[idx].label != 'field inactive' && rcChart.data.datasets[idx].type === 'scatter'){
                 // this is an rc scatter curve, store these bounds:
                 bound_idx = bound_idx + 1;
-                
+
                 // save which lineidx matches this rc dataset index
                 chart_idx_lookup.push([parseInt(idx), idx - 1])
             }
@@ -319,34 +322,30 @@
         rc_trueidx = 0
         for  (let [rc_idx, l_idx] of chart_idx_lookup) {
             data_line = rcChart.data.datasets[l_idx].data;
-            
             offset_thisline = offsetData[rc_trueidx]
             param = rcDict.parameters[rc_trueidx]
 
             // create an array that will be used to calculate the line point positions
             const arr = [];
-            for (let i = 0.05; i < 1; i += 0.05)
+            for (let i = 0; i < 1; i += 1/interpolation_points)
                 arr.push(i);
-            
+
             // define the start and end points of the line
             start_pt = data_line[0];
             end_pt = data_line[data_line.length - 1];
 
             // calculate the points in between start and end:
-            // e.g. Q = 4.67783 * ( H - 0)^3.79273 
-            // which is X = const * ( Y - offset)^ exponent
-            var data_line_new_y          = arr.map((num) => (offset_thisline + start_pt.y + num * (end_pt.y-start_pt.y)) );
+            var data_line_new_y          = arr.map((num) => (start_pt.y + num * (end_pt.y-start_pt.y)) );
             var data_line_new_x          = data_line_new_y.map((num) => param.const * (num - offset_thisline) ** param.exp)
-            // var data_line_new_x          = data_line_new_y.map((num) => 4.67783 * num ** 3.79273)
 
             var data_line_new_pt = []
             // add start point to line
             data_line_new_pt.push(start_pt)
             // add calculated middle points
             data_line_new_x.forEach((x_val, index) => {
-                const y_val = data_line_new_y[index];          
-                
-                // add this point if it is between pre-defined start and endpoint      
+                const y_val = data_line_new_y[index];
+
+                // add this point if it is between pre-defined start and endpoint
                 if ((x_val < end_pt.x) && x_val > start_pt.x) {
                     data_line_new_pt.push({x: x_val, y: y_val});
                 }
@@ -387,7 +386,7 @@
             // set point to unchecked now
             fielddatacsv.toggle_point[idx] = 'unchecked';
         }
-        
+
         // redraw field data in the plot, but do not call autofit (it will update when the user hits that button)
         var datasetIndices = Object.keys(rcChart.data.datasets)
         var fieldIdx = null;
@@ -402,7 +401,7 @@
                 fieldInactiveIdx = didx;
             }
         }
-        
+
         // create an Object of all field data that can be filtered by active and appended to the rcChart
         var dataArray = Object.keys(fielddatacsv.toggle_point).map((id, index) => {
             return {
@@ -412,26 +411,25 @@
                 active: Object.values(fielddatacsv.toggle_point)[index]
             }
         });
-        
-    
+
         // filter out which data is active/inactive
         var fieldDataActive = dataArray.filter(data => data.active == 'checked')
         var fieldDataInActive = dataArray.filter(data => data.active == 'unchecked')
-        
+
         // remove the active attribute
-        fieldDataActive.forEach(object => { 
-            delete object['active']; 
-            delete object['id']; 
+        fieldDataActive.forEach(object => {
+            delete object['active'];
+            delete object['id'];
         });
-        fieldDataInActive.forEach(object => { 
-            delete object['active']; 
-            delete object['id']; 
+        fieldDataInActive.forEach(object => {
+            delete object['active'];
+            delete object['id'];
         });
 
         // update data in the chart objects directly:
         rcChart.data.datasets[fieldIdx].data = fieldDataActive;
         rcChart.data.datasets[fieldInactiveIdx].data = fieldDataInActive;
-        
+
         // redraw data
         // save previous animation duration
         var animation_duration = rcChart.options.animation.duration;
@@ -439,7 +437,7 @@
         rcChart.options.animation.duration = 0;
 
         // update plot
-        rcChart.update();        
+        rcChart.update();
         // reset animation duration
         rcChart.options.animation.duration = animation_duration;
 
@@ -452,7 +450,7 @@
     ----------------------------------------------------------------------------------------------------------------------------------------------*/
 
     function setEndpoints(segEP, pointEP, coordEP, valueEP) {
-        
+
         // 1. COLLECT AND INITIATE PARAMETERS
         if (rcParam.length == 2) {
             var newSegBounds = [rcParam[0].seg_bounds, rcParam[1].seg_bounds];
@@ -474,7 +472,7 @@
                 // if segment 2 changed, make segment 1 endpoint = segment 2 startpoint
                 newSegBounds[0][1] = newSegBounds[1][0];
             };
-            // update the dictionary 
+            // update the dictionary
             newSegBoundsDict['segment1'] = [newSegBounds[0][0], newSegBounds[0][1]];
             newSegBoundsDict['segment2'] = [newSegBounds[1][0], newSegBounds[1][1]];
 
@@ -495,7 +493,7 @@
         offsetData[segment] = parseFloat(value);
         maxStage = parseFloat(maxOffset);
 
-        
+
         if ( offsetData[0] >= maxStage || offsetData[1] >= maxStage ) {
             var warningDict = {'error_title': 'Warning', 'error_text': 'The specified offset has exceeded the maximum allowable offset (lowest stage value). Can not fit curve.'}
             updateWarningMessage(warningDict)
@@ -524,7 +522,7 @@
             const offset1 = offsetData[0];
             // calculate new segment 1 endpoints
             if (offsetData[0] > rcParam[0]['seg_bounds'][0][0] && offsetData[0] < maxStage) {
-                // make lowest stage of the rating curve the 
+                // make lowest stage of the rating curve the
                 // var seg1startH = (maxStage - offsetData[0]) * (1/2) + (offsetData[0]);
                 var seg1startH = maxStage;
             } else if (offsetData[0] > rcParam[0]['seg_bounds'][0][0] && offsetData[0] == maxStage) {
@@ -559,8 +557,8 @@
             const seg1startH = rcParam[0]['seg_bounds'][0][0];
             const seg1startQ = rcParam[0]['seg_bounds'][0][1];
             segBoundsDict['segment0'] = [[seg1startH , seg1startQ ], [seg2startH , seg2startQ]];
-        }; 
-        
+        };
+
         // 4. APPLY NEW PARAMETERS TO ADJUST SEGMENT FUNCTION
         adjustSeg(segBoundsDict, offsetData);
         };
@@ -572,7 +570,7 @@
     function setBreakpoint1(setBreakpointValue) {
 
         // if no second segement, end function
-        if ( rcParam.length <= 1 ) {            
+        if ( rcParam.length <= 1 ) {
             return
         };
 
@@ -603,7 +601,7 @@
 
     function addRemoveSeg(nChange) {
         nSegData = nSegData + nChange;
-        
+
         // Set maximum and minimum value
         if (nSegData > 2) {
             nSegData = 2;
@@ -623,8 +621,132 @@
     ----------------------------------------------------------------------------------------------------------------------------------------------*/
 
     function toggleAxisFormat(checked) {
+
         if (checked) {
-            axisFormat = 'logarithmic';
+
+            let exponent = rcParam[0].exp;
+
+            function logBase(n) {
+                Math.log(n) / Math.log(rcParam[0].exp);
+            }
+
+
+            // define new logarithmic scale based on this exponent
+            class LogBaseAxis extends Chart.Scale {
+                constructor(cfg) {
+                    super(cfg);
+                    this._startValue = undefined;
+                    this._valueRange = 0;
+                }
+
+                parse(raw, index) {
+                    const value = Chart.LinearScale.prototype.parse.apply(this, [raw, index]);
+                    return isFinite(value) && value > 0 ? value : null;
+                }
+
+                determineDataLimits() {
+                    const {
+                    min,
+                    max
+                    } = this.getMinMax(true);
+                    this.min = isFinite(min) ? Math.max(0, min) : null;
+                    this.max = isFinite(max) ? Math.max(0, max) : null;
+                }
+
+                buildTicks() {
+                    const ticks = [];
+                    if (this.min > this.max) {
+                        let temp = this.min;
+                        this.min = this.max;
+                        this.max = temp;
+                    }
+                    let minPowerData = Math.log((this.min)) / Math.log(rcParam[0].exp);
+                    let maxPowerData = Math.log((this.max)) / Math.log(rcParam[0].exp);
+
+
+                    if (minPowerData > maxPowerData) {
+                        minPowerData = -minPowerData;
+                        maxPowerData = -maxPowerData;
+                    }
+
+                    let minPower = Math.floor(minPowerData);
+                    let maxPower = Math.ceil(maxPowerData);
+
+                    //console.log('minPowerData: ' + minPowerData + ' maxPowerData: ' + maxPowerData, 'minPower: ' + minPower + ' maxPower: ' + maxPower)
+                    //console.log('min: ' + this.min + ' max: ' + this.max, 'exp: ' + rcParam[0].exp)
+
+                    let numTicks = maxPower - minPower + 1;
+                    let powerStep = (maxPower - minPower) / 10;
+
+                    //console.log('numTicks: ' + numTicks, 'powerStep: ' + powerStep)
+
+                    // iteratively find lowest power to plot a tick for
+                    let power = maxPower;
+                    //console.log(power, minPower, maxPower, powerStep)
+                    while ((power > minPower) && (power >= minPowerData)) {
+                        power -= powerStep;
+                    }
+                    //console.log('power: ' + power, 'minPower: ' + minPower, 'maxPower: ' + maxPower, 'powerStep: ' + powerStep)
+
+                    // add ticks from smallest to largest
+                    while (power <= (maxPower + powerStep)) {
+                        let tickVal = Math.pow(rcParam[0].exp, power);
+
+                        // if exponent is less than 1, take negative
+                        if (rcParam[0].exp < 1) {
+                            tickVal = Math.pow(rcParam[0].exp, -power);
+                        }
+
+                        // adjust to use rounded tick value based on log10 of value
+                        let roundMag = -Math.floor(Math.log10(tickVal));
+                        let tickValRound = Math.round(tickVal * 10 ** (roundMag + 2)) / 10 ** (roundMag + 2);
+
+                        ticks.push({
+                            value: tickValRound
+                        });
+
+                        power += powerStep;
+                    }
+
+                    this.min = ticks[0].value;
+                    this.max = ticks[ticks.length - 1].value;
+                    return ticks;
+                }
+
+                /**
+                    * @protected
+                    */
+                configure() {
+                    const start = this.min;
+
+                    super.configure();
+
+                    this._startValue = Math.log(start) / Math.log(rcParam[0].exp);
+                    this._valueRange = Math.log(this.max) / Math.log(rcParam[0].exp) - Math.log(start) / Math.log(rcParam[0].exp);
+                }
+
+                getPixelForValue(value) {
+                    if (value === undefined || value === 0) {
+                    value = this.min;
+                    }
+
+                    return this.getPixelForDecimal(value === this.min ? 0 :
+                    (Math.log(value) / Math.log(rcParam[0].exp) - this._startValue) / this._valueRange);
+                }
+
+                getValueForPixel(pixel) {
+                    const decimal = this.getDecimalForPixel(pixel);
+                    return Math.pow(rcParam[0].exp, this._startValue + decimal * this._valueRange);
+                }
+            }
+
+            LogBaseAxis.id = 'logBase';
+            LogBaseAxis.defaults = {};
+
+            Chart.register(LogBaseAxis);
+
+            axisFormat = 'logBase';
+
         }
         else {
             axisFormat = 'linear';
@@ -633,6 +755,8 @@
         rcChart.options.scales = {
                 x: {
                     type: axisFormat,
+                    clip: false,
+                    offset: true,
                     title: {
                         display: true,
                         text: 'discharge (m\u00B3/s)'
@@ -641,6 +765,7 @@
                 },
                 y: {
                     type: axisFormat,
+                    clip: false,
                     title: {
                         display: true,
                         text: 'stage (m)'
@@ -772,7 +897,7 @@
                         text: 'discharge (m\u00B3/s)'
                     },
                     // beginAtZero: true,
-                    max: getMaxQ(rcParam),
+                    max: getMaxQ(rcParam)
                 },
                 y: {
                     type: axisFormat,
@@ -800,7 +925,7 @@
                 },
                 // using the plugin https://github.com/chrispahm/chartjs-plugin-dragdata
                 dragData: {
-                    round: 3, // rounds the values to n decimal places 
+                    round: 4, // rounds the values to n decimal places
                     showTooltip: true, // show the tooltip while dragging [default = true]
                     dragX: true, // also enable dragging along the x-axis this solely works for continous, numerical x-axis scales (no categories or dates)!
                     onDragStart: function(e, datasetIndex) {
@@ -810,7 +935,7 @@
                             // prevent dragging
                             return false
                         }
-                        
+
                         // hide interpolation line for current RC curve:
                         var datasetLabel = dataset.label
                         var datasetIndices = Object.keys(rcChart.data.datasets)
@@ -822,15 +947,21 @@
                         rcChart.data.datasets[lineIdx].hidden = true;
                     },
                     onDrag: function(e, datasetIndex, index, value) {
-                        var dataset = rcChart.data.datasets[datasetIndex];
+                        //var dataset = rcChart.data.datasets[datasetIndex];
 
                         // you may control the range in which datapoints are allowed to be
                         // dragged by returning `false` in this callback
                         // restrict drag values:
-                        if (value.x < 1) return false 
                         if (value.y < 0) return false
+                        if (value.x < 0.0001) return false
                     },
                     onDragEnd: function(e, datasetIndex, index, value) {
+                        if (value.x == 0 || value.y == 0) {
+                            // alert user that 0 values are not allowed
+                            alert('0 values are not allowed! Increase the value slightly.');
+                            return false
+                        }
+
                         var dataset = rcChart.data.datasets[datasetIndex];
                         // you may use this callback to store the final datapoint value
                         // (after dragging) in a database, or update other UI elements that
@@ -839,12 +970,12 @@
 
                         // all dataset indeces to check iteratively in the next steps
                         var datasetIndices = Object.keys(rcChart.data.datasets)
-                        
+
                         // find which matching datasets there are:
                         for (var idx in datasetIndices) {
                             if (rcChart.data.datasets[idx].label != datasetLabel &&  rcChart.data.datasets[idx].label != 'field'  &&  rcChart.data.datasets[idx].label != 'field inactive' && rcChart.data.datasets[idx].type === 'scatter'){
                                 var dataset_otherrc = rcChart.data.datasets[idx]
-                                
+
                                 if (index == 0){
                                     // this was a rc change on lower value
                                     // check if this other RC is exactly 2 layers below the changed one (as there are 2 layers created per RC), meaning it might have a common point:
@@ -863,7 +994,7 @@
                                         // adjust common point in the other rc
                                         dataset_otherrc.data[0].y = value.y
                                         dataset_otherrc.data[0].x = value.x
-                                        
+
                                         // update breakpoint field
                                         document.getElementById("breakpoint1").value = value.y;
                                     }
@@ -885,10 +1016,10 @@
                                 chart_idx_lookup.push([parseInt(idx), idx - 1])
                             }
                         }
-                        
+
                         // adjust rating curve segments to fit through new points:
                         adjustSeg(segBoundsDict_new, offsetData);
-                        
+
                         // unhide interpolation line for current RC curve:
                         rcChart.data.datasets[lineIdx].hidden = false;
 
@@ -917,7 +1048,7 @@
     function addrcPlot(dataArray, currentLabel, colorLabel) {
         var startPoint = dataArray[0]
         var endPoint = dataArray.slice(-1)[0]
-        
+
         // plotting data array as line
         rcChart.data.datasets.push({
             type: 'line',
@@ -968,9 +1099,9 @@
         borderWidth: 2.75,
         pointRadius: 2.75,
         pointHitRadius: 0,
-    });    
+    });
+
 
-    
     // add inactive field data
     var currentLabel = 'field inactive'
     var colorLabel = '#ae2029'
@@ -984,12 +1115,14 @@
         borderWidth: 2.75,
         pointRadius: 2.75,
         pointHitRadius: 0,
-    });    
+    });
     rcChart.update();
 
     // MAKE SURE SCALE HAS BEEN UPDATED
     updateMaxBounds(rcParam);
 
+    toggleAxisFormat(document.getElementById("toggle_axis_format").checked)
+
     /*-----------------------------------------------------------------------------------------------------------------------------------------------
     C.2) REGRESSION RESIDUAL CHART
     ------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -1028,7 +1161,7 @@
                     },
                     beginAtZero: false
                 }
-                
+
             },
             tooltips: {
                 mode: 'index',
@@ -1107,7 +1240,7 @@
     function updateWarningMessage(warningDict) {
 
         var toggleDiv = document.getElementById("warning-message-div");
-        
+
         if (warningDict['error_text'] === "no warning") {
             toggleDiv.style.display = "none";
         } else {
@@ -1133,7 +1266,4 @@
         document.getElementById('autofit-breakpoint-checkbox').style.display = 'flex';
         document.getElementById('adding-segment-link').style.display = 'none';
     };
-
-
-
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/rctool/templatetags/custom_tags.py b/frontend/rctool/templatetags/custom_tags.py
index c85316b4..01acaafb 100644
--- a/frontend/rctool/templatetags/custom_tags.py
+++ b/frontend/rctool/templatetags/custom_tags.py
@@ -7,116 +7,116 @@
 register = template.Library()
 
 
-@register.simple_tag
-def count_segments(num_seg):
-    num_seg += 1
-    return num_seg
-
-
-@register.simple_tag
-def create_table(t_data):
-    table_dict = {"headings": t_data[0], "data": t_data[1:]}
-    return table_dict
-
-
-@register.simple_tag
-def fit_data(
-    field_data,
-    offsets,
-    breakpoint1=None,
-    rc_data=None,
-    n_seg=None,
-    adjust_seg=None,
-    *args
-):
-    # Initialize and filter
-    df_field_raw = pd.DataFrame(field_data[1:], columns=field_data[0])
-    df_field = df_field_raw[df_field_raw["toggle_point"] == True]
-
-    # add to output list
-    field_data = [
-        [a, b]
-        for a, b in zip(df_field["stage"].tolist(), df_field["discharge"].tolist())
-    ]
-    rc_data_output = [
-        {"label": "field", "data": field_data}
-    ]  # if n_seg = 0, this will be the output
-    rc_param_output = None  # if n_seg = 0, this will be the output
-
-    """---------------------------------
-	INITIALIZE RATING CURVE SEGMENTS
-	------------------------------------"""
-    # CONDITION: For when a user wants to add a new segment
-    # if n_seg is input into this function, this code will be called
-
-    # calculate the boundaries of each fit
-    x_step = 5
-    x_min = df_field["discharge"].min()
-    x_max = df_field["discharge"].max()
-    rmse_best = 10000.00  # initialize with something unrealistically high
-
-    if n_seg == 1:
-        [mdl_data, mdl_param] = fit_linear_model(
-            df_field, offsets[0], "model segment 1"
-        )
-        rc_data_output = rc_data_output + mdl_data
-        rc_param_output = [mdl_param["wgt"]]
-
-    elif n_seg == 2:
-        # check if breakpoint exists and is within bounds of fitting data
-        if breakpoint1 and breakpoint1 > x_min and breakpoint1 < x_max:
-            df_lower = df_field[df_field["discharge"] <= breakpoint1]
-            df_upper = df_field[
-                df_field["discharge"] >= df_lower["discharge"].iloc[-1]
-            ]  # creates df of all values greater than last point of first field data df (so we have an intersect point)
-
-            if (
-                len(df_lower["discharge"]) > 1 and len(df_upper["discharge"]) > 1
-            ):  # breaks if trying to fit a line through one point
-                [mdl_data_lower, mdl_param_lower] = fit_linear_model(
-                    df_lower, offsets[0], "model segment 1"
-                )
-                intersect_point_1 = [
-                    [mdl_data_lower[0]["data"][-1][0], mdl_data_lower[0]["data"][-1][1]]
-                ]  # retrieve last point of first model segment for starting point of second segment
-                [mdl_data_upper, mdl_param_upper] = fit_linear_model(
-                    df_upper, offsets[1], "model segment 2", intersect_point_1
-                )
-                best_rc_data = mdl_data_lower + mdl_data_upper
-                best_rc_param = [mdl_param_lower["wgt"], mdl_param_upper["wgt"]]
-
-        # if no breakpoint specified, iterate between numerous breakpoints and optimize fit
-        else:
-            for k in np.arange(x_min, x_max, x_step):
-                df_lower = df_field[df_field["discharge"] <= k]
-                df_upper = df_field[
-                    df_field["discharge"] >= df_lower["discharge"].iloc[-1]
-                ]
-                if len(df_lower["discharge"]) > 1 and len(df_upper["discharge"]) > 1:
-                    [mdl_data_lower, mdl_param_lower] = fit_linear_model(
-                        df_lower, offsets[0], "model segment 1"
-                    )
-                    intersect_point_1 = [
-                        [
-                            mdl_data_lower[0]["data"][-1][0],
-                            mdl_data_lower[0]["data"][-1][1],
-                        ]
-                    ]
-                    [mdl_data_upper, mdl_param_upper] = fit_linear_model(
-                        df_upper, offsets[1], "model segment 2", intersect_point_1
-                    )
-                    rmse = np.mean(
-                        [mdl_param_lower["wgt"]["rmse"], mdl_param_upper["wgt"]["rmse"]]
-                    )
-
-                    if rmse_best > rmse:
-                        rmse_best = rmse
-                        best_rc_data = mdl_data_lower + mdl_data_upper
-                        best_rc_param = [mdl_param_lower["wgt"], mdl_param_upper["wgt"]]
-
-        rc_data_output = rc_data_output + best_rc_data
-        rc_param_output = best_rc_param
-
-    rc_dict = {"data": rc_data_output, "parameters": rc_param_output}
-
-    return rc_dict
+# @register.simple_tag
+# def count_segments(num_seg):
+#     num_seg += 1
+#     return num_seg
+
+
+# @register.simple_tag
+# def create_table(t_data):
+#     table_dict = {"headings": t_data[0], "data": t_data[1:]}
+#     return table_dict
+
+
+# @register.simple_tag
+# def fit_data(
+#     field_data,
+#     offsets,
+#     breakpoint1=None,
+#     rc_data=None,
+#     n_seg=None,
+#     adjust_seg=None,
+#     *args
+# ):
+#     # Initialize and filter
+#     df_field_raw = pd.DataFrame(field_data[1:], columns=field_data[0])
+#     df_field = df_field_raw[df_field_raw["toggle_point"] == True]
+
+#     # add to output list
+#     field_data = [
+#         [a, b]
+#         for a, b in zip(df_field["stage"].tolist(), df_field["discharge"].tolist())
+#     ]
+#     rc_data_output = [
+#         {"label": "field", "data": field_data}
+#     ]  # if n_seg = 0, this will be the output
+#     rc_param_output = None  # if n_seg = 0, this will be the output
+
+#     """---------------------------------
+# 	INITIALIZE RATING CURVE SEGMENTS
+# 	------------------------------------"""
+#     # CONDITION: For when a user wants to add a new segment
+#     # if n_seg is input into this function, this code will be called
+
+#     # calculate the boundaries of each fit
+#     x_step = 5
+#     x_min = df_field["discharge"].min()
+#     x_max = df_field["discharge"].max()
+#     rmse_best = 10000.00  # initialize with something unrealistically high
+
+#     if n_seg == 1:
+#         [mdl_data, mdl_param] = fit_linear_model(
+#             df_field, offsets[0], "model segment 1"
+#         )
+#         rc_data_output = rc_data_output + mdl_data
+#         rc_param_output = [mdl_param["wgt"]]
+
+#     elif n_seg == 2:
+#         # check if breakpoint exists and is within bounds of fitting data
+#         if breakpoint1 and breakpoint1 > x_min and breakpoint1 < x_max:
+#             df_lower = df_field[df_field["discharge"] <= breakpoint1]
+#             df_upper = df_field[
+#                 df_field["discharge"] >= df_lower["discharge"].iloc[-1]
+#             ]  # creates df of all values greater than last point of first field data df (so we have an intersect point)
+
+#             if (
+#                 len(df_lower["discharge"]) > 1 and len(df_upper["discharge"]) > 1
+#             ):  # breaks if trying to fit a line through one point
+#                 [mdl_data_lower, mdl_param_lower] = fit_linear_model(
+#                     df_lower, offsets[0], "model segment 1"
+#                 )
+#                 intersect_point_1 = [
+#                     [mdl_data_lower[0]["data"][-1][0], mdl_data_lower[0]["data"][-1][1]]
+#                 ]  # retrieve last point of first model segment for starting point of second segment
+#                 [mdl_data_upper, mdl_param_upper] = fit_linear_model(
+#                     df_upper, offsets[1], "model segment 2", intersect_point_1
+#                 )
+#                 best_rc_data = mdl_data_lower + mdl_data_upper
+#                 best_rc_param = [mdl_param_lower["wgt"], mdl_param_upper["wgt"]]
+
+#         # if no breakpoint specified, iterate between numerous breakpoints and optimize fit
+#         else:
+#             for k in np.arange(x_min, x_max, x_step):
+#                 df_lower = df_field[df_field["discharge"] <= k]
+#                 df_upper = df_field[
+#                     df_field["discharge"] >= df_lower["discharge"].iloc[-1]
+#                 ]
+#                 if len(df_lower["discharge"]) > 1 and len(df_upper["discharge"]) > 1:
+#                     [mdl_data_lower, mdl_param_lower] = fit_linear_model(
+#                         df_lower, offsets[0], "model segment 1"
+#                     )
+#                     intersect_point_1 = [
+#                         [
+#                             mdl_data_lower[0]["data"][-1][0],
+#                             mdl_data_lower[0]["data"][-1][1],
+#                         ]
+#                     ]
+#                     [mdl_data_upper, mdl_param_upper] = fit_linear_model(
+#                         df_upper, offsets[1], "model segment 2", intersect_point_1
+#                     )
+#                     rmse = np.mean(
+#                         [mdl_param_lower["wgt"]["rmse"], mdl_param_upper["wgt"]["rmse"]]
+#                     )
+
+#                     if rmse_best > rmse:
+#                         rmse_best = rmse
+#                         best_rc_data = mdl_data_lower + mdl_data_upper
+#                         best_rc_param = [mdl_param_lower["wgt"], mdl_param_upper["wgt"]]
+
+#         rc_data_output = rc_data_output + best_rc_data
+#         rc_param_output = best_rc_param
+
+#     rc_dict = {"data": rc_data_output, "parameters": rc_param_output}
+
+#     return rc_dict
diff --git a/frontend/rctool/views.py b/frontend/rctool/views.py
index 3d5ab413..9fdcc7d4 100644
--- a/frontend/rctool/views.py
+++ b/frontend/rctool/views.py
@@ -530,6 +530,9 @@ def rctool_develop_initialize(request):
         context["develop_tour_request_status_id"] = request.POST.get(
             "pass-tour-status-to-develop"
         )
+    else:
+        # redirect to import as no data was passed
+        return render(request, "rctool/rctool/import/rctool_import.html", context)
 
     context["rc_data"] = None
     context["table_dict"] = {
diff --git a/frontend/test_files/RC_LCR2122.csv b/frontend/test_files/RC_LCR2122.csv
new file mode 100644
index 00000000..2917e17e
--- /dev/null
+++ b/frontend/test_files/RC_LCR2122.csv
@@ -0,0 +1,20 @@
+datetime,discharge,stage,uncertainty,comments
+2021-11-24 10:27,0.9085,0.492,8,"23 panels, max 9.2%"
+2021-12-07 11:15,1.751439049,0.501,3.11,
+2021-12-16 10:59,1.1704,0.457,8,"22 panels, max 7.4%"
+2022-01-14 11:05,4.891958877,0.73,2.67,
+2022-02-07 11:38,1.127406583,0.459,3.27,
+2022-03-23 10:16,2.319489087,0.55,2.65,
+2022-03-30 14:45,0.843988357,0.515,2.94,
+2022-04-22 13:56,0.569,0.397,,"20 panels, max 13.8%"
+2022-05-03 17:29,0.465,0.377,,"20 panels, max 13.6%"
+2022-05-18 14:37,0.981925337,0.437,3.23,
+2022-07-19 9:53,0.131,0.277,,"20 panels, max 14.3%"
+2022-07-19 10:09,0.1472,0.278,3,
+2022-08-04 9:54,0.152,0.283,,"20 panels, max 11.9%"
+2022-08-04 12:30,0.183566024,0.286,3.17,
+2022-08-31 11:51,0.111,0.263,,"20 panels, max 9.2%"
+2022-09-09 10:02,0.101913626,0.261,2.59,
+2022-10-20 8:40,0.0813,0.243,2.9,
+2022-12-12 10:55,1.672120912,0.4875,3.13,
+2022-12-12 11:02,1.631,0.485,2.7,
diff --git a/frontend/test_files/RC_Lizard.csv b/frontend/test_files/RC_Lizard.csv
new file mode 100644
index 00000000..4a2e6201
--- /dev/null
+++ b/frontend/test_files/RC_Lizard.csv
@@ -0,0 +1,6 @@
+datetime,discharge,stage,uncertainty,comments
+2021-08-19 11:45,0.364,0.302,0.05,"old control, do not use MMT"
+2022-07-20 8:54,0.612,0.225,0.05,suggested PZF -0.150
+2022-07-27 15:27,0.482,0.193,0.05,
+2022-09-07 11:00,0.383,0.125,0.05,
+2022-10-18 11:33,0.201,0.097,0.05,
diff --git a/frontend/test_files/RC_cook1.csv b/frontend/test_files/RC_cook1.csv
new file mode 100644
index 00000000..49fc7fea
--- /dev/null
+++ b/frontend/test_files/RC_cook1.csv
@@ -0,0 +1,20 @@
+datetime,discharge,stage,uncertainty,comments
+2023-07-25 10:50:08,0.024789663,9.0635,0.099,approx PZF 9.0
+2023-05-08 13:23:17,0.468793188,9.193,0.031,
+2023-04-18 12:45:02,1.0337748,9.263,0.042,
+2023-02-06 12:00:00,1.080884219,9.27,0.032,
+2022-08-18 10:15:00,0.028,9.037,0.049,
+2022-07-19 10:11:16,0.093839378,9.065,0.03,
+2022-07-19 10:45:00,0.088,9.065,0.033,
+2022-04-13 13:00:00,0.557,9.177,0.03,
+2022-03-09 11:00:00,0.406728145,9.16,0.03,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
+,,,,
diff --git a/frontend/test_files/RC_cook2.csv b/frontend/test_files/RC_cook2.csv
new file mode 100644
index 00000000..9525aeef
--- /dev/null
+++ b/frontend/test_files/RC_cook2.csv
@@ -0,0 +1,10 @@
+datetime,discharge,stage,stage_raw,uncertainty,comments
+2023-07-25 10:50,0.024789663,0.3085,9.0635,0.099,approx PZF .245
+2023-05-08 13:23,0.468793188,0.438,9.193,0.031,
+2023-04-18 12:45,1.0337748,0.508,9.263,0.042,
+2023-02-06 12:00,1.080884219,0.515,9.27,0.032,
+2022-08-18 10:15,0.028,0.282,9.037,0.049,
+2022-07-19 10:11,0.093839378,0.31,9.065,0.03,
+2022-07-19 10:45,0.088,0.31,9.065,0.033,
+2022-04-13 13:00,0.557,0.422,9.177,0.03,
+2022-03-09 11:00,0.406728145,0.405,9.16,0.03,
diff --git a/frontend/test_files/RC_grand.csv b/frontend/test_files/RC_grand.csv
new file mode 100644
index 00000000..5caaf451
--- /dev/null
+++ b/frontend/test_files/RC_grand.csv
@@ -0,0 +1,24 @@
+datetime,stage,discharge,Uncertainty,Comments
+2023-07-26 12:57:30,0.186,0.002772154,,"PZF 0.018 , BP @ 0.395M"
+2023-05-26 13:02:30,0.198,0.005309356,,minor debris
+2023-04-19 13:51:15,0.2965,0.039120759,6.8,section
+2023-03-03 15:42:40,0.442,0.161655436,3.7,submerged
+2023-02-12 15:15:00,0.368,0.066844777,3.683071598,section
+2022-11-04 13:00:00,0.24,0.016708148,8,
+2022-09-19 16:00:00,0.188,0.00292457,8,
+2022-08-17 10:00:00,0.19,0.003312321,5,
+2022-07-18 15:00:00,0.21,0.004,,
+2021-08-17 09:00:00,0.285,0.002114971,,debris
+2019-09-19 13:45:00,0.23,0.01125648,10,
+2019-07-29 11:15:00,0.196,0.003352529,10,
+2019-06-10 10:40:00,0.209,0.00646972,8,
+2018-06-05 12:00:00,0.218,0.007823333,8,
+2017-11-27 13:30:00,0.54,0.4602,3.6,
+2017-07-12 13:30:00,0.205,0.004951,8,
+2017-06-13 16:00:00,0.215,0.007517333,8,
+2014-12-19 11:30:00,0.498,0.2883,,submerged
+2014-02-17 13:00:00,0.658,1.063,8,submerged
+2013-10-03 12:00:00,0.318,0.0388,5,
+2013-06-25 09:30:00,0.247,0.0162,8,
+2012-10-11 15:00:00,0.203,0.00382,5,
+2012-09-12 13:00:00,0.198,0.002749,8,
diff --git a/frontend/test_files/RC_random.csv b/frontend/test_files/RC_random.csv
new file mode 100644
index 00000000..8d8e49e9
--- /dev/null
+++ b/frontend/test_files/RC_random.csv
@@ -0,0 +1,22 @@
+date,time,DateTime,discharge,stage,uncertainty,comments
+2022-03-25,12:00:00,2022-03-25 12:00,2.796,0.759,0.004,
+2021-06-25,0:48:23,2021-06-25 0:48,2.827,0.774,0.008,
+2020-11-04,14:45:54,2020-11-04 14:45,3.816,2.792,0.060,
+2020-09-23,6:43:37,2020-09-23 6:43,3.530,1.838,0.095,
+2020-08-22,3:12:13,2020-08-22 3:12,4.587,5.577,0.041,
+2020-03-24,11:10:33,2020-03-24 11:10,4.328,3.894,0.001,
+2019-05-30,3:34:14,2019-05-30 3:34,3.805,2.830,0.098,
+2018-08-31,12:10:31,2018-08-31 12:10,3.588,1.945,0.022,
+2017-09-15,2:11:41,2017-09-15 2:11,3.808,2.590,0.023,
+2017-06-13,5:36:18,2017-06-13 5:36,4.358,4.321,0.004,
+2016-06-18,14:06:14,2016-06-18 14:06,5.582,8.625,0.029,
+2016-02-14,8:54:33,2016-02-14 8:54,5.537,9.343,0.021,
+2015-06-18,1:21:39,2015-06-18 1:21,5.468,8.690,0.063,
+2015-02-16,13:05:51,2015-02-16 13:05,2.377,0.349,0.047,
+2014-09-30,0:54:20,2014-09-30 0:54,5.054,9.185,0.080,
+2014-03-14,22:27:11,2014-03-14 22:27,5.047,9.827,0.001,
+2013-03-26,21:35:10,2013-03-26 21:35,4.690,6.033,0.064,
+2013-03-04,0:46:13,2013-03-04 0:46,4.009,3.816,0.046,
+2012-05-21,21:36:24,2012-05-21 21:36,5.416,9.181,0.018,
+,,,,,,
+,,,,,,
diff --git a/frontend/test_files/RC_shelly.csv b/frontend/test_files/RC_shelly.csv
new file mode 100644
index 00000000..64f1f980
--- /dev/null
+++ b/frontend/test_files/RC_shelly.csv
@@ -0,0 +1,11 @@
+datetime,discharge,stage,uncertainty,comments
+2021-11-22 10:00,0.13,0.33,0.05,"21 panels, some snow on ground"
+2021-04-06 14:00,0.01,0.24,0.05,19 panels
+2021-03-08 9:00,0.05,0.28,0.03,"35 panels, recent high flow event in December"
+2021-02-24 13:00,0.03,0.27,0.05,"21 panels, rain overnight"
+2021-01-28 14:00,0.12,0.32,0.04,"21 panels, good mmt"
+2021-01-11 10:00,0.18,0.39,0.04,"21 panels, recent high flows after consistent rain. High turbidity"
+2020-12-30 11:30,0.36,0.45,0.03,"24 panels, recent high flows and heavy rains"
+2020-11-24 13:30,0.03,0.26,0.04,21 panels. Rain overnight
+2021-12-13 8:00,0.29,0.4,0.04,20 panels
+2020-01-12 17:00,0.67,0.55,0.03,"23 panels, recent rain on snow event, creek rising during mmt"