diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..c44e0042b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.csv
@@ -0,0 +1,17 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,16.73530000000,2020,R1,gassupply1,2025
+0,9.23530000000,2020,R1,gassupply1,2030
+1,9.28910000000,2025,R1,gassupply1,2030
+0,1.73530000000,2020,R1,gassupply1,2035
+1,9.28910000000,2025,R1,gassupply1,2035
+2,7.47410000000,2030,R1,gassupply1,2035
+0,1.73530000000,2020,R1,gassupply1,2040
+1,9.28910000000,2025,R1,gassupply1,2040
+2,7.47410000000,2030,R1,gassupply1,2040
+0,1.73530000000,2020,R1,gassupply1,2045
+1,9.28910000000,2025,R1,gassupply1,2045
+2,7.47410000000,2030,R1,gassupply1,2045
+0,1.73530000000,2020,R1,gassupply1,2050
+1,9.28910000000,2025,R1,gassupply1,2050
+2,7.47410000000,2030,R1,gassupply1,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index d37dcfe1e..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 5e2e13dc7..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity.csv
new file mode 100644
index 000000000..6e2876fe2
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity.csv
@@ -0,0 +1,29 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,6,2020,R1,gasCCGT,2025
+2,5,2020,R1,solarPV,2025
+0,5,2020,R1,gasCCGT,2030
+1,6,2025,R1,gasCCGT,2030
+2,5,2020,R1,solarPV,2030
+0,5,2020,R1,gasCCGT,2035
+1,6,2025,R1,gasCCGT,2035
+2,5,2020,R1,solarPV,2035
+3,6,2030,R1,solarPV,2035
+0,5,2020,R1,gasCCGT,2040
+1,6,2025,R1,gasCCGT,2040
+2,5,2020,R1,solarPV,2040
+3,6,2030,R1,solarPV,2040
+4,6,2035,R1,solarPV,2040
+0,5,2020,R1,gasCCGT,2045
+1,6,2025,R1,gasCCGT,2045
+2,5,2020,R1,solarPV,2045
+3,6,2030,R1,solarPV,2045
+4,6,2035,R1,solarPV,2045
+5,6,2040,R1,solarPV,2045
+0,5,2020,R1,gasCCGT,2050
+1,6,2025,R1,gasCCGT,2050
+3,6,2030,R1,solarPV,2050
+4,6,2035,R1,solarPV,2050
+5,6,2040,R1,solarPV,2050
+6,10,2045,R1,solarPV,2050
+8,1,2045,R1,windturbine,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 97dc61dfe..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2025,R1,solarPV,2020,5
-1,2030,R1,solarPV,2020,5
-1,2035,R1,solarPV,2020,5
-1,2040,R1,solarPV,2020,5
-1,2045,R1,solarPV,2020,5
-1,2049,R1,solarPV,2020,5
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
deleted file mode 100644
index feb9e3e80..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,5
-2,2030,R1,solarPV,2020,5
-2,2035,R1,solarPV,2020,5
-2,2040,R1,solarPV,2020,5
-2,2045,R1,solarPV,2020,5
-2,2049,R1,solarPV,2020,5
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 1d70a0b9f..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,5
-2,2030,R1,solarPV,2020,5
-2,2035,R1,solarPV,2020,5
-2,2040,R1,solarPV,2020,5
-2,2045,R1,solarPV,2020,5
-2,2049,R1,solarPV,2020,5
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 2d686a884..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,38 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,5
-2,2030,R1,solarPV,2020,5
-2,2035,R1,solarPV,2020,5
-2,2040,R1,solarPV,2020,5
-2,2045,R1,solarPV,2020,5
-2,2049,R1,solarPV,2020,5
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2040,R1,solarPV,2035,6
-4,2045,R1,solarPV,2035,6
-4,2049,R1,solarPV,2035,6
-4,2050,R1,solarPV,2035,6
-4,2059,R1,solarPV,2035,6
-4,2060,R1,solarPV,2035,6
-4,2064,R1,solarPV,2035,6
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 9c0ab67cc..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,5
-2,2030,R1,solarPV,2020,5
-2,2035,R1,solarPV,2020,5
-2,2040,R1,solarPV,2020,5
-2,2045,R1,solarPV,2020,5
-2,2049,R1,solarPV,2020,5
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2040,R1,solarPV,2035,6
-4,2045,R1,solarPV,2035,6
-4,2049,R1,solarPV,2035,6
-4,2050,R1,solarPV,2035,6
-4,2059,R1,solarPV,2035,6
-4,2060,R1,solarPV,2035,6
-4,2064,R1,solarPV,2035,6
-5,2045,R1,solarPV,2040,6
-5,2049,R1,solarPV,2040,6
-5,2050,R1,solarPV,2040,6
-5,2059,R1,solarPV,2040,6
-5,2060,R1,solarPV,2040,6
-5,2064,R1,solarPV,2040,6
-5,2065,R1,solarPV,2040,6
-5,2069,R1,solarPV,2040,6
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 6a9b28f5d..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,62 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,5
-2,2030,R1,solarPV,2020,5
-2,2035,R1,solarPV,2020,5
-2,2040,R1,solarPV,2020,5
-2,2045,R1,solarPV,2020,5
-2,2049,R1,solarPV,2020,5
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2040,R1,solarPV,2035,6
-4,2045,R1,solarPV,2035,6
-4,2049,R1,solarPV,2035,6
-4,2050,R1,solarPV,2035,6
-4,2059,R1,solarPV,2035,6
-4,2060,R1,solarPV,2035,6
-4,2064,R1,solarPV,2035,6
-5,2045,R1,solarPV,2040,6
-5,2049,R1,solarPV,2040,6
-5,2050,R1,solarPV,2040,6
-5,2059,R1,solarPV,2040,6
-5,2060,R1,solarPV,2040,6
-5,2064,R1,solarPV,2040,6
-5,2065,R1,solarPV,2040,6
-5,2069,R1,solarPV,2040,6
-6,2050,R1,solarPV,2045,10
-6,2059,R1,solarPV,2045,10
-6,2060,R1,solarPV,2045,10
-6,2064,R1,solarPV,2045,10
-6,2065,R1,solarPV,2045,10
-6,2069,R1,solarPV,2045,10
-6,2070,R1,solarPV,2045,10
-6,2074,R1,solarPV,2045,10
-7,2050,R1,windturbine,2045,1
-7,2059,R1,windturbine,2045,1
-7,2060,R1,windturbine,2045,1
-7,2064,R1,windturbine,2045,1
-7,2065,R1,windturbine,2045,1
-7,2069,R1,windturbine,2045,1
-7,2070,R1,windturbine,2045,1
-7,2074,R1,windturbine,2045,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 54bd140df..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,69 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2055,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,5
-2,2030,R1,solarPV,2020,5
-2,2035,R1,solarPV,2020,5
-2,2040,R1,solarPV,2020,5
-2,2045,R1,solarPV,2020,5
-2,2049,R1,solarPV,2020,5
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2055,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2040,R1,solarPV,2035,6
-4,2045,R1,solarPV,2035,6
-4,2049,R1,solarPV,2035,6
-4,2050,R1,solarPV,2035,6
-4,2055,R1,solarPV,2035,6
-4,2059,R1,solarPV,2035,6
-4,2060,R1,solarPV,2035,6
-4,2064,R1,solarPV,2035,6
-5,2045,R1,solarPV,2040,6
-5,2049,R1,solarPV,2040,6
-5,2050,R1,solarPV,2040,6
-5,2055,R1,solarPV,2040,6
-5,2059,R1,solarPV,2040,6
-5,2060,R1,solarPV,2040,6
-5,2064,R1,solarPV,2040,6
-5,2065,R1,solarPV,2040,6
-5,2069,R1,solarPV,2040,6
-6,2050,R1,solarPV,2045,10
-6,2055,R1,solarPV,2045,10
-6,2059,R1,solarPV,2045,10
-6,2060,R1,solarPV,2045,10
-6,2064,R1,solarPV,2045,10
-6,2065,R1,solarPV,2045,10
-6,2069,R1,solarPV,2045,10
-6,2070,R1,solarPV,2045,10
-6,2074,R1,solarPV,2045,10
-8,2050,R1,windturbine,2045,1
-8,2055,R1,windturbine,2045,1
-8,2059,R1,windturbine,2045,1
-8,2060,R1,windturbine,2045,1
-8,2064,R1,windturbine,2045,1
-8,2065,R1,windturbine,2045,1
-8,2069,R1,windturbine,2045,1
-8,2070,R1,windturbine,2045,1
-8,2074,R1,windturbine,2045,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..d5cf558f0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index d6edd96cb..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 677048eca..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 95b724d9d..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 33e9c12a5..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 21be03137..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index d02c2c7f1..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 8c8e12067..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply.csv
new file mode 100644
index 000000000..520869501
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 729d406d6..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
deleted file mode 100644
index afe86e122..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 83daf7f18..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 7bda24630..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
deleted file mode 100644
index c535c6798..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 9abfcded8..000000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index b297589a1..c364d345b 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..fb9df2652
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity.csv
@@ -0,0 +1,17 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,16.46440000000,2020,R1,gassupply1,2025
+0,8.96440000000,2020,R1,gassupply1,2030
+1,9.22000000000,2025,R1,gassupply1,2030
+0,1.46440000000,2020,R1,gassupply1,2035
+1,9.22000000000,2025,R1,gassupply1,2035
+2,7.50000000000,2030,R1,gassupply1,2035
+0,1.46440000000,2020,R1,gassupply1,2040
+1,9.22000000000,2025,R1,gassupply1,2040
+2,7.50000000000,2030,R1,gassupply1,2040
+0,1.46440000000,2020,R1,gassupply1,2045
+1,9.22000000000,2025,R1,gassupply1,2045
+2,7.50000000000,2030,R1,gassupply1,2045
+0,1.46440000000,2020,R1,gassupply1,2050
+1,9.22000000000,2025,R1,gassupply1,2050
+2,7.50000000000,2030,R1,gassupply1,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 4346aa17f..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index ebf9e0aad..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index a40493afd..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index a40493afd..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index a40493afd..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index a40493afd..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index a40493afd..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity.csv
new file mode 100644
index 000000000..aba6be4c3
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity.csv
@@ -0,0 +1,29 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+0,6.00000000000,2020,R1,gasCCGT,2025
+2,5.50000000000,2020,R1,windturbine,2025
+0,5.00000000000,2020,R1,gasCCGT,2030
+1,5.88890000000,2025,R1,gasCCGT,2030
+3,5.50000000000,2020,R1,windturbine,2030
+0,5.00000000000,2020,R1,gasCCGT,2035
+1,5.88890000000,2025,R1,gasCCGT,2035
+2,6.00000000000,2030,R1,solarPV,2035
+4,5.50000000000,2020,R1,windturbine,2035
+0,5.00000000000,2020,R1,gasCCGT,2040
+1,5.88890000000,2025,R1,gasCCGT,2040
+2,6.00000000000,2030,R1,solarPV,2040
+3,6.00000000000,2035,R1,solarPV,2040
+5,5.50000000000,2020,R1,windturbine,2040
+0,5.00000000000,2020,R1,gasCCGT,2045
+1,5.88890000000,2025,R1,gasCCGT,2045
+2,6.00000000000,2030,R1,solarPV,2045
+3,6.00000000000,2035,R1,solarPV,2045
+4,6.00000000000,2040,R1,solarPV,2045
+6,5.50000000000,2020,R1,windturbine,2045
+0,5.00000000000,2020,R1,gasCCGT,2050
+1,5.88890000000,2025,R1,gasCCGT,2050
+2,6.00000000000,2030,R1,solarPV,2050
+3,6.00000000000,2035,R1,solarPV,2050
+4,6.00000000000,2040,R1,solarPV,2050
+5,10.00000000000,2045,R1,solarPV,2050
+7,1.50000000000,2045,R1,windturbine,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 4d6c24fb4..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2025,R1,windturbine,2020,5.50000000000
-1,2030,R1,windturbine,2020,5.50000000000
-1,2035,R1,windturbine,2020,5.50000000000
-1,2040,R1,windturbine,2020,5.50000000000
-1,2045,R1,windturbine,2020,5.50000000000
-1,2049,R1,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 08d038a74..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,windturbine,2020,5.50000000000
-2,2030,R1,windturbine,2020,5.50000000000
-2,2035,R1,windturbine,2020,5.50000000000
-2,2040,R1,windturbine,2020,5.50000000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
deleted file mode 100644
index ff594937e..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2025,R1,windturbine,2020,5.50000000000
-3,2030,R1,windturbine,2020,5.50000000000
-3,2035,R1,windturbine,2020,5.50000000000
-3,2040,R1,windturbine,2020,5.50000000000
-3,2045,R1,windturbine,2020,5.50000000000
-3,2049,R1,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
deleted file mode 100644
index b63e51006..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,38 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2025,R1,windturbine,2020,5.50000000000
-4,2030,R1,windturbine,2020,5.50000000000
-4,2035,R1,windturbine,2020,5.50000000000
-4,2040,R1,windturbine,2020,5.50000000000
-4,2045,R1,windturbine,2020,5.50000000000
-4,2049,R1,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 0949065f3..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2025,R1,windturbine,2020,5.50000000000
-5,2030,R1,windturbine,2020,5.50000000000
-5,2035,R1,windturbine,2020,5.50000000000
-5,2040,R1,windturbine,2020,5.50000000000
-5,2045,R1,windturbine,2020,5.50000000000
-5,2049,R1,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
deleted file mode 100644
index dd5872c77..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,62 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,10.00000000000
-5,2059,R1,solarPV,2045,10.00000000000
-5,2060,R1,solarPV,2045,10.00000000000
-5,2064,R1,solarPV,2045,10.00000000000
-5,2065,R1,solarPV,2045,10.00000000000
-5,2069,R1,solarPV,2045,10.00000000000
-5,2070,R1,solarPV,2045,10.00000000000
-5,2074,R1,solarPV,2045,10.00000000000
-6,2025,R1,windturbine,2020,5.50000000000
-6,2030,R1,windturbine,2020,5.50000000000
-6,2035,R1,windturbine,2020,5.50000000000
-6,2040,R1,windturbine,2020,5.50000000000
-6,2045,R1,windturbine,2020,5.50000000000
-6,2049,R1,windturbine,2020,5.50000000000
-7,2050,R1,windturbine,2045,1.50000000000
-7,2059,R1,windturbine,2045,1.50000000000
-7,2060,R1,windturbine,2045,1.50000000000
-7,2064,R1,windturbine,2045,1.50000000000
-7,2065,R1,windturbine,2045,1.50000000000
-7,2069,R1,windturbine,2045,1.50000000000
-7,2070,R1,windturbine,2045,1.50000000000
-7,2074,R1,windturbine,2045,1.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
deleted file mode 100644
index dd5872c77..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,62 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,10.00000000000
-5,2059,R1,solarPV,2045,10.00000000000
-5,2060,R1,solarPV,2045,10.00000000000
-5,2064,R1,solarPV,2045,10.00000000000
-5,2065,R1,solarPV,2045,10.00000000000
-5,2069,R1,solarPV,2045,10.00000000000
-5,2070,R1,solarPV,2045,10.00000000000
-5,2074,R1,solarPV,2045,10.00000000000
-6,2025,R1,windturbine,2020,5.50000000000
-6,2030,R1,windturbine,2020,5.50000000000
-6,2035,R1,windturbine,2020,5.50000000000
-6,2040,R1,windturbine,2020,5.50000000000
-6,2045,R1,windturbine,2020,5.50000000000
-6,2049,R1,windturbine,2020,5.50000000000
-7,2050,R1,windturbine,2045,1.50000000000
-7,2059,R1,windturbine,2045,1.50000000000
-7,2060,R1,windturbine,2045,1.50000000000
-7,2064,R1,windturbine,2045,1.50000000000
-7,2065,R1,windturbine,2045,1.50000000000
-7,2069,R1,windturbine,2045,1.50000000000
-7,2070,R1,windturbine,2045,1.50000000000
-7,2074,R1,windturbine,2045,1.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..d5cf558f0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index d6edd96cb..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 677048eca..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 95b724d9d..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 33e9c12a5..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 21be03137..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index d02c2c7f1..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 8c8e12067..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply.csv
new file mode 100644
index 000000000..520869501
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 729d406d6..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
deleted file mode 100644
index afe86e122..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 83daf7f18..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 7bda24630..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
deleted file mode 100644
index c535c6798..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 9abfcded8..000000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index b297589a1..c364d345b 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..0225f04eb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity.csv
@@ -0,0 +1,23 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,18.38780000000,2020,R1,gassupply1,2025
+0,10.88780000000,2020,R1,gassupply1,2030
+1,12.17660000000,2025,R1,gassupply1,2030
+0,3.38780000000,2020,R1,gassupply1,2035
+1,12.17660000000,2025,R1,gassupply1,2035
+2,14.17140000000,2030,R1,gassupply1,2035
+0,3.38780000000,2020,R1,gassupply1,2040
+1,12.17660000000,2025,R1,gassupply1,2040
+2,14.17140000000,2030,R1,gassupply1,2040
+3,2.23740000000,2035,R1,gassupply1,2040
+0,3.38780000000,2020,R1,gassupply1,2045
+1,12.17660000000,2025,R1,gassupply1,2045
+2,14.17140000000,2030,R1,gassupply1,2045
+3,2.23740000000,2035,R1,gassupply1,2045
+4,4.13670000000,2040,R1,gassupply1,2045
+0,3.38780000000,2020,R1,gassupply1,2050
+1,12.17660000000,2025,R1,gassupply1,2050
+2,14.17140000000,2030,R1,gassupply1,2050
+3,2.23740000000,2035,R1,gassupply1,2050
+4,4.13670000000,2040,R1,gassupply1,2050
+5,3.86350000000,2045,R1,gassupply1,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 2f57be103..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 8199f0cf7..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,12.17660000000
-1,2035,R1,gassupply1,2025,12.17660000000
-1,2040,R1,gassupply1,2025,12.17660000000
-1,2045,R1,gassupply1,2025,12.17660000000
-1,2050,R1,gassupply1,2025,12.17660000000
-1,2059,R1,gassupply1,2025,12.17660000000
-1,2060,R1,gassupply1,2025,12.17660000000
-1,2064,R1,gassupply1,2025,12.17660000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index fca4d4db3..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,12.17660000000
-1,2035,R1,gassupply1,2025,12.17660000000
-1,2040,R1,gassupply1,2025,12.17660000000
-1,2045,R1,gassupply1,2025,12.17660000000
-1,2050,R1,gassupply1,2025,12.17660000000
-1,2059,R1,gassupply1,2025,12.17660000000
-1,2060,R1,gassupply1,2025,12.17660000000
-1,2064,R1,gassupply1,2025,12.17660000000
-2,2035,R1,gassupply1,2030,14.17140000000
-2,2040,R1,gassupply1,2030,14.17140000000
-2,2045,R1,gassupply1,2030,14.17140000000
-2,2050,R1,gassupply1,2030,14.17140000000
-2,2059,R1,gassupply1,2030,14.17140000000
-2,2060,R1,gassupply1,2030,14.17140000000
-2,2064,R1,gassupply1,2030,14.17140000000
-2,2065,R1,gassupply1,2030,14.17140000000
-2,2069,R1,gassupply1,2030,14.17140000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 6e128e532..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,12.17660000000
-1,2035,R1,gassupply1,2025,12.17660000000
-1,2040,R1,gassupply1,2025,12.17660000000
-1,2045,R1,gassupply1,2025,12.17660000000
-1,2050,R1,gassupply1,2025,12.17660000000
-1,2059,R1,gassupply1,2025,12.17660000000
-1,2060,R1,gassupply1,2025,12.17660000000
-1,2064,R1,gassupply1,2025,12.17660000000
-2,2035,R1,gassupply1,2030,14.17140000000
-2,2040,R1,gassupply1,2030,14.17140000000
-2,2045,R1,gassupply1,2030,14.17140000000
-2,2050,R1,gassupply1,2030,14.17140000000
-2,2059,R1,gassupply1,2030,14.17140000000
-2,2060,R1,gassupply1,2030,14.17140000000
-2,2064,R1,gassupply1,2030,14.17140000000
-2,2065,R1,gassupply1,2030,14.17140000000
-2,2069,R1,gassupply1,2030,14.17140000000
-3,2040,R1,gassupply1,2035,2.23740000000
-3,2045,R1,gassupply1,2035,2.23740000000
-3,2050,R1,gassupply1,2035,2.23740000000
-3,2059,R1,gassupply1,2035,2.23740000000
-3,2060,R1,gassupply1,2035,2.23740000000
-3,2064,R1,gassupply1,2035,2.23740000000
-3,2065,R1,gassupply1,2035,2.23740000000
-3,2069,R1,gassupply1,2035,2.23740000000
-3,2070,R1,gassupply1,2035,2.23740000000
-3,2074,R1,gassupply1,2035,2.23740000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 3c56a41b5..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,47 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,12.17660000000
-1,2035,R1,gassupply1,2025,12.17660000000
-1,2040,R1,gassupply1,2025,12.17660000000
-1,2045,R1,gassupply1,2025,12.17660000000
-1,2050,R1,gassupply1,2025,12.17660000000
-1,2059,R1,gassupply1,2025,12.17660000000
-1,2060,R1,gassupply1,2025,12.17660000000
-1,2064,R1,gassupply1,2025,12.17660000000
-2,2035,R1,gassupply1,2030,14.17140000000
-2,2040,R1,gassupply1,2030,14.17140000000
-2,2045,R1,gassupply1,2030,14.17140000000
-2,2050,R1,gassupply1,2030,14.17140000000
-2,2059,R1,gassupply1,2030,14.17140000000
-2,2060,R1,gassupply1,2030,14.17140000000
-2,2064,R1,gassupply1,2030,14.17140000000
-2,2065,R1,gassupply1,2030,14.17140000000
-2,2069,R1,gassupply1,2030,14.17140000000
-3,2040,R1,gassupply1,2035,2.23740000000
-3,2045,R1,gassupply1,2035,2.23740000000
-3,2050,R1,gassupply1,2035,2.23740000000
-3,2059,R1,gassupply1,2035,2.23740000000
-3,2060,R1,gassupply1,2035,2.23740000000
-3,2064,R1,gassupply1,2035,2.23740000000
-3,2065,R1,gassupply1,2035,2.23740000000
-3,2069,R1,gassupply1,2035,2.23740000000
-3,2070,R1,gassupply1,2035,2.23740000000
-3,2074,R1,gassupply1,2035,2.23740000000
-4,2045,R1,gassupply1,2040,4.13670000000
-4,2050,R1,gassupply1,2040,4.13670000000
-4,2059,R1,gassupply1,2040,4.13670000000
-4,2060,R1,gassupply1,2040,4.13670000000
-4,2064,R1,gassupply1,2040,4.13670000000
-4,2065,R1,gassupply1,2040,4.13670000000
-4,2069,R1,gassupply1,2040,4.13670000000
-4,2070,R1,gassupply1,2040,4.13670000000
-4,2074,R1,gassupply1,2040,4.13670000000
-4,2075,R1,gassupply1,2040,4.13670000000
-4,2079,R1,gassupply1,2040,4.13670000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index bfcbe5612..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,59 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,12.17660000000
-1,2035,R1,gassupply1,2025,12.17660000000
-1,2040,R1,gassupply1,2025,12.17660000000
-1,2045,R1,gassupply1,2025,12.17660000000
-1,2050,R1,gassupply1,2025,12.17660000000
-1,2059,R1,gassupply1,2025,12.17660000000
-1,2060,R1,gassupply1,2025,12.17660000000
-1,2064,R1,gassupply1,2025,12.17660000000
-2,2035,R1,gassupply1,2030,14.17140000000
-2,2040,R1,gassupply1,2030,14.17140000000
-2,2045,R1,gassupply1,2030,14.17140000000
-2,2050,R1,gassupply1,2030,14.17140000000
-2,2059,R1,gassupply1,2030,14.17140000000
-2,2060,R1,gassupply1,2030,14.17140000000
-2,2064,R1,gassupply1,2030,14.17140000000
-2,2065,R1,gassupply1,2030,14.17140000000
-2,2069,R1,gassupply1,2030,14.17140000000
-3,2040,R1,gassupply1,2035,2.23740000000
-3,2045,R1,gassupply1,2035,2.23740000000
-3,2050,R1,gassupply1,2035,2.23740000000
-3,2059,R1,gassupply1,2035,2.23740000000
-3,2060,R1,gassupply1,2035,2.23740000000
-3,2064,R1,gassupply1,2035,2.23740000000
-3,2065,R1,gassupply1,2035,2.23740000000
-3,2069,R1,gassupply1,2035,2.23740000000
-3,2070,R1,gassupply1,2035,2.23740000000
-3,2074,R1,gassupply1,2035,2.23740000000
-4,2045,R1,gassupply1,2040,4.13670000000
-4,2050,R1,gassupply1,2040,4.13670000000
-4,2059,R1,gassupply1,2040,4.13670000000
-4,2060,R1,gassupply1,2040,4.13670000000
-4,2064,R1,gassupply1,2040,4.13670000000
-4,2065,R1,gassupply1,2040,4.13670000000
-4,2069,R1,gassupply1,2040,4.13670000000
-4,2070,R1,gassupply1,2040,4.13670000000
-4,2074,R1,gassupply1,2040,4.13670000000
-4,2075,R1,gassupply1,2040,4.13670000000
-4,2079,R1,gassupply1,2040,4.13670000000
-5,2050,R1,gassupply1,2045,3.86350000000
-5,2059,R1,gassupply1,2045,3.86350000000
-5,2060,R1,gassupply1,2045,3.86350000000
-5,2064,R1,gassupply1,2045,3.86350000000
-5,2065,R1,gassupply1,2045,3.86350000000
-5,2069,R1,gassupply1,2045,3.86350000000
-5,2070,R1,gassupply1,2045,3.86350000000
-5,2074,R1,gassupply1,2045,3.86350000000
-5,2075,R1,gassupply1,2045,3.86350000000
-5,2079,R1,gassupply1,2045,3.86350000000
-5,2080,R1,gassupply1,2045,3.86350000000
-5,2084,R1,gassupply1,2045,3.86350000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 9670c0e07..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,79 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2055,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,12.17660000000
-1,2035,R1,gassupply1,2025,12.17660000000
-1,2040,R1,gassupply1,2025,12.17660000000
-1,2045,R1,gassupply1,2025,12.17660000000
-1,2050,R1,gassupply1,2025,12.17660000000
-1,2055,R1,gassupply1,2025,12.17660000000
-1,2059,R1,gassupply1,2025,12.17660000000
-1,2060,R1,gassupply1,2025,12.17660000000
-1,2064,R1,gassupply1,2025,12.17660000000
-2,2035,R1,gassupply1,2030,14.17140000000
-2,2040,R1,gassupply1,2030,14.17140000000
-2,2045,R1,gassupply1,2030,14.17140000000
-2,2050,R1,gassupply1,2030,14.17140000000
-2,2055,R1,gassupply1,2030,14.17140000000
-2,2059,R1,gassupply1,2030,14.17140000000
-2,2060,R1,gassupply1,2030,14.17140000000
-2,2064,R1,gassupply1,2030,14.17140000000
-2,2065,R1,gassupply1,2030,14.17140000000
-2,2069,R1,gassupply1,2030,14.17140000000
-3,2040,R1,gassupply1,2035,2.23740000000
-3,2045,R1,gassupply1,2035,2.23740000000
-3,2050,R1,gassupply1,2035,2.23740000000
-3,2055,R1,gassupply1,2035,2.23740000000
-3,2059,R1,gassupply1,2035,2.23740000000
-3,2060,R1,gassupply1,2035,2.23740000000
-3,2064,R1,gassupply1,2035,2.23740000000
-3,2065,R1,gassupply1,2035,2.23740000000
-3,2069,R1,gassupply1,2035,2.23740000000
-3,2070,R1,gassupply1,2035,2.23740000000
-3,2074,R1,gassupply1,2035,2.23740000000
-4,2045,R1,gassupply1,2040,4.13670000000
-4,2050,R1,gassupply1,2040,4.13670000000
-4,2055,R1,gassupply1,2040,4.13670000000
-4,2059,R1,gassupply1,2040,4.13670000000
-4,2060,R1,gassupply1,2040,4.13670000000
-4,2064,R1,gassupply1,2040,4.13670000000
-4,2065,R1,gassupply1,2040,4.13670000000
-4,2069,R1,gassupply1,2040,4.13670000000
-4,2070,R1,gassupply1,2040,4.13670000000
-4,2074,R1,gassupply1,2040,4.13670000000
-4,2075,R1,gassupply1,2040,4.13670000000
-4,2079,R1,gassupply1,2040,4.13670000000
-5,2050,R1,gassupply1,2045,3.86350000000
-5,2055,R1,gassupply1,2045,3.86350000000
-5,2059,R1,gassupply1,2045,3.86350000000
-5,2060,R1,gassupply1,2045,3.86350000000
-5,2064,R1,gassupply1,2045,3.86350000000
-5,2065,R1,gassupply1,2045,3.86350000000
-5,2069,R1,gassupply1,2045,3.86350000000
-5,2070,R1,gassupply1,2045,3.86350000000
-5,2074,R1,gassupply1,2045,3.86350000000
-5,2075,R1,gassupply1,2045,3.86350000000
-5,2079,R1,gassupply1,2045,3.86350000000
-5,2080,R1,gassupply1,2045,3.86350000000
-5,2084,R1,gassupply1,2045,3.86350000000
-6,2055,R1,gassupply1,2050,0.60370000000
-6,2059,R1,gassupply1,2050,0.60370000000
-6,2060,R1,gassupply1,2050,0.60370000000
-6,2064,R1,gassupply1,2050,0.60370000000
-6,2065,R1,gassupply1,2050,0.60370000000
-6,2069,R1,gassupply1,2050,0.60370000000
-6,2070,R1,gassupply1,2050,0.60370000000
-6,2074,R1,gassupply1,2050,0.60370000000
-6,2075,R1,gassupply1,2050,0.60370000000
-6,2079,R1,gassupply1,2050,0.60370000000
-6,2080,R1,gassupply1,2050,0.60370000000
-6,2084,R1,gassupply1,2050,0.60370000000
-6,2085,R1,gassupply1,2050,0.60370000000
-6,2089,R1,gassupply1,2050,0.60370000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity.csv
new file mode 100644
index 000000000..210c418bb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity.csv
@@ -0,0 +1,36 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+0,2.02780000000,2020,R1,gasCCGT,2025
+2,2.31250000000,2020,R1,windturbine,2025
+0,1.02780000000,2020,R1,gasCCGT,2030
+1,2.75000000000,2025,R1,gasCCGT,2030
+2,2.31250000000,2020,R1,windturbine,2030
+3,6.18750000000,2025,R1,windturbine,2030
+0,1.02780000000,2020,R1,gasCCGT,2035
+1,2.75000000000,2025,R1,gasCCGT,2035
+3,2.31250000000,2020,R1,windturbine,2035
+4,6.18750000000,2025,R1,windturbine,2035
+5,0.37500000000,2030,R1,windturbine,2035
+0,1.02780000000,2020,R1,gasCCGT,2040
+1,2.75000000000,2025,R1,gasCCGT,2040
+2,0.19440000000,2035,R1,gasCCGT,2040
+3,2.31250000000,2020,R1,windturbine,2040
+4,6.18750000000,2025,R1,windturbine,2040
+5,0.37500000000,2030,R1,windturbine,2040
+6,1.68750000000,2035,R1,windturbine,2040
+0,1.02780000000,2020,R1,gasCCGT,2045
+1,2.75000000000,2025,R1,gasCCGT,2045
+2,0.19440000000,2035,R1,gasCCGT,2045
+3,2.31250000000,2020,R1,windturbine,2045
+4,6.18750000000,2025,R1,windturbine,2045
+5,0.37500000000,2030,R1,windturbine,2045
+6,1.68750000000,2035,R1,windturbine,2045
+7,3.00000000000,2040,R1,windturbine,2045
+0,1.02780000000,2020,R1,gasCCGT,2050
+1,2.75000000000,2025,R1,gasCCGT,2050
+2,0.19440000000,2035,R1,gasCCGT,2050
+5,6.18750000000,2025,R1,windturbine,2050
+6,0.37500000000,2030,R1,windturbine,2050
+7,1.68750000000,2035,R1,windturbine,2050
+8,3.00000000000,2040,R1,windturbine,2050
+9,4.90630000000,2045,R1,windturbine,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
deleted file mode 100644
index e46424887..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2025,R1,windturbine,2020,2.31250000000
-1,2030,R1,windturbine,2020,2.31250000000
-1,2035,R1,windturbine,2020,2.31250000000
-1,2040,R1,windturbine,2020,2.31250000000
-1,2045,R1,windturbine,2020,2.31250000000
-1,2049,R1,windturbine,2020,2.31250000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
deleted file mode 100644
index f86c25e29..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,2.75000000000
-1,2035,R1,gasCCGT,2025,2.75000000000
-1,2040,R1,gasCCGT,2025,2.75000000000
-1,2045,R1,gasCCGT,2025,2.75000000000
-1,2049,R1,gasCCGT,2025,2.75000000000
-1,2050,R1,gasCCGT,2025,2.75000000000
-1,2054,R1,gasCCGT,2025,2.75000000000
-1,2055,R1,gasCCGT,2025,2.75000000000
-1,2059,R1,gasCCGT,2025,2.75000000000
-1,2060,R1,gasCCGT,2025,2.75000000000
-1,2064,R1,gasCCGT,2025,2.75000000000
-2,2025,R1,windturbine,2020,2.31250000000
-2,2030,R1,windturbine,2020,2.31250000000
-2,2035,R1,windturbine,2020,2.31250000000
-2,2040,R1,windturbine,2020,2.31250000000
-2,2045,R1,windturbine,2020,2.31250000000
-2,2049,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2025,6.18750000000
-3,2035,R1,windturbine,2025,6.18750000000
-3,2040,R1,windturbine,2025,6.18750000000
-3,2045,R1,windturbine,2025,6.18750000000
-3,2049,R1,windturbine,2025,6.18750000000
-3,2050,R1,windturbine,2025,6.18750000000
-3,2054,R1,windturbine,2025,6.18750000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
deleted file mode 100644
index c6cfd7bd3..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,2.75000000000
-1,2035,R1,gasCCGT,2025,2.75000000000
-1,2040,R1,gasCCGT,2025,2.75000000000
-1,2045,R1,gasCCGT,2025,2.75000000000
-1,2049,R1,gasCCGT,2025,2.75000000000
-1,2050,R1,gasCCGT,2025,2.75000000000
-1,2054,R1,gasCCGT,2025,2.75000000000
-1,2055,R1,gasCCGT,2025,2.75000000000
-1,2059,R1,gasCCGT,2025,2.75000000000
-1,2060,R1,gasCCGT,2025,2.75000000000
-1,2064,R1,gasCCGT,2025,2.75000000000
-2,2025,R1,windturbine,2020,2.31250000000
-2,2030,R1,windturbine,2020,2.31250000000
-2,2035,R1,windturbine,2020,2.31250000000
-2,2040,R1,windturbine,2020,2.31250000000
-2,2045,R1,windturbine,2020,2.31250000000
-2,2049,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2025,6.18750000000
-3,2035,R1,windturbine,2025,6.18750000000
-3,2040,R1,windturbine,2025,6.18750000000
-3,2045,R1,windturbine,2025,6.18750000000
-3,2049,R1,windturbine,2025,6.18750000000
-3,2050,R1,windturbine,2025,6.18750000000
-3,2054,R1,windturbine,2025,6.18750000000
-4,2035,R1,windturbine,2030,0.37500000000
-4,2040,R1,windturbine,2030,0.37500000000
-4,2045,R1,windturbine,2030,0.37500000000
-4,2049,R1,windturbine,2030,0.37500000000
-4,2050,R1,windturbine,2030,0.37500000000
-4,2054,R1,windturbine,2030,0.37500000000
-4,2055,R1,windturbine,2030,0.37500000000
-4,2059,R1,windturbine,2030,0.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
deleted file mode 100644
index b708e6914..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,64 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,2.75000000000
-1,2035,R1,gasCCGT,2025,2.75000000000
-1,2040,R1,gasCCGT,2025,2.75000000000
-1,2045,R1,gasCCGT,2025,2.75000000000
-1,2049,R1,gasCCGT,2025,2.75000000000
-1,2050,R1,gasCCGT,2025,2.75000000000
-1,2054,R1,gasCCGT,2025,2.75000000000
-1,2055,R1,gasCCGT,2025,2.75000000000
-1,2059,R1,gasCCGT,2025,2.75000000000
-1,2060,R1,gasCCGT,2025,2.75000000000
-1,2064,R1,gasCCGT,2025,2.75000000000
-2,2040,R1,gasCCGT,2035,0.19440000000
-2,2045,R1,gasCCGT,2035,0.19440000000
-2,2049,R1,gasCCGT,2035,0.19440000000
-2,2050,R1,gasCCGT,2035,0.19440000000
-2,2054,R1,gasCCGT,2035,0.19440000000
-2,2055,R1,gasCCGT,2035,0.19440000000
-2,2059,R1,gasCCGT,2035,0.19440000000
-2,2060,R1,gasCCGT,2035,0.19440000000
-2,2064,R1,gasCCGT,2035,0.19440000000
-2,2065,R1,gasCCGT,2035,0.19440000000
-2,2074,R1,gasCCGT,2035,0.19440000000
-3,2025,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2020,2.31250000000
-3,2035,R1,windturbine,2020,2.31250000000
-3,2040,R1,windturbine,2020,2.31250000000
-3,2045,R1,windturbine,2020,2.31250000000
-3,2049,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2025,6.18750000000
-4,2035,R1,windturbine,2025,6.18750000000
-4,2040,R1,windturbine,2025,6.18750000000
-4,2045,R1,windturbine,2025,6.18750000000
-4,2049,R1,windturbine,2025,6.18750000000
-4,2050,R1,windturbine,2025,6.18750000000
-4,2054,R1,windturbine,2025,6.18750000000
-5,2035,R1,windturbine,2030,0.37500000000
-5,2040,R1,windturbine,2030,0.37500000000
-5,2045,R1,windturbine,2030,0.37500000000
-5,2049,R1,windturbine,2030,0.37500000000
-5,2050,R1,windturbine,2030,0.37500000000
-5,2054,R1,windturbine,2030,0.37500000000
-5,2055,R1,windturbine,2030,0.37500000000
-5,2059,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2035,1.68750000000
-6,2045,R1,windturbine,2035,1.68750000000
-6,2049,R1,windturbine,2035,1.68750000000
-6,2050,R1,windturbine,2035,1.68750000000
-6,2054,R1,windturbine,2035,1.68750000000
-6,2055,R1,windturbine,2035,1.68750000000
-6,2059,R1,windturbine,2035,1.68750000000
-6,2060,R1,windturbine,2035,1.68750000000
-6,2064,R1,windturbine,2035,1.68750000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 39f135fd6..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,76 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,2.75000000000
-1,2035,R1,gasCCGT,2025,2.75000000000
-1,2040,R1,gasCCGT,2025,2.75000000000
-1,2045,R1,gasCCGT,2025,2.75000000000
-1,2049,R1,gasCCGT,2025,2.75000000000
-1,2050,R1,gasCCGT,2025,2.75000000000
-1,2054,R1,gasCCGT,2025,2.75000000000
-1,2055,R1,gasCCGT,2025,2.75000000000
-1,2059,R1,gasCCGT,2025,2.75000000000
-1,2060,R1,gasCCGT,2025,2.75000000000
-1,2064,R1,gasCCGT,2025,2.75000000000
-2,2040,R1,gasCCGT,2035,0.19440000000
-2,2045,R1,gasCCGT,2035,0.19440000000
-2,2049,R1,gasCCGT,2035,0.19440000000
-2,2050,R1,gasCCGT,2035,0.19440000000
-2,2054,R1,gasCCGT,2035,0.19440000000
-2,2055,R1,gasCCGT,2035,0.19440000000
-2,2059,R1,gasCCGT,2035,0.19440000000
-2,2060,R1,gasCCGT,2035,0.19440000000
-2,2064,R1,gasCCGT,2035,0.19440000000
-2,2065,R1,gasCCGT,2035,0.19440000000
-2,2069,R1,gasCCGT,2035,0.19440000000
-2,2070,R1,gasCCGT,2035,0.19440000000
-2,2074,R1,gasCCGT,2035,0.19440000000
-3,2025,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2020,2.31250000000
-3,2035,R1,windturbine,2020,2.31250000000
-3,2040,R1,windturbine,2020,2.31250000000
-3,2045,R1,windturbine,2020,2.31250000000
-3,2049,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2025,6.18750000000
-4,2035,R1,windturbine,2025,6.18750000000
-4,2040,R1,windturbine,2025,6.18750000000
-4,2045,R1,windturbine,2025,6.18750000000
-4,2049,R1,windturbine,2025,6.18750000000
-4,2050,R1,windturbine,2025,6.18750000000
-4,2054,R1,windturbine,2025,6.18750000000
-5,2035,R1,windturbine,2030,0.37500000000
-5,2040,R1,windturbine,2030,0.37500000000
-5,2045,R1,windturbine,2030,0.37500000000
-5,2049,R1,windturbine,2030,0.37500000000
-5,2050,R1,windturbine,2030,0.37500000000
-5,2054,R1,windturbine,2030,0.37500000000
-5,2055,R1,windturbine,2030,0.37500000000
-5,2059,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2035,1.68750000000
-6,2045,R1,windturbine,2035,1.68750000000
-6,2049,R1,windturbine,2035,1.68750000000
-6,2050,R1,windturbine,2035,1.68750000000
-6,2054,R1,windturbine,2035,1.68750000000
-6,2055,R1,windturbine,2035,1.68750000000
-6,2059,R1,windturbine,2035,1.68750000000
-6,2060,R1,windturbine,2035,1.68750000000
-6,2064,R1,windturbine,2035,1.68750000000
-7,2045,R1,windturbine,2040,3.00000000000
-7,2049,R1,windturbine,2040,3.00000000000
-7,2050,R1,windturbine,2040,3.00000000000
-7,2054,R1,windturbine,2040,3.00000000000
-7,2055,R1,windturbine,2040,3.00000000000
-7,2059,R1,windturbine,2040,3.00000000000
-7,2060,R1,windturbine,2040,3.00000000000
-7,2064,R1,windturbine,2040,3.00000000000
-7,2065,R1,windturbine,2040,3.00000000000
-7,2069,R1,windturbine,2040,3.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
deleted file mode 100644
index f245616ec..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,87 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,2.75000000000
-1,2035,R1,gasCCGT,2025,2.75000000000
-1,2040,R1,gasCCGT,2025,2.75000000000
-1,2045,R1,gasCCGT,2025,2.75000000000
-1,2049,R1,gasCCGT,2025,2.75000000000
-1,2050,R1,gasCCGT,2025,2.75000000000
-1,2054,R1,gasCCGT,2025,2.75000000000
-1,2055,R1,gasCCGT,2025,2.75000000000
-1,2059,R1,gasCCGT,2025,2.75000000000
-1,2060,R1,gasCCGT,2025,2.75000000000
-1,2064,R1,gasCCGT,2025,2.75000000000
-2,2040,R1,gasCCGT,2035,0.19440000000
-2,2045,R1,gasCCGT,2035,0.19440000000
-2,2049,R1,gasCCGT,2035,0.19440000000
-2,2050,R1,gasCCGT,2035,0.19440000000
-2,2054,R1,gasCCGT,2035,0.19440000000
-2,2055,R1,gasCCGT,2035,0.19440000000
-2,2059,R1,gasCCGT,2035,0.19440000000
-2,2060,R1,gasCCGT,2035,0.19440000000
-2,2064,R1,gasCCGT,2035,0.19440000000
-2,2065,R1,gasCCGT,2035,0.19440000000
-2,2069,R1,gasCCGT,2035,0.19440000000
-2,2070,R1,gasCCGT,2035,0.19440000000
-2,2074,R1,gasCCGT,2035,0.19440000000
-3,2025,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2020,2.31250000000
-3,2035,R1,windturbine,2020,2.31250000000
-3,2040,R1,windturbine,2020,2.31250000000
-3,2045,R1,windturbine,2020,2.31250000000
-3,2049,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2025,6.18750000000
-4,2035,R1,windturbine,2025,6.18750000000
-4,2040,R1,windturbine,2025,6.18750000000
-4,2045,R1,windturbine,2025,6.18750000000
-4,2049,R1,windturbine,2025,6.18750000000
-4,2050,R1,windturbine,2025,6.18750000000
-4,2054,R1,windturbine,2025,6.18750000000
-5,2035,R1,windturbine,2030,0.37500000000
-5,2040,R1,windturbine,2030,0.37500000000
-5,2045,R1,windturbine,2030,0.37500000000
-5,2049,R1,windturbine,2030,0.37500000000
-5,2050,R1,windturbine,2030,0.37500000000
-5,2054,R1,windturbine,2030,0.37500000000
-5,2055,R1,windturbine,2030,0.37500000000
-5,2059,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2035,1.68750000000
-6,2045,R1,windturbine,2035,1.68750000000
-6,2049,R1,windturbine,2035,1.68750000000
-6,2050,R1,windturbine,2035,1.68750000000
-6,2054,R1,windturbine,2035,1.68750000000
-6,2055,R1,windturbine,2035,1.68750000000
-6,2059,R1,windturbine,2035,1.68750000000
-6,2060,R1,windturbine,2035,1.68750000000
-6,2064,R1,windturbine,2035,1.68750000000
-7,2045,R1,windturbine,2040,3.00000000000
-7,2049,R1,windturbine,2040,3.00000000000
-7,2050,R1,windturbine,2040,3.00000000000
-7,2054,R1,windturbine,2040,3.00000000000
-7,2055,R1,windturbine,2040,3.00000000000
-7,2059,R1,windturbine,2040,3.00000000000
-7,2060,R1,windturbine,2040,3.00000000000
-7,2064,R1,windturbine,2040,3.00000000000
-7,2065,R1,windturbine,2040,3.00000000000
-7,2069,R1,windturbine,2040,3.00000000000
-8,2049,R1,windturbine,2045,1.20000000000
-8,2050,R1,windturbine,2045,4.90630000000
-8,2054,R1,windturbine,2045,4.90630000000
-8,2055,R1,windturbine,2045,4.90630000000
-8,2059,R1,windturbine,2045,4.90630000000
-8,2060,R1,windturbine,2045,4.90630000000
-8,2064,R1,windturbine,2045,4.90630000000
-8,2065,R1,windturbine,2045,4.90630000000
-8,2069,R1,windturbine,2045,4.90630000000
-8,2070,R1,windturbine,2045,4.90630000000
-8,2074,R1,windturbine,2045,4.90630000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 64f6cd647..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,109 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,2.75000000000
-1,2035,R1,gasCCGT,2025,2.75000000000
-1,2040,R1,gasCCGT,2025,2.75000000000
-1,2045,R1,gasCCGT,2025,2.75000000000
-1,2049,R1,gasCCGT,2025,2.75000000000
-1,2050,R1,gasCCGT,2025,2.75000000000
-1,2054,R1,gasCCGT,2025,2.75000000000
-1,2055,R1,gasCCGT,2025,2.75000000000
-1,2059,R1,gasCCGT,2025,2.75000000000
-1,2060,R1,gasCCGT,2025,2.75000000000
-1,2064,R1,gasCCGT,2025,2.75000000000
-2,2040,R1,gasCCGT,2035,0.19440000000
-2,2045,R1,gasCCGT,2035,0.19440000000
-2,2049,R1,gasCCGT,2035,0.19440000000
-2,2050,R1,gasCCGT,2035,0.19440000000
-2,2054,R1,gasCCGT,2035,0.19440000000
-2,2055,R1,gasCCGT,2035,0.19440000000
-2,2059,R1,gasCCGT,2035,0.19440000000
-2,2060,R1,gasCCGT,2035,0.19440000000
-2,2064,R1,gasCCGT,2035,0.19440000000
-2,2065,R1,gasCCGT,2035,0.19440000000
-2,2069,R1,gasCCGT,2035,0.19440000000
-2,2070,R1,gasCCGT,2035,0.19440000000
-2,2074,R1,gasCCGT,2035,0.19440000000
-3,2055,R1,gasCCGT,2050,0.17360000000
-3,2059,R1,gasCCGT,2050,0.17360000000
-3,2060,R1,gasCCGT,2050,0.17360000000
-3,2064,R1,gasCCGT,2050,0.17360000000
-3,2065,R1,gasCCGT,2050,0.17360000000
-3,2069,R1,gasCCGT,2050,0.17360000000
-3,2070,R1,gasCCGT,2050,0.17360000000
-3,2074,R1,gasCCGT,2050,0.17360000000
-3,2075,R1,gasCCGT,2050,0.17360000000
-3,2079,R1,gasCCGT,2050,0.17360000000
-3,2080,R1,gasCCGT,2050,0.17360000000
-3,2089,R1,gasCCGT,2050,0.17360000000
-4,2025,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2020,2.31250000000
-4,2035,R1,windturbine,2020,2.31250000000
-4,2040,R1,windturbine,2020,2.31250000000
-4,2045,R1,windturbine,2020,2.31250000000
-4,2049,R1,windturbine,2020,2.31250000000
-5,2030,R1,windturbine,2025,6.18750000000
-5,2035,R1,windturbine,2025,6.18750000000
-5,2040,R1,windturbine,2025,6.18750000000
-5,2045,R1,windturbine,2025,6.18750000000
-5,2049,R1,windturbine,2025,6.18750000000
-5,2050,R1,windturbine,2025,6.18750000000
-5,2054,R1,windturbine,2025,6.18750000000
-6,2035,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2030,0.37500000000
-6,2045,R1,windturbine,2030,0.37500000000
-6,2049,R1,windturbine,2030,0.37500000000
-6,2050,R1,windturbine,2030,0.37500000000
-6,2054,R1,windturbine,2030,0.37500000000
-6,2055,R1,windturbine,2030,0.37500000000
-6,2059,R1,windturbine,2030,0.37500000000
-7,2040,R1,windturbine,2035,1.68750000000
-7,2045,R1,windturbine,2035,1.68750000000
-7,2049,R1,windturbine,2035,1.68750000000
-7,2050,R1,windturbine,2035,1.68750000000
-7,2054,R1,windturbine,2035,1.68750000000
-7,2055,R1,windturbine,2035,1.68750000000
-7,2059,R1,windturbine,2035,1.68750000000
-7,2060,R1,windturbine,2035,1.68750000000
-7,2064,R1,windturbine,2035,1.68750000000
-8,2045,R1,windturbine,2040,3.00000000000
-8,2049,R1,windturbine,2040,3.00000000000
-8,2050,R1,windturbine,2040,3.00000000000
-8,2054,R1,windturbine,2040,3.00000000000
-8,2055,R1,windturbine,2040,3.00000000000
-8,2059,R1,windturbine,2040,3.00000000000
-8,2060,R1,windturbine,2040,3.00000000000
-8,2064,R1,windturbine,2040,3.00000000000
-8,2065,R1,windturbine,2040,3.00000000000
-8,2069,R1,windturbine,2040,3.00000000000
-9,2049,R1,windturbine,2045,1.20000000000
-9,2050,R1,windturbine,2045,4.90630000000
-9,2054,R1,windturbine,2045,4.90630000000
-9,2055,R1,windturbine,2045,4.90630000000
-9,2059,R1,windturbine,2045,4.90630000000
-9,2060,R1,windturbine,2045,4.90630000000
-9,2064,R1,windturbine,2045,4.90630000000
-9,2065,R1,windturbine,2045,4.90630000000
-9,2069,R1,windturbine,2045,4.90630000000
-9,2070,R1,windturbine,2045,4.90630000000
-9,2074,R1,windturbine,2045,4.90630000000
-10,2055,R1,windturbine,2050,10.00000000000
-10,2059,R1,windturbine,2050,10.00000000000
-10,2060,R1,windturbine,2050,10.00000000000
-10,2064,R1,windturbine,2050,10.00000000000
-10,2065,R1,windturbine,2050,10.00000000000
-10,2069,R1,windturbine,2050,10.00000000000
-10,2070,R1,windturbine,2050,10.00000000000
-10,2074,R1,windturbine,2050,10.00000000000
-10,2075,R1,windturbine,2050,10.00000000000
-10,2079,R1,windturbine,2050,10.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..35be9de91
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity.csv
@@ -0,0 +1,24 @@
+asset,capacity,installed,region,technology,year
+0,10.00000000000,2020,R1,gasboiler,2020
+0,12.50000000000,2020,R1,gasboiler,2025
+2,11.50000000000,2020,R1,heatpump,2025
+0,7.50000000000,2020,R1,gasboiler,2030
+1,5.50000000000,2025,R1,gasboiler,2030
+3,11.50000000000,2020,R1,heatpump,2030
+4,5.50000000000,2025,R1,heatpump,2030
+1,5.50000000000,2025,R1,gasboiler,2035
+2,12.50000000000,2030,R1,gasboiler,2035
+5,5.50000000000,2025,R1,heatpump,2035
+6,12.50000000000,2030,R1,heatpump,2035
+2,12.50000000000,2030,R1,gasboiler,2040
+3,8.50000000000,2035,R1,gasboiler,2040
+7,12.50000000000,2030,R1,heatpump,2040
+8,8.50000000000,2035,R1,heatpump,2040
+3,8.50000000000,2035,R1,gasboiler,2045
+4,15.50000000000,2040,R1,gasboiler,2045
+9,8.50000000000,2035,R1,heatpump,2045
+10,15.50000000000,2040,R1,heatpump,2045
+4,15.50000000000,2040,R1,gasboiler,2050
+5,11.50000000000,2045,R1,gasboiler,2050
+11,15.50000000000,2040,R1,heatpump,2050
+12,11.50000000000,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 6c7acc17e..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2025,R1,heatpump,2020,11.50000000000
-1,2030,R1,heatpump,2020,11.50000000000
-1,2034,R1,heatpump,2020,11.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index f5dd92fa6..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,5.50000000000
-1,2034,R1,gasboiler,2025,5.50000000000
-1,2035,R1,gasboiler,2025,5.50000000000
-1,2039,R1,gasboiler,2025,5.50000000000
-2,2025,R1,heatpump,2020,11.50000000000
-2,2030,R1,heatpump,2020,11.50000000000
-2,2034,R1,heatpump,2020,11.50000000000
-3,2030,R1,heatpump,2025,5.50000000000
-3,2034,R1,heatpump,2025,5.50000000000
-3,2035,R1,heatpump,2025,5.50000000000
-3,2039,R1,heatpump,2025,5.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index cf72eaf55..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,5.50000000000
-1,2034,R1,gasboiler,2025,5.50000000000
-1,2035,R1,gasboiler,2025,5.50000000000
-1,2039,R1,gasboiler,2025,5.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2025,R1,heatpump,2020,11.50000000000
-3,2030,R1,heatpump,2020,11.50000000000
-3,2034,R1,heatpump,2020,11.50000000000
-4,2030,R1,heatpump,2025,5.50000000000
-4,2034,R1,heatpump,2025,5.50000000000
-4,2035,R1,heatpump,2025,5.50000000000
-4,2039,R1,heatpump,2025,5.50000000000
-5,2035,R1,heatpump,2030,12.50000000000
-5,2039,R1,heatpump,2030,12.50000000000
-5,2040,R1,heatpump,2030,12.50000000000
-5,2044,R1,heatpump,2030,12.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 12ddb0e95..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,32 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,5.50000000000
-1,2034,R1,gasboiler,2025,5.50000000000
-1,2035,R1,gasboiler,2025,5.50000000000
-1,2039,R1,gasboiler,2025,5.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,8.50000000000
-3,2044,R1,gasboiler,2035,8.50000000000
-3,2045,R1,gasboiler,2035,8.50000000000
-3,2049,R1,gasboiler,2035,8.50000000000
-4,2025,R1,heatpump,2020,11.50000000000
-4,2030,R1,heatpump,2020,11.50000000000
-4,2034,R1,heatpump,2020,11.50000000000
-5,2030,R1,heatpump,2025,5.50000000000
-5,2034,R1,heatpump,2025,5.50000000000
-5,2035,R1,heatpump,2025,5.50000000000
-5,2039,R1,heatpump,2025,5.50000000000
-6,2035,R1,heatpump,2030,12.50000000000
-6,2039,R1,heatpump,2030,12.50000000000
-6,2040,R1,heatpump,2030,12.50000000000
-6,2044,R1,heatpump,2030,12.50000000000
-7,2040,R1,heatpump,2035,8.50000000000
-7,2044,R1,heatpump,2035,8.50000000000
-7,2045,R1,heatpump,2035,8.50000000000
-7,2049,R1,heatpump,2035,8.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index b23ff351e..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,40 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,5.50000000000
-1,2034,R1,gasboiler,2025,5.50000000000
-1,2035,R1,gasboiler,2025,5.50000000000
-1,2039,R1,gasboiler,2025,5.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,8.50000000000
-3,2044,R1,gasboiler,2035,8.50000000000
-3,2045,R1,gasboiler,2035,8.50000000000
-3,2049,R1,gasboiler,2035,8.50000000000
-4,2045,R1,gasboiler,2040,15.50000000000
-4,2049,R1,gasboiler,2040,15.50000000000
-4,2050,R1,gasboiler,2040,15.50000000000
-4,2054,R1,gasboiler,2040,15.50000000000
-5,2025,R1,heatpump,2020,11.50000000000
-5,2030,R1,heatpump,2020,11.50000000000
-5,2034,R1,heatpump,2020,11.50000000000
-6,2030,R1,heatpump,2025,5.50000000000
-6,2034,R1,heatpump,2025,5.50000000000
-6,2035,R1,heatpump,2025,5.50000000000
-6,2039,R1,heatpump,2025,5.50000000000
-7,2035,R1,heatpump,2030,12.50000000000
-7,2039,R1,heatpump,2030,12.50000000000
-7,2040,R1,heatpump,2030,12.50000000000
-7,2044,R1,heatpump,2030,12.50000000000
-8,2040,R1,heatpump,2035,8.50000000000
-8,2044,R1,heatpump,2035,8.50000000000
-8,2045,R1,heatpump,2035,8.50000000000
-8,2049,R1,heatpump,2035,8.50000000000
-9,2045,R1,heatpump,2040,15.50000000000
-9,2049,R1,heatpump,2040,15.50000000000
-9,2050,R1,heatpump,2040,15.50000000000
-9,2054,R1,heatpump,2040,15.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 15949c1b2..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,48 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,5.50000000000
-1,2034,R1,gasboiler,2025,5.50000000000
-1,2035,R1,gasboiler,2025,5.50000000000
-1,2039,R1,gasboiler,2025,5.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,8.50000000000
-3,2044,R1,gasboiler,2035,8.50000000000
-3,2045,R1,gasboiler,2035,8.50000000000
-3,2049,R1,gasboiler,2035,8.50000000000
-4,2045,R1,gasboiler,2040,15.50000000000
-4,2049,R1,gasboiler,2040,15.50000000000
-4,2050,R1,gasboiler,2040,15.50000000000
-4,2054,R1,gasboiler,2040,15.50000000000
-5,2050,R1,gasboiler,2045,11.50000000000
-5,2054,R1,gasboiler,2045,11.50000000000
-5,2055,R1,gasboiler,2045,11.50000000000
-5,2059,R1,gasboiler,2045,11.50000000000
-6,2025,R1,heatpump,2020,11.50000000000
-6,2030,R1,heatpump,2020,11.50000000000
-6,2034,R1,heatpump,2020,11.50000000000
-7,2030,R1,heatpump,2025,5.50000000000
-7,2034,R1,heatpump,2025,5.50000000000
-7,2035,R1,heatpump,2025,5.50000000000
-7,2039,R1,heatpump,2025,5.50000000000
-8,2035,R1,heatpump,2030,12.50000000000
-8,2039,R1,heatpump,2030,12.50000000000
-8,2040,R1,heatpump,2030,12.50000000000
-8,2044,R1,heatpump,2030,12.50000000000
-9,2040,R1,heatpump,2035,8.50000000000
-9,2044,R1,heatpump,2035,8.50000000000
-9,2045,R1,heatpump,2035,8.50000000000
-9,2049,R1,heatpump,2035,8.50000000000
-10,2045,R1,heatpump,2040,15.50000000000
-10,2049,R1,heatpump,2040,15.50000000000
-10,2050,R1,heatpump,2040,15.50000000000
-10,2054,R1,heatpump,2040,15.50000000000
-11,2050,R1,heatpump,2045,11.50000000000
-11,2054,R1,heatpump,2045,11.50000000000
-11,2055,R1,heatpump,2045,11.50000000000
-11,2059,R1,heatpump,2045,11.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index dc067eb38..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,56 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,5.50000000000
-1,2034,R1,gasboiler,2025,5.50000000000
-1,2035,R1,gasboiler,2025,5.50000000000
-1,2039,R1,gasboiler,2025,5.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,8.50000000000
-3,2044,R1,gasboiler,2035,8.50000000000
-3,2045,R1,gasboiler,2035,8.50000000000
-3,2049,R1,gasboiler,2035,8.50000000000
-4,2045,R1,gasboiler,2040,15.50000000000
-4,2049,R1,gasboiler,2040,15.50000000000
-4,2050,R1,gasboiler,2040,15.50000000000
-4,2054,R1,gasboiler,2040,15.50000000000
-5,2050,R1,gasboiler,2045,11.50000000000
-5,2054,R1,gasboiler,2045,11.50000000000
-5,2055,R1,gasboiler,2045,11.50000000000
-5,2059,R1,gasboiler,2045,11.50000000000
-6,2055,R1,gasboiler,2050,15.50000000000
-6,2059,R1,gasboiler,2050,15.50000000000
-6,2060,R1,gasboiler,2050,15.50000000000
-6,2064,R1,gasboiler,2050,15.50000000000
-7,2025,R1,heatpump,2020,11.50000000000
-7,2030,R1,heatpump,2020,11.50000000000
-7,2034,R1,heatpump,2020,11.50000000000
-8,2030,R1,heatpump,2025,5.50000000000
-8,2034,R1,heatpump,2025,5.50000000000
-8,2035,R1,heatpump,2025,5.50000000000
-8,2039,R1,heatpump,2025,5.50000000000
-9,2035,R1,heatpump,2030,12.50000000000
-9,2039,R1,heatpump,2030,12.50000000000
-9,2040,R1,heatpump,2030,12.50000000000
-9,2044,R1,heatpump,2030,12.50000000000
-10,2040,R1,heatpump,2035,8.50000000000
-10,2044,R1,heatpump,2035,8.50000000000
-10,2045,R1,heatpump,2035,8.50000000000
-10,2049,R1,heatpump,2035,8.50000000000
-11,2045,R1,heatpump,2040,15.50000000000
-11,2049,R1,heatpump,2040,15.50000000000
-11,2050,R1,heatpump,2040,15.50000000000
-11,2054,R1,heatpump,2040,15.50000000000
-12,2050,R1,heatpump,2045,11.50000000000
-12,2054,R1,heatpump,2045,11.50000000000
-12,2055,R1,heatpump,2045,11.50000000000
-12,2059,R1,heatpump,2045,11.50000000000
-13,2055,R1,heatpump,2050,15.50000000000
-13,2059,R1,heatpump,2050,15.50000000000
-13,2060,R1,heatpump,2050,15.50000000000
-13,2064,R1,heatpump,2050,15.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply.csv
new file mode 100644
index 000000000..1c356b3e8
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply.csv
@@ -0,0 +1,211 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.69440000000,gasboiler,0,2025
+2,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,44.93750000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,1.04170000000,gasboiler,1,2025
+2,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,67.40620000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.69440000000,gasboiler,2,2025
+2,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,44.93750000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,1.04170000000,gasboiler,3,2025
+2,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,67.40620000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,2.08330000000,gasboiler,4,2025
+2,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,134.81250000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,1.38890000000,gasboiler,5,2025
+2,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,89.87500000000,gasboiler,5,2025
+0,heat,all-week,night,2020,all-year,R1,0.41670000000,gasboiler,0,2030
+1,heat,all-week,night,2025,all-year,R1,0.30560000000,gasboiler,0,2030
+3,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2030
+4,heat,all-week,night,2025,all-year,R1,0.30560000000,heatpump,0,2030
+0,CO2f,all-week,night,2020,all-year,R1,26.96250000000,gasboiler,0,2030
+1,CO2f,all-week,night,2025,all-year,R1,19.77250000000,gasboiler,0,2030
+0,heat,all-week,morning,2020,all-year,R1,0.62500000000,gasboiler,1,2030
+1,heat,all-week,morning,2025,all-year,R1,0.45830000000,gasboiler,1,2030
+3,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2030
+4,heat,all-week,morning,2025,all-year,R1,0.45830000000,heatpump,1,2030
+0,CO2f,all-week,morning,2020,all-year,R1,40.44370000000,gasboiler,1,2030
+1,CO2f,all-week,morning,2025,all-year,R1,29.65870000000,gasboiler,1,2030
+0,heat,all-week,afternoon,2020,all-year,R1,0.41670000000,gasboiler,2,2030
+1,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,gasboiler,2,2030
+3,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2030
+4,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,heatpump,2,2030
+0,CO2f,all-week,afternoon,2020,all-year,R1,26.96250000000,gasboiler,2,2030
+1,CO2f,all-week,afternoon,2025,all-year,R1,19.77250000000,gasboiler,2,2030
+0,heat,all-week,early-peak,2020,all-year,R1,0.62500000000,gasboiler,3,2030
+1,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,gasboiler,3,2030
+3,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2030
+4,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,heatpump,3,2030
+0,CO2f,all-week,early-peak,2020,all-year,R1,40.44370000000,gasboiler,3,2030
+1,CO2f,all-week,early-peak,2025,all-year,R1,29.65870000000,gasboiler,3,2030
+0,heat,all-week,late-peak,2020,all-year,R1,1.25000000000,gasboiler,4,2030
+1,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,gasboiler,4,2030
+3,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2030
+4,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,heatpump,4,2030
+0,CO2f,all-week,late-peak,2020,all-year,R1,80.88750000000,gasboiler,4,2030
+1,CO2f,all-week,late-peak,2025,all-year,R1,59.31750000000,gasboiler,4,2030
+0,heat,all-week,evening,2020,all-year,R1,0.83330000000,gasboiler,5,2030
+1,heat,all-week,evening,2025,all-year,R1,0.61110000000,gasboiler,5,2030
+3,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2030
+4,heat,all-week,evening,2025,all-year,R1,0.61110000000,heatpump,5,2030
+0,CO2f,all-week,evening,2020,all-year,R1,53.92500000000,gasboiler,5,2030
+1,CO2f,all-week,evening,2025,all-year,R1,39.54500000000,gasboiler,5,2030
+1,heat,all-week,night,2025,all-year,R1,0.30560000000,gasboiler,0,2035
+2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2035
+5,heat,all-week,night,2025,all-year,R1,0.30560000000,heatpump,0,2035
+6,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2035
+1,CO2f,all-week,night,2025,all-year,R1,19.77250000000,gasboiler,0,2035
+2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2035
+1,heat,all-week,morning,2025,all-year,R1,0.45830000000,gasboiler,1,2035
+2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2035
+5,heat,all-week,morning,2025,all-year,R1,0.45830000000,heatpump,1,2035
+6,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2035
+1,CO2f,all-week,morning,2025,all-year,R1,29.65870000000,gasboiler,1,2035
+2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2035
+1,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,gasboiler,2,2035
+2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2035
+5,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,heatpump,2,2035
+6,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2035
+1,CO2f,all-week,afternoon,2025,all-year,R1,19.77250000000,gasboiler,2,2035
+2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2035
+1,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,gasboiler,3,2035
+2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2035
+5,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,heatpump,3,2035
+6,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2035
+1,CO2f,all-week,early-peak,2025,all-year,R1,29.65870000000,gasboiler,3,2035
+2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2035
+1,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,gasboiler,4,2035
+2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2035
+5,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,heatpump,4,2035
+6,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2035
+1,CO2f,all-week,late-peak,2025,all-year,R1,59.31750000000,gasboiler,4,2035
+2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2035
+1,heat,all-week,evening,2025,all-year,R1,0.61110000000,gasboiler,5,2035
+2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2035
+5,heat,all-week,evening,2025,all-year,R1,0.61110000000,heatpump,5,2035
+6,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2035
+1,CO2f,all-week,evening,2025,all-year,R1,39.54500000000,gasboiler,5,2035
+2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2035
+2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2040
+3,heat,all-week,night,2035,all-year,R1,0.47220000000,gasboiler,0,2040
+7,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2040
+8,heat,all-week,night,2035,all-year,R1,0.47220000000,heatpump,0,2040
+2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2040
+3,CO2f,all-week,night,2035,all-year,R1,30.55750000000,gasboiler,0,2040
+2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2040
+3,heat,all-week,morning,2035,all-year,R1,0.70830000000,gasboiler,1,2040
+7,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2040
+8,heat,all-week,morning,2035,all-year,R1,0.70830000000,heatpump,1,2040
+2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2040
+3,CO2f,all-week,morning,2035,all-year,R1,45.83620000000,gasboiler,1,2040
+2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2040
+3,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,gasboiler,2,2040
+7,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2040
+8,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,heatpump,2,2040
+2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2040
+3,CO2f,all-week,afternoon,2035,all-year,R1,30.55750000000,gasboiler,2,2040
+2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2040
+3,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,gasboiler,3,2040
+7,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2040
+8,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,heatpump,3,2040
+2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2040
+3,CO2f,all-week,early-peak,2035,all-year,R1,45.83620000000,gasboiler,3,2040
+2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2040
+3,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,gasboiler,4,2040
+7,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2040
+8,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,heatpump,4,2040
+2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2040
+3,CO2f,all-week,late-peak,2035,all-year,R1,91.67250000000,gasboiler,4,2040
+2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2040
+3,heat,all-week,evening,2035,all-year,R1,0.94440000000,gasboiler,5,2040
+7,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2040
+8,heat,all-week,evening,2035,all-year,R1,0.94440000000,heatpump,5,2040
+2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2040
+3,CO2f,all-week,evening,2035,all-year,R1,61.11500000000,gasboiler,5,2040
+3,heat,all-week,night,2035,all-year,R1,0.47220000000,gasboiler,0,2045
+4,heat,all-week,night,2040,all-year,R1,0.86110000000,gasboiler,0,2045
+9,heat,all-week,night,2035,all-year,R1,0.47220000000,heatpump,0,2045
+10,heat,all-week,night,2040,all-year,R1,0.86110000000,heatpump,0,2045
+3,CO2f,all-week,night,2035,all-year,R1,30.55750000000,gasboiler,0,2045
+4,CO2f,all-week,night,2040,all-year,R1,55.72250000000,gasboiler,0,2045
+3,heat,all-week,morning,2035,all-year,R1,0.70830000000,gasboiler,1,2045
+4,heat,all-week,morning,2040,all-year,R1,1.29170000000,gasboiler,1,2045
+9,heat,all-week,morning,2035,all-year,R1,0.70830000000,heatpump,1,2045
+10,heat,all-week,morning,2040,all-year,R1,1.29170000000,heatpump,1,2045
+3,CO2f,all-week,morning,2035,all-year,R1,45.83620000000,gasboiler,1,2045
+4,CO2f,all-week,morning,2040,all-year,R1,83.58380000000,gasboiler,1,2045
+3,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,gasboiler,2,2045
+4,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,gasboiler,2,2045
+9,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,heatpump,2,2045
+10,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,heatpump,2,2045
+3,CO2f,all-week,afternoon,2035,all-year,R1,30.55750000000,gasboiler,2,2045
+4,CO2f,all-week,afternoon,2040,all-year,R1,55.72250000000,gasboiler,2,2045
+3,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,gasboiler,3,2045
+4,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,gasboiler,3,2045
+9,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,heatpump,3,2045
+10,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,heatpump,3,2045
+3,CO2f,all-week,early-peak,2035,all-year,R1,45.83620000000,gasboiler,3,2045
+4,CO2f,all-week,early-peak,2040,all-year,R1,83.58380000000,gasboiler,3,2045
+3,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,gasboiler,4,2045
+4,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,gasboiler,4,2045
+9,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,heatpump,4,2045
+10,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,heatpump,4,2045
+3,CO2f,all-week,late-peak,2035,all-year,R1,91.67250000000,gasboiler,4,2045
+4,CO2f,all-week,late-peak,2040,all-year,R1,167.16750000000,gasboiler,4,2045
+3,heat,all-week,evening,2035,all-year,R1,0.94440000000,gasboiler,5,2045
+4,heat,all-week,evening,2040,all-year,R1,1.72220000000,gasboiler,5,2045
+9,heat,all-week,evening,2035,all-year,R1,0.94440000000,heatpump,5,2045
+10,heat,all-week,evening,2040,all-year,R1,1.72220000000,heatpump,5,2045
+3,CO2f,all-week,evening,2035,all-year,R1,61.11500000000,gasboiler,5,2045
+4,CO2f,all-week,evening,2040,all-year,R1,111.44500000000,gasboiler,5,2045
+4,heat,all-week,night,2040,all-year,R1,0.86110000000,gasboiler,0,2050
+5,heat,all-week,night,2045,all-year,R1,0.63890000000,gasboiler,0,2050
+11,heat,all-week,night,2040,all-year,R1,0.86110000000,heatpump,0,2050
+12,heat,all-week,night,2045,all-year,R1,0.63890000000,heatpump,0,2050
+4,CO2f,all-week,night,2040,all-year,R1,55.72250000000,gasboiler,0,2050
+5,CO2f,all-week,night,2045,all-year,R1,41.34250000000,gasboiler,0,2050
+4,heat,all-week,morning,2040,all-year,R1,1.29170000000,gasboiler,1,2050
+5,heat,all-week,morning,2045,all-year,R1,0.95830000000,gasboiler,1,2050
+11,heat,all-week,morning,2040,all-year,R1,1.29170000000,heatpump,1,2050
+12,heat,all-week,morning,2045,all-year,R1,0.95830000000,heatpump,1,2050
+4,CO2f,all-week,morning,2040,all-year,R1,83.58380000000,gasboiler,1,2050
+5,CO2f,all-week,morning,2045,all-year,R1,62.01370000000,gasboiler,1,2050
+4,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,gasboiler,2,2050
+5,heat,all-week,afternoon,2045,all-year,R1,0.63890000000,gasboiler,2,2050
+11,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,heatpump,2,2050
+12,heat,all-week,afternoon,2045,all-year,R1,0.63890000000,heatpump,2,2050
+4,CO2f,all-week,afternoon,2040,all-year,R1,55.72250000000,gasboiler,2,2050
+5,CO2f,all-week,afternoon,2045,all-year,R1,41.34250000000,gasboiler,2,2050
+4,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,gasboiler,3,2050
+5,heat,all-week,early-peak,2045,all-year,R1,0.95830000000,gasboiler,3,2050
+11,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,heatpump,3,2050
+12,heat,all-week,early-peak,2045,all-year,R1,0.95830000000,heatpump,3,2050
+4,CO2f,all-week,early-peak,2040,all-year,R1,83.58380000000,gasboiler,3,2050
+5,CO2f,all-week,early-peak,2045,all-year,R1,62.01370000000,gasboiler,3,2050
+4,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,gasboiler,4,2050
+5,heat,all-week,late-peak,2045,all-year,R1,1.91670000000,gasboiler,4,2050
+11,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,heatpump,4,2050
+12,heat,all-week,late-peak,2045,all-year,R1,1.91670000000,heatpump,4,2050
+4,CO2f,all-week,late-peak,2040,all-year,R1,167.16750000000,gasboiler,4,2050
+5,CO2f,all-week,late-peak,2045,all-year,R1,124.02750000000,gasboiler,4,2050
+4,heat,all-week,evening,2040,all-year,R1,1.72220000000,gasboiler,5,2050
+5,heat,all-week,evening,2045,all-year,R1,1.27780000000,gasboiler,5,2050
+11,heat,all-week,evening,2040,all-year,R1,1.72220000000,heatpump,5,2050
+12,heat,all-week,evening,2045,all-year,R1,1.27780000000,heatpump,5,2050
+4,CO2f,all-week,evening,2040,all-year,R1,111.44500000000,gasboiler,5,2050
+5,CO2f,all-week,evening,2045,all-year,R1,82.68500000000,gasboiler,5,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
deleted file mode 100644
index cdc2e5a40..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 9b0f35ee4..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000
-0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.30560000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000
-0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000
-1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.45830000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000
-1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000
-2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000
-2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000
-3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000
-3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000
-4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000
-4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000
-5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.61110000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000
-5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
deleted file mode 100644
index c9c4ec68f..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000
-0,heat,2030,3,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,heat,2030,4,R1,all-year,all-week,night,heatpump,2025,0.30560000000
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000
-0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2035,4,R1,all-year,all-week,night,heatpump,2025,0.30560000000
-0,heat,2035,5,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000
-0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000
-1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2025,0.45830000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000
-1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2025,0.45830000000
-1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000
-1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000
-2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000
-2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000
-2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000
-3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000
-3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000
-3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000
-4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000
-4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000
-4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000
-5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2025,0.61110000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000
-5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2025,0.61110000000
-5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000
-5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
deleted file mode 100644
index bce20e542..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000
-0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2035,5,R1,all-year,all-week,night,heatpump,2025,0.30560000000
-0,heat,2035,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000
-0,heat,2040,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,heat,2040,7,R1,all-year,all-week,night,heatpump,2035,0.47220000000
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000
-0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000
-1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2025,0.45830000000
-1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000
-1,heat,2040,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2035,0.70830000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000
-1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000
-2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000
-2,heat,2040,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000
-2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000
-3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000
-3,heat,2040,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000
-3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000
-4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000
-4,heat,2040,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000
-4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000
-5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2025,0.61110000000
-5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000
-5,heat,2040,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2035,0.94440000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000
-5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
-5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
-5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 5ef6737bb..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000
-0,heat,2040,7,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,heat,2040,8,R1,all-year,all-week,night,heatpump,2035,0.47220000000
-0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000
-0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000
-0,heat,2045,8,R1,all-year,all-week,night,heatpump,2035,0.47220000000
-0,heat,2045,9,R1,all-year,all-week,night,heatpump,2040,0.86110000000
-0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000
-0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000
-0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000
-1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000
-1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2035,0.70830000000
-1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000
-1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000
-1,heat,2045,8,R1,all-year,all-week,morning,heatpump,2035,0.70830000000
-1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2040,1.29170000000
-1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000
-1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000
-1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000
-2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000
-2,heat,2045,8,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000
-2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000
-2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000
-2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000
-2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000
-3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000
-3,heat,2045,8,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000
-3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000
-3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000
-3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000
-3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000
-4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000
-4,heat,2045,8,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000
-4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000
-4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000
-4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000
-4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000
-5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000
-5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2035,0.94440000000
-5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000
-5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000
-5,heat,2045,8,R1,all-year,all-week,evening,heatpump,2035,0.94440000000
-5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2040,1.72220000000
-5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
-5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000
-5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000
-5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
deleted file mode 100644
index e80874b99..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000
-0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000
-0,heat,2045,9,R1,all-year,all-week,night,heatpump,2035,0.47220000000
-0,heat,2045,10,R1,all-year,all-week,night,heatpump,2040,0.86110000000
-0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000
-0,heat,2050,5,R1,all-year,all-week,night,gasboiler,2045,0.63890000000
-0,heat,2050,10,R1,all-year,all-week,night,heatpump,2040,0.86110000000
-0,heat,2050,11,R1,all-year,all-week,night,heatpump,2045,0.63890000000
-0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000
-0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000
-0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000
-0,CO2f,2050,5,R1,all-year,all-week,night,gasboiler,2045,41.34250000000
-1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000
-1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000
-1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2035,0.70830000000
-1,heat,2045,10,R1,all-year,all-week,morning,heatpump,2040,1.29170000000
-1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000
-1,heat,2050,5,R1,all-year,all-week,morning,gasboiler,2045,0.95830000000
-1,heat,2050,10,R1,all-year,all-week,morning,heatpump,2040,1.29170000000
-1,heat,2050,11,R1,all-year,all-week,morning,heatpump,2045,0.95830000000
-1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000
-1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000
-1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000
-1,CO2f,2050,5,R1,all-year,all-week,morning,gasboiler,2045,62.01370000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000
-2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000
-2,heat,2045,10,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000
-2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,0.63890000000
-2,heat,2050,10,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000
-2,heat,2050,11,R1,all-year,all-week,afternoon,heatpump,2045,0.63890000000
-2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000
-2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000
-2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000
-2,CO2f,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,41.34250000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000
-3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000
-3,heat,2045,10,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000
-3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,0.95830000000
-3,heat,2050,10,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000
-3,heat,2050,11,R1,all-year,all-week,early-peak,heatpump,2045,0.95830000000
-3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000
-3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000
-3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000
-3,CO2f,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,62.01370000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000
-4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000
-4,heat,2045,10,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000
-4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,1.91670000000
-4,heat,2050,10,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000
-4,heat,2050,11,R1,all-year,all-week,late-peak,heatpump,2045,1.91670000000
-4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000
-4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000
-4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000
-4,CO2f,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,124.02750000000
-5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000
-5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000
-5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2035,0.94440000000
-5,heat,2045,10,R1,all-year,all-week,evening,heatpump,2040,1.72220000000
-5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000
-5,heat,2050,5,R1,all-year,all-week,evening,gasboiler,2045,1.27780000000
-5,heat,2050,10,R1,all-year,all-week,evening,heatpump,2040,1.72220000000
-5,heat,2050,11,R1,all-year,all-week,evening,heatpump,2045,1.27780000000
-5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000
-5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000
-5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000
-5,CO2f,2050,5,R1,all-year,all-week,evening,gasboiler,2045,82.68500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
deleted file mode 100644
index a4293e9c5..000000000
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000
-0,heat,2050,5,R1,all-year,all-week,night,gasboiler,2045,0.63890000000
-0,heat,2050,11,R1,all-year,all-week,night,heatpump,2040,0.86110000000
-0,heat,2050,12,R1,all-year,all-week,night,heatpump,2045,0.63890000000
-0,heat,2055,5,R1,all-year,all-week,night,gasboiler,2045,0.63890000000
-0,heat,2055,6,R1,all-year,all-week,night,gasboiler,2050,0.86110000000
-0,heat,2055,12,R1,all-year,all-week,night,heatpump,2045,0.63890000000
-0,heat,2055,13,R1,all-year,all-week,night,heatpump,2050,0.86110000000
-0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000
-0,CO2f,2050,5,R1,all-year,all-week,night,gasboiler,2045,41.34250000000
-0,CO2f,2055,5,R1,all-year,all-week,night,gasboiler,2045,41.34250000000
-0,CO2f,2055,6,R1,all-year,all-week,night,gasboiler,2050,55.72250000000
-1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000
-1,heat,2050,5,R1,all-year,all-week,morning,gasboiler,2045,0.95830000000
-1,heat,2050,11,R1,all-year,all-week,morning,heatpump,2040,1.29170000000
-1,heat,2050,12,R1,all-year,all-week,morning,heatpump,2045,0.95830000000
-1,heat,2055,5,R1,all-year,all-week,morning,gasboiler,2045,0.95830000000
-1,heat,2055,6,R1,all-year,all-week,morning,gasboiler,2050,1.29170000000
-1,heat,2055,12,R1,all-year,all-week,morning,heatpump,2045,0.95830000000
-1,heat,2055,13,R1,all-year,all-week,morning,heatpump,2050,1.29170000000
-1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000
-1,CO2f,2050,5,R1,all-year,all-week,morning,gasboiler,2045,62.01370000000
-1,CO2f,2055,5,R1,all-year,all-week,morning,gasboiler,2045,62.01370000000
-1,CO2f,2055,6,R1,all-year,all-week,morning,gasboiler,2050,83.58380000000
-2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,0.63890000000
-2,heat,2050,11,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000
-2,heat,2050,12,R1,all-year,all-week,afternoon,heatpump,2045,0.63890000000
-2,heat,2055,5,R1,all-year,all-week,afternoon,gasboiler,2045,0.63890000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,gasboiler,2050,0.86110000000
-2,heat,2055,12,R1,all-year,all-week,afternoon,heatpump,2045,0.63890000000
-2,heat,2055,13,R1,all-year,all-week,afternoon,heatpump,2050,0.86110000000
-2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000
-2,CO2f,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,41.34250000000
-2,CO2f,2055,5,R1,all-year,all-week,afternoon,gasboiler,2045,41.34250000000
-2,CO2f,2055,6,R1,all-year,all-week,afternoon,gasboiler,2050,55.72250000000
-3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,0.95830000000
-3,heat,2050,11,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000
-3,heat,2050,12,R1,all-year,all-week,early-peak,heatpump,2045,0.95830000000
-3,heat,2055,5,R1,all-year,all-week,early-peak,gasboiler,2045,0.95830000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,gasboiler,2050,1.29170000000
-3,heat,2055,12,R1,all-year,all-week,early-peak,heatpump,2045,0.95830000000
-3,heat,2055,13,R1,all-year,all-week,early-peak,heatpump,2050,1.29170000000
-3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000
-3,CO2f,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,62.01370000000
-3,CO2f,2055,5,R1,all-year,all-week,early-peak,gasboiler,2045,62.01370000000
-3,CO2f,2055,6,R1,all-year,all-week,early-peak,gasboiler,2050,83.58380000000
-4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,1.91670000000
-4,heat,2050,11,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000
-4,heat,2050,12,R1,all-year,all-week,late-peak,heatpump,2045,1.91670000000
-4,heat,2055,5,R1,all-year,all-week,late-peak,gasboiler,2045,1.91670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,gasboiler,2050,2.58330000000
-4,heat,2055,12,R1,all-year,all-week,late-peak,heatpump,2045,1.91670000000
-4,heat,2055,13,R1,all-year,all-week,late-peak,heatpump,2050,2.58330000000
-4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000
-4,CO2f,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,124.02750000000
-4,CO2f,2055,5,R1,all-year,all-week,late-peak,gasboiler,2045,124.02750000000
-4,CO2f,2055,6,R1,all-year,all-week,late-peak,gasboiler,2050,167.16750000000
-5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000
-5,heat,2050,5,R1,all-year,all-week,evening,gasboiler,2045,1.27780000000
-5,heat,2050,11,R1,all-year,all-week,evening,heatpump,2040,1.72220000000
-5,heat,2050,12,R1,all-year,all-week,evening,heatpump,2045,1.27780000000
-5,heat,2055,5,R1,all-year,all-week,evening,gasboiler,2045,1.27780000000
-5,heat,2055,6,R1,all-year,all-week,evening,gasboiler,2050,1.72220000000
-5,heat,2055,12,R1,all-year,all-week,evening,heatpump,2045,1.27780000000
-5,heat,2055,13,R1,all-year,all-week,evening,heatpump,2050,1.72220000000
-5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000
-5,CO2f,2050,5,R1,all-year,all-week,evening,gasboiler,2045,82.68500000000
-5,CO2f,2055,5,R1,all-year,all-week,evening,gasboiler,2045,82.68500000000
-5,CO2f,2055,6,R1,all-year,all-week,evening,gasboiler,2050,111.44500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 29306d1c9..9d851f603 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..2d64dec7c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity.csv
@@ -0,0 +1,20 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,18.38780000000,2020,R1,gassupply1,2025
+0,10.88780000000,2020,R1,gassupply1,2030
+1,10.34110000000,2025,R1,gassupply1,2030
+0,3.38780000000,2020,R1,gassupply1,2035
+1,10.34110000000,2025,R1,gassupply1,2035
+2,14.17190000000,2030,R1,gassupply1,2035
+0,3.38780000000,2020,R1,gassupply1,2040
+1,10.34110000000,2025,R1,gassupply1,2040
+2,14.17190000000,2030,R1,gassupply1,2040
+3,3.92710000000,2035,R1,gassupply1,2040
+0,3.38780000000,2020,R1,gassupply1,2045
+1,10.34110000000,2025,R1,gassupply1,2045
+2,14.17190000000,2030,R1,gassupply1,2045
+3,3.92710000000,2035,R1,gassupply1,2045
+0,3.38780000000,2020,R1,gassupply1,2050
+1,10.34110000000,2025,R1,gassupply1,2050
+2,14.17190000000,2030,R1,gassupply1,2050
+3,3.92710000000,2035,R1,gassupply1,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 2f57be103..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 01dd6cb86..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,10.34110000000
-1,2035,R1,gassupply1,2025,10.34110000000
-1,2040,R1,gassupply1,2025,10.34110000000
-1,2045,R1,gassupply1,2025,10.34110000000
-1,2050,R1,gassupply1,2025,10.34110000000
-1,2059,R1,gassupply1,2025,10.34110000000
-1,2060,R1,gassupply1,2025,10.34110000000
-1,2064,R1,gassupply1,2025,10.34110000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 116d44992..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,10.34110000000
-1,2035,R1,gassupply1,2025,10.34110000000
-1,2040,R1,gassupply1,2025,10.34110000000
-1,2045,R1,gassupply1,2025,10.34110000000
-1,2050,R1,gassupply1,2025,10.34110000000
-1,2059,R1,gassupply1,2025,10.34110000000
-1,2060,R1,gassupply1,2025,10.34110000000
-1,2064,R1,gassupply1,2025,10.34110000000
-2,2035,R1,gassupply1,2030,14.17190000000
-2,2040,R1,gassupply1,2030,14.17190000000
-2,2045,R1,gassupply1,2030,14.17190000000
-2,2050,R1,gassupply1,2030,14.17190000000
-2,2059,R1,gassupply1,2030,14.17190000000
-2,2060,R1,gassupply1,2030,14.17190000000
-2,2064,R1,gassupply1,2030,14.17190000000
-2,2065,R1,gassupply1,2030,14.17190000000
-2,2069,R1,gassupply1,2030,14.17190000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index e1d2b15ae..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,10.34110000000
-1,2035,R1,gassupply1,2025,10.34110000000
-1,2040,R1,gassupply1,2025,10.34110000000
-1,2045,R1,gassupply1,2025,10.34110000000
-1,2050,R1,gassupply1,2025,10.34110000000
-1,2059,R1,gassupply1,2025,10.34110000000
-1,2060,R1,gassupply1,2025,10.34110000000
-1,2064,R1,gassupply1,2025,10.34110000000
-2,2035,R1,gassupply1,2030,14.17190000000
-2,2040,R1,gassupply1,2030,14.17190000000
-2,2045,R1,gassupply1,2030,14.17190000000
-2,2050,R1,gassupply1,2030,14.17190000000
-2,2059,R1,gassupply1,2030,14.17190000000
-2,2060,R1,gassupply1,2030,14.17190000000
-2,2064,R1,gassupply1,2030,14.17190000000
-2,2065,R1,gassupply1,2030,14.17190000000
-2,2069,R1,gassupply1,2030,14.17190000000
-3,2040,R1,gassupply1,2035,3.92710000000
-3,2045,R1,gassupply1,2035,3.92710000000
-3,2050,R1,gassupply1,2035,3.92710000000
-3,2059,R1,gassupply1,2035,3.92710000000
-3,2060,R1,gassupply1,2035,3.92710000000
-3,2064,R1,gassupply1,2035,3.92710000000
-3,2065,R1,gassupply1,2035,3.92710000000
-3,2069,R1,gassupply1,2035,3.92710000000
-3,2070,R1,gassupply1,2035,3.92710000000
-3,2074,R1,gassupply1,2035,3.92710000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index e1d2b15ae..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,10.34110000000
-1,2035,R1,gassupply1,2025,10.34110000000
-1,2040,R1,gassupply1,2025,10.34110000000
-1,2045,R1,gassupply1,2025,10.34110000000
-1,2050,R1,gassupply1,2025,10.34110000000
-1,2059,R1,gassupply1,2025,10.34110000000
-1,2060,R1,gassupply1,2025,10.34110000000
-1,2064,R1,gassupply1,2025,10.34110000000
-2,2035,R1,gassupply1,2030,14.17190000000
-2,2040,R1,gassupply1,2030,14.17190000000
-2,2045,R1,gassupply1,2030,14.17190000000
-2,2050,R1,gassupply1,2030,14.17190000000
-2,2059,R1,gassupply1,2030,14.17190000000
-2,2060,R1,gassupply1,2030,14.17190000000
-2,2064,R1,gassupply1,2030,14.17190000000
-2,2065,R1,gassupply1,2030,14.17190000000
-2,2069,R1,gassupply1,2030,14.17190000000
-3,2040,R1,gassupply1,2035,3.92710000000
-3,2045,R1,gassupply1,2035,3.92710000000
-3,2050,R1,gassupply1,2035,3.92710000000
-3,2059,R1,gassupply1,2035,3.92710000000
-3,2060,R1,gassupply1,2035,3.92710000000
-3,2064,R1,gassupply1,2035,3.92710000000
-3,2065,R1,gassupply1,2035,3.92710000000
-3,2069,R1,gassupply1,2035,3.92710000000
-3,2070,R1,gassupply1,2035,3.92710000000
-3,2074,R1,gassupply1,2035,3.92710000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index e1d2b15ae..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,10.34110000000
-1,2035,R1,gassupply1,2025,10.34110000000
-1,2040,R1,gassupply1,2025,10.34110000000
-1,2045,R1,gassupply1,2025,10.34110000000
-1,2050,R1,gassupply1,2025,10.34110000000
-1,2059,R1,gassupply1,2025,10.34110000000
-1,2060,R1,gassupply1,2025,10.34110000000
-1,2064,R1,gassupply1,2025,10.34110000000
-2,2035,R1,gassupply1,2030,14.17190000000
-2,2040,R1,gassupply1,2030,14.17190000000
-2,2045,R1,gassupply1,2030,14.17190000000
-2,2050,R1,gassupply1,2030,14.17190000000
-2,2059,R1,gassupply1,2030,14.17190000000
-2,2060,R1,gassupply1,2030,14.17190000000
-2,2064,R1,gassupply1,2030,14.17190000000
-2,2065,R1,gassupply1,2030,14.17190000000
-2,2069,R1,gassupply1,2030,14.17190000000
-3,2040,R1,gassupply1,2035,3.92710000000
-3,2045,R1,gassupply1,2035,3.92710000000
-3,2050,R1,gassupply1,2035,3.92710000000
-3,2059,R1,gassupply1,2035,3.92710000000
-3,2060,R1,gassupply1,2035,3.92710000000
-3,2064,R1,gassupply1,2035,3.92710000000
-3,2065,R1,gassupply1,2035,3.92710000000
-3,2069,R1,gassupply1,2035,3.92710000000
-3,2070,R1,gassupply1,2035,3.92710000000
-3,2074,R1,gassupply1,2035,3.92710000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index e1d2b15ae..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.38780000000
-0,2030,R1,gassupply1,2020,10.88780000000
-0,2035,R1,gassupply1,2020,3.38780000000
-0,2040,R1,gassupply1,2020,3.38780000000
-0,2045,R1,gassupply1,2020,3.38780000000
-0,2050,R1,gassupply1,2020,3.38780000000
-0,2059,R1,gassupply1,2020,3.38780000000
-1,2030,R1,gassupply1,2025,10.34110000000
-1,2035,R1,gassupply1,2025,10.34110000000
-1,2040,R1,gassupply1,2025,10.34110000000
-1,2045,R1,gassupply1,2025,10.34110000000
-1,2050,R1,gassupply1,2025,10.34110000000
-1,2059,R1,gassupply1,2025,10.34110000000
-1,2060,R1,gassupply1,2025,10.34110000000
-1,2064,R1,gassupply1,2025,10.34110000000
-2,2035,R1,gassupply1,2030,14.17190000000
-2,2040,R1,gassupply1,2030,14.17190000000
-2,2045,R1,gassupply1,2030,14.17190000000
-2,2050,R1,gassupply1,2030,14.17190000000
-2,2059,R1,gassupply1,2030,14.17190000000
-2,2060,R1,gassupply1,2030,14.17190000000
-2,2064,R1,gassupply1,2030,14.17190000000
-2,2065,R1,gassupply1,2030,14.17190000000
-2,2069,R1,gassupply1,2030,14.17190000000
-3,2040,R1,gassupply1,2035,3.92710000000
-3,2045,R1,gassupply1,2035,3.92710000000
-3,2050,R1,gassupply1,2035,3.92710000000
-3,2059,R1,gassupply1,2035,3.92710000000
-3,2060,R1,gassupply1,2035,3.92710000000
-3,2064,R1,gassupply1,2035,3.92710000000
-3,2065,R1,gassupply1,2035,3.92710000000
-3,2069,R1,gassupply1,2035,3.92710000000
-3,2070,R1,gassupply1,2035,3.92710000000
-3,2074,R1,gassupply1,2035,3.92710000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity.csv
new file mode 100644
index 000000000..0e872a203
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity.csv
@@ -0,0 +1,36 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+0,2.02780000000,2020,R1,gasCCGT,2025
+2,2.31250000000,2020,R1,windturbine,2025
+0,1.02780000000,2020,R1,gasCCGT,2030
+1,3.19440000000,2025,R1,gasCCGT,2030
+2,2.31250000000,2020,R1,windturbine,2030
+3,7.18750000000,2025,R1,windturbine,2030
+0,1.02780000000,2020,R1,gasCCGT,2035
+1,3.19440000000,2025,R1,gasCCGT,2035
+3,2.31250000000,2020,R1,windturbine,2035
+4,7.18750000000,2025,R1,windturbine,2035
+5,0.37500000000,2030,R1,windturbine,2035
+0,1.02780000000,2020,R1,gasCCGT,2040
+1,3.19440000000,2025,R1,gasCCGT,2040
+2,0.41670000000,2035,R1,gasCCGT,2040
+3,2.31250000000,2020,R1,windturbine,2040
+4,7.18750000000,2025,R1,windturbine,2040
+5,0.37500000000,2030,R1,windturbine,2040
+6,2.18750000000,2035,R1,windturbine,2040
+0,1.02780000000,2020,R1,gasCCGT,2045
+1,3.19440000000,2025,R1,gasCCGT,2045
+2,0.41670000000,2035,R1,gasCCGT,2045
+3,2.31250000000,2020,R1,windturbine,2045
+4,7.18750000000,2025,R1,windturbine,2045
+5,0.37500000000,2030,R1,windturbine,2045
+6,2.18750000000,2035,R1,windturbine,2045
+7,6.00000000000,2040,R1,windturbine,2045
+0,1.02780000000,2020,R1,gasCCGT,2050
+1,3.19440000000,2025,R1,gasCCGT,2050
+2,0.41670000000,2035,R1,gasCCGT,2050
+5,7.18750000000,2025,R1,windturbine,2050
+6,0.37500000000,2030,R1,windturbine,2050
+7,2.18750000000,2035,R1,windturbine,2050
+8,6.00000000000,2040,R1,windturbine,2050
+9,11.06250000000,2045,R1,windturbine,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
deleted file mode 100644
index e46424887..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2025,R1,windturbine,2020,2.31250000000
-1,2030,R1,windturbine,2020,2.31250000000
-1,2035,R1,windturbine,2020,2.31250000000
-1,2040,R1,windturbine,2020,2.31250000000
-1,2045,R1,windturbine,2020,2.31250000000
-1,2049,R1,windturbine,2020,2.31250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 4a06dece5..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,3.19440000000
-1,2035,R1,gasCCGT,2025,3.19440000000
-1,2040,R1,gasCCGT,2025,3.19440000000
-1,2045,R1,gasCCGT,2025,3.19440000000
-1,2049,R1,gasCCGT,2025,3.19440000000
-1,2050,R1,gasCCGT,2025,3.19440000000
-1,2054,R1,gasCCGT,2025,3.19440000000
-1,2055,R1,gasCCGT,2025,3.19440000000
-1,2059,R1,gasCCGT,2025,3.19440000000
-1,2060,R1,gasCCGT,2025,3.19440000000
-1,2064,R1,gasCCGT,2025,3.19440000000
-2,2025,R1,windturbine,2020,2.31250000000
-2,2030,R1,windturbine,2020,2.31250000000
-2,2035,R1,windturbine,2020,2.31250000000
-2,2040,R1,windturbine,2020,2.31250000000
-2,2045,R1,windturbine,2020,2.31250000000
-2,2049,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2025,7.18750000000
-3,2035,R1,windturbine,2025,7.18750000000
-3,2040,R1,windturbine,2025,7.18750000000
-3,2045,R1,windturbine,2025,7.18750000000
-3,2049,R1,windturbine,2025,7.18750000000
-3,2050,R1,windturbine,2025,7.18750000000
-3,2054,R1,windturbine,2025,7.18750000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 765333420..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,3.19440000000
-1,2035,R1,gasCCGT,2025,3.19440000000
-1,2040,R1,gasCCGT,2025,3.19440000000
-1,2045,R1,gasCCGT,2025,3.19440000000
-1,2049,R1,gasCCGT,2025,3.19440000000
-1,2050,R1,gasCCGT,2025,3.19440000000
-1,2054,R1,gasCCGT,2025,3.19440000000
-1,2055,R1,gasCCGT,2025,3.19440000000
-1,2059,R1,gasCCGT,2025,3.19440000000
-1,2060,R1,gasCCGT,2025,3.19440000000
-1,2064,R1,gasCCGT,2025,3.19440000000
-2,2025,R1,windturbine,2020,2.31250000000
-2,2030,R1,windturbine,2020,2.31250000000
-2,2035,R1,windturbine,2020,2.31250000000
-2,2040,R1,windturbine,2020,2.31250000000
-2,2045,R1,windturbine,2020,2.31250000000
-2,2049,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2025,7.18750000000
-3,2035,R1,windturbine,2025,7.18750000000
-3,2040,R1,windturbine,2025,7.18750000000
-3,2045,R1,windturbine,2025,7.18750000000
-3,2049,R1,windturbine,2025,7.18750000000
-3,2050,R1,windturbine,2025,7.18750000000
-3,2054,R1,windturbine,2025,7.18750000000
-4,2035,R1,windturbine,2030,0.37500000000
-4,2040,R1,windturbine,2030,0.37500000000
-4,2045,R1,windturbine,2030,0.37500000000
-4,2049,R1,windturbine,2030,0.37500000000
-4,2050,R1,windturbine,2030,0.37500000000
-4,2054,R1,windturbine,2030,0.37500000000
-4,2055,R1,windturbine,2030,0.37500000000
-4,2059,R1,windturbine,2030,0.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 2e3c116e2..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,64 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,3.19440000000
-1,2035,R1,gasCCGT,2025,3.19440000000
-1,2040,R1,gasCCGT,2025,3.19440000000
-1,2045,R1,gasCCGT,2025,3.19440000000
-1,2049,R1,gasCCGT,2025,3.19440000000
-1,2050,R1,gasCCGT,2025,3.19440000000
-1,2054,R1,gasCCGT,2025,3.19440000000
-1,2055,R1,gasCCGT,2025,3.19440000000
-1,2059,R1,gasCCGT,2025,3.19440000000
-1,2060,R1,gasCCGT,2025,3.19440000000
-1,2064,R1,gasCCGT,2025,3.19440000000
-2,2040,R1,gasCCGT,2035,0.41670000000
-2,2045,R1,gasCCGT,2035,0.41670000000
-2,2049,R1,gasCCGT,2035,0.41670000000
-2,2050,R1,gasCCGT,2035,0.41670000000
-2,2054,R1,gasCCGT,2035,0.41670000000
-2,2055,R1,gasCCGT,2035,0.41670000000
-2,2059,R1,gasCCGT,2035,0.41670000000
-2,2060,R1,gasCCGT,2035,0.41670000000
-2,2064,R1,gasCCGT,2035,0.41670000000
-2,2065,R1,gasCCGT,2035,0.41670000000
-2,2074,R1,gasCCGT,2035,0.41670000000
-3,2025,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2020,2.31250000000
-3,2035,R1,windturbine,2020,2.31250000000
-3,2040,R1,windturbine,2020,2.31250000000
-3,2045,R1,windturbine,2020,2.31250000000
-3,2049,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2025,7.18750000000
-4,2035,R1,windturbine,2025,7.18750000000
-4,2040,R1,windturbine,2025,7.18750000000
-4,2045,R1,windturbine,2025,7.18750000000
-4,2049,R1,windturbine,2025,7.18750000000
-4,2050,R1,windturbine,2025,7.18750000000
-4,2054,R1,windturbine,2025,7.18750000000
-5,2035,R1,windturbine,2030,0.37500000000
-5,2040,R1,windturbine,2030,0.37500000000
-5,2045,R1,windturbine,2030,0.37500000000
-5,2049,R1,windturbine,2030,0.37500000000
-5,2050,R1,windturbine,2030,0.37500000000
-5,2054,R1,windturbine,2030,0.37500000000
-5,2055,R1,windturbine,2030,0.37500000000
-5,2059,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2035,2.18750000000
-6,2045,R1,windturbine,2035,2.18750000000
-6,2049,R1,windturbine,2035,2.18750000000
-6,2050,R1,windturbine,2035,2.18750000000
-6,2054,R1,windturbine,2035,2.18750000000
-6,2055,R1,windturbine,2035,2.18750000000
-6,2059,R1,windturbine,2035,2.18750000000
-6,2060,R1,windturbine,2035,2.18750000000
-6,2064,R1,windturbine,2035,2.18750000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
deleted file mode 100644
index cfec33754..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,76 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,3.19440000000
-1,2035,R1,gasCCGT,2025,3.19440000000
-1,2040,R1,gasCCGT,2025,3.19440000000
-1,2045,R1,gasCCGT,2025,3.19440000000
-1,2049,R1,gasCCGT,2025,3.19440000000
-1,2050,R1,gasCCGT,2025,3.19440000000
-1,2054,R1,gasCCGT,2025,3.19440000000
-1,2055,R1,gasCCGT,2025,3.19440000000
-1,2059,R1,gasCCGT,2025,3.19440000000
-1,2060,R1,gasCCGT,2025,3.19440000000
-1,2064,R1,gasCCGT,2025,3.19440000000
-2,2040,R1,gasCCGT,2035,0.41670000000
-2,2045,R1,gasCCGT,2035,0.41670000000
-2,2049,R1,gasCCGT,2035,0.41670000000
-2,2050,R1,gasCCGT,2035,0.41670000000
-2,2054,R1,gasCCGT,2035,0.41670000000
-2,2055,R1,gasCCGT,2035,0.41670000000
-2,2059,R1,gasCCGT,2035,0.41670000000
-2,2060,R1,gasCCGT,2035,0.41670000000
-2,2064,R1,gasCCGT,2035,0.41670000000
-2,2065,R1,gasCCGT,2035,0.41670000000
-2,2069,R1,gasCCGT,2035,0.41670000000
-2,2070,R1,gasCCGT,2035,0.41670000000
-2,2074,R1,gasCCGT,2035,0.41670000000
-3,2025,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2020,2.31250000000
-3,2035,R1,windturbine,2020,2.31250000000
-3,2040,R1,windturbine,2020,2.31250000000
-3,2045,R1,windturbine,2020,2.31250000000
-3,2049,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2025,7.18750000000
-4,2035,R1,windturbine,2025,7.18750000000
-4,2040,R1,windturbine,2025,7.18750000000
-4,2045,R1,windturbine,2025,7.18750000000
-4,2049,R1,windturbine,2025,7.18750000000
-4,2050,R1,windturbine,2025,7.18750000000
-4,2054,R1,windturbine,2025,7.18750000000
-5,2035,R1,windturbine,2030,0.37500000000
-5,2040,R1,windturbine,2030,0.37500000000
-5,2045,R1,windturbine,2030,0.37500000000
-5,2049,R1,windturbine,2030,0.37500000000
-5,2050,R1,windturbine,2030,0.37500000000
-5,2054,R1,windturbine,2030,0.37500000000
-5,2055,R1,windturbine,2030,0.37500000000
-5,2059,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2035,2.18750000000
-6,2045,R1,windturbine,2035,2.18750000000
-6,2049,R1,windturbine,2035,2.18750000000
-6,2050,R1,windturbine,2035,2.18750000000
-6,2054,R1,windturbine,2035,2.18750000000
-6,2055,R1,windturbine,2035,2.18750000000
-6,2059,R1,windturbine,2035,2.18750000000
-6,2060,R1,windturbine,2035,2.18750000000
-6,2064,R1,windturbine,2035,2.18750000000
-7,2045,R1,windturbine,2040,6.00000000000
-7,2049,R1,windturbine,2040,6.00000000000
-7,2050,R1,windturbine,2040,6.00000000000
-7,2054,R1,windturbine,2040,6.00000000000
-7,2055,R1,windturbine,2040,6.00000000000
-7,2059,R1,windturbine,2040,6.00000000000
-7,2060,R1,windturbine,2040,6.00000000000
-7,2064,R1,windturbine,2040,6.00000000000
-7,2065,R1,windturbine,2040,6.00000000000
-7,2069,R1,windturbine,2040,6.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
deleted file mode 100644
index b9c470255..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,87 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,3.19440000000
-1,2035,R1,gasCCGT,2025,3.19440000000
-1,2040,R1,gasCCGT,2025,3.19440000000
-1,2045,R1,gasCCGT,2025,3.19440000000
-1,2049,R1,gasCCGT,2025,3.19440000000
-1,2050,R1,gasCCGT,2025,3.19440000000
-1,2054,R1,gasCCGT,2025,3.19440000000
-1,2055,R1,gasCCGT,2025,3.19440000000
-1,2059,R1,gasCCGT,2025,3.19440000000
-1,2060,R1,gasCCGT,2025,3.19440000000
-1,2064,R1,gasCCGT,2025,3.19440000000
-2,2040,R1,gasCCGT,2035,0.41670000000
-2,2045,R1,gasCCGT,2035,0.41670000000
-2,2049,R1,gasCCGT,2035,0.41670000000
-2,2050,R1,gasCCGT,2035,0.41670000000
-2,2054,R1,gasCCGT,2035,0.41670000000
-2,2055,R1,gasCCGT,2035,0.41670000000
-2,2059,R1,gasCCGT,2035,0.41670000000
-2,2060,R1,gasCCGT,2035,0.41670000000
-2,2064,R1,gasCCGT,2035,0.41670000000
-2,2065,R1,gasCCGT,2035,0.41670000000
-2,2069,R1,gasCCGT,2035,0.41670000000
-2,2070,R1,gasCCGT,2035,0.41670000000
-2,2074,R1,gasCCGT,2035,0.41670000000
-3,2025,R1,windturbine,2020,2.31250000000
-3,2030,R1,windturbine,2020,2.31250000000
-3,2035,R1,windturbine,2020,2.31250000000
-3,2040,R1,windturbine,2020,2.31250000000
-3,2045,R1,windturbine,2020,2.31250000000
-3,2049,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2025,7.18750000000
-4,2035,R1,windturbine,2025,7.18750000000
-4,2040,R1,windturbine,2025,7.18750000000
-4,2045,R1,windturbine,2025,7.18750000000
-4,2049,R1,windturbine,2025,7.18750000000
-4,2050,R1,windturbine,2025,7.18750000000
-4,2054,R1,windturbine,2025,7.18750000000
-5,2035,R1,windturbine,2030,0.37500000000
-5,2040,R1,windturbine,2030,0.37500000000
-5,2045,R1,windturbine,2030,0.37500000000
-5,2049,R1,windturbine,2030,0.37500000000
-5,2050,R1,windturbine,2030,0.37500000000
-5,2054,R1,windturbine,2030,0.37500000000
-5,2055,R1,windturbine,2030,0.37500000000
-5,2059,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2035,2.18750000000
-6,2045,R1,windturbine,2035,2.18750000000
-6,2049,R1,windturbine,2035,2.18750000000
-6,2050,R1,windturbine,2035,2.18750000000
-6,2054,R1,windturbine,2035,2.18750000000
-6,2055,R1,windturbine,2035,2.18750000000
-6,2059,R1,windturbine,2035,2.18750000000
-6,2060,R1,windturbine,2035,2.18750000000
-6,2064,R1,windturbine,2035,2.18750000000
-7,2045,R1,windturbine,2040,6.00000000000
-7,2049,R1,windturbine,2040,6.00000000000
-7,2050,R1,windturbine,2040,6.00000000000
-7,2054,R1,windturbine,2040,6.00000000000
-7,2055,R1,windturbine,2040,6.00000000000
-7,2059,R1,windturbine,2040,6.00000000000
-7,2060,R1,windturbine,2040,6.00000000000
-7,2064,R1,windturbine,2040,6.00000000000
-7,2065,R1,windturbine,2040,6.00000000000
-7,2069,R1,windturbine,2040,6.00000000000
-8,2049,R1,windturbine,2045,2.32500000000
-8,2050,R1,windturbine,2045,11.06250000000
-8,2054,R1,windturbine,2045,11.06250000000
-8,2055,R1,windturbine,2045,11.06250000000
-8,2059,R1,windturbine,2045,11.06250000000
-8,2060,R1,windturbine,2045,11.06250000000
-8,2064,R1,windturbine,2045,11.06250000000
-8,2065,R1,windturbine,2045,11.06250000000
-8,2069,R1,windturbine,2045,11.06250000000
-8,2070,R1,windturbine,2045,11.06250000000
-8,2074,R1,windturbine,2045,11.06250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 10258f7e7..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,110 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,2.02780000000
-0,2030,R1,gasCCGT,2020,1.02780000000
-0,2035,R1,gasCCGT,2020,1.02780000000
-0,2040,R1,gasCCGT,2020,1.02780000000
-0,2045,R1,gasCCGT,2020,1.02780000000
-0,2049,R1,gasCCGT,2020,1.02780000000
-0,2050,R1,gasCCGT,2020,1.02780000000
-0,2054,R1,gasCCGT,2020,1.02780000000
-0,2055,R1,gasCCGT,2020,1.02780000000
-0,2059,R1,gasCCGT,2020,1.02780000000
-1,2030,R1,gasCCGT,2025,3.19440000000
-1,2035,R1,gasCCGT,2025,3.19440000000
-1,2040,R1,gasCCGT,2025,3.19440000000
-1,2045,R1,gasCCGT,2025,3.19440000000
-1,2049,R1,gasCCGT,2025,3.19440000000
-1,2050,R1,gasCCGT,2025,3.19440000000
-1,2054,R1,gasCCGT,2025,3.19440000000
-1,2055,R1,gasCCGT,2025,3.19440000000
-1,2059,R1,gasCCGT,2025,3.19440000000
-1,2060,R1,gasCCGT,2025,3.19440000000
-1,2064,R1,gasCCGT,2025,3.19440000000
-2,2040,R1,gasCCGT,2035,0.41670000000
-2,2045,R1,gasCCGT,2035,0.41670000000
-2,2049,R1,gasCCGT,2035,0.41670000000
-2,2050,R1,gasCCGT,2035,0.41670000000
-2,2054,R1,gasCCGT,2035,0.41670000000
-2,2055,R1,gasCCGT,2035,0.41670000000
-2,2059,R1,gasCCGT,2035,0.41670000000
-2,2060,R1,gasCCGT,2035,0.41670000000
-2,2064,R1,gasCCGT,2035,0.41670000000
-2,2065,R1,gasCCGT,2035,0.41670000000
-2,2069,R1,gasCCGT,2035,0.41670000000
-2,2070,R1,gasCCGT,2035,0.41670000000
-2,2074,R1,gasCCGT,2035,0.41670000000
-3,2055,R1,gasCCGT,2050,4.67360000000
-3,2059,R1,gasCCGT,2050,4.67360000000
-3,2060,R1,gasCCGT,2050,4.67360000000
-3,2064,R1,gasCCGT,2050,4.67360000000
-3,2065,R1,gasCCGT,2050,4.67360000000
-3,2069,R1,gasCCGT,2050,4.67360000000
-3,2070,R1,gasCCGT,2050,4.67360000000
-3,2074,R1,gasCCGT,2050,4.67360000000
-3,2075,R1,gasCCGT,2050,4.67360000000
-3,2079,R1,gasCCGT,2050,4.67360000000
-3,2080,R1,gasCCGT,2050,4.67360000000
-3,2089,R1,gasCCGT,2050,4.67360000000
-4,2025,R1,windturbine,2020,2.31250000000
-4,2030,R1,windturbine,2020,2.31250000000
-4,2035,R1,windturbine,2020,2.31250000000
-4,2040,R1,windturbine,2020,2.31250000000
-4,2045,R1,windturbine,2020,2.31250000000
-4,2049,R1,windturbine,2020,2.31250000000
-5,2030,R1,windturbine,2025,7.18750000000
-5,2035,R1,windturbine,2025,7.18750000000
-5,2040,R1,windturbine,2025,7.18750000000
-5,2045,R1,windturbine,2025,7.18750000000
-5,2049,R1,windturbine,2025,7.18750000000
-5,2050,R1,windturbine,2025,7.18750000000
-5,2054,R1,windturbine,2025,7.18750000000
-6,2035,R1,windturbine,2030,0.37500000000
-6,2040,R1,windturbine,2030,0.37500000000
-6,2045,R1,windturbine,2030,0.37500000000
-6,2049,R1,windturbine,2030,0.37500000000
-6,2050,R1,windturbine,2030,0.37500000000
-6,2054,R1,windturbine,2030,0.37500000000
-6,2055,R1,windturbine,2030,0.37500000000
-6,2059,R1,windturbine,2030,0.37500000000
-7,2040,R1,windturbine,2035,2.18750000000
-7,2045,R1,windturbine,2035,2.18750000000
-7,2049,R1,windturbine,2035,2.18750000000
-7,2050,R1,windturbine,2035,2.18750000000
-7,2054,R1,windturbine,2035,2.18750000000
-7,2055,R1,windturbine,2035,2.18750000000
-7,2059,R1,windturbine,2035,2.18750000000
-7,2060,R1,windturbine,2035,2.18750000000
-7,2064,R1,windturbine,2035,2.18750000000
-8,2045,R1,windturbine,2040,6.00000000000
-8,2049,R1,windturbine,2040,6.00000000000
-8,2050,R1,windturbine,2040,6.00000000000
-8,2054,R1,windturbine,2040,6.00000000000
-8,2055,R1,windturbine,2040,6.00000000000
-8,2059,R1,windturbine,2040,6.00000000000
-8,2060,R1,windturbine,2040,6.00000000000
-8,2064,R1,windturbine,2040,6.00000000000
-8,2065,R1,windturbine,2040,6.00000000000
-8,2069,R1,windturbine,2040,6.00000000000
-9,2049,R1,windturbine,2045,2.32500000000
-9,2050,R1,windturbine,2045,11.06250000000
-9,2054,R1,windturbine,2045,11.06250000000
-9,2055,R1,windturbine,2045,11.06250000000
-9,2059,R1,windturbine,2045,11.06250000000
-9,2060,R1,windturbine,2045,11.06250000000
-9,2064,R1,windturbine,2045,11.06250000000
-9,2065,R1,windturbine,2045,11.06250000000
-9,2069,R1,windturbine,2045,11.06250000000
-9,2070,R1,windturbine,2045,11.06250000000
-9,2074,R1,windturbine,2045,11.06250000000
-10,2054,R1,windturbine,2050,4.60000000000
-10,2055,R1,windturbine,2050,15.75000000000
-10,2059,R1,windturbine,2050,15.75000000000
-10,2060,R1,windturbine,2050,15.75000000000
-10,2064,R1,windturbine,2050,15.75000000000
-10,2065,R1,windturbine,2050,15.75000000000
-10,2069,R1,windturbine,2050,15.75000000000
-10,2070,R1,windturbine,2050,15.75000000000
-10,2074,R1,windturbine,2050,15.75000000000
-10,2075,R1,windturbine,2050,15.75000000000
-10,2079,R1,windturbine,2050,15.75000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..47c6a64eb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity.csv
@@ -0,0 +1,23 @@
+asset,capacity,installed,region,technology,year
+0,10.00000000000,2020,R1,gasboiler,2020
+0,12.50000000000,2020,R1,gasboiler,2025
+2,11.50000000000,2020,R1,heatpump,2025
+0,7.50000000000,2020,R1,gasboiler,2030
+1,3.50000000000,2025,R1,gasboiler,2030
+3,11.50000000000,2020,R1,heatpump,2030
+4,7.50000000000,2025,R1,heatpump,2030
+1,3.50000000000,2025,R1,gasboiler,2035
+2,12.50000000000,2030,R1,gasboiler,2035
+5,7.50000000000,2025,R1,heatpump,2035
+6,12.50000000000,2030,R1,heatpump,2035
+2,12.50000000000,2030,R1,gasboiler,2040
+3,4.50000000000,2035,R1,gasboiler,2040
+7,12.50000000000,2030,R1,heatpump,2040
+8,12.50000000000,2035,R1,heatpump,2040
+3,4.50000000000,2035,R1,gasboiler,2045
+4,11.50000000000,2040,R1,gasboiler,2045
+8,12.50000000000,2035,R1,heatpump,2045
+9,19.50000000000,2040,R1,heatpump,2045
+4,11.50000000000,2040,R1,gasboiler,2050
+9,19.50000000000,2040,R1,heatpump,2050
+10,23.00000000000,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 6c7acc17e..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2025,R1,heatpump,2020,11.50000000000
-1,2030,R1,heatpump,2020,11.50000000000
-1,2034,R1,heatpump,2020,11.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 6344a1dc2..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,3.50000000000
-1,2034,R1,gasboiler,2025,3.50000000000
-1,2035,R1,gasboiler,2025,3.50000000000
-1,2039,R1,gasboiler,2025,3.50000000000
-2,2025,R1,heatpump,2020,11.50000000000
-2,2030,R1,heatpump,2020,11.50000000000
-2,2034,R1,heatpump,2020,11.50000000000
-3,2030,R1,heatpump,2025,7.50000000000
-3,2034,R1,heatpump,2025,7.50000000000
-3,2035,R1,heatpump,2025,7.50000000000
-3,2039,R1,heatpump,2025,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 4635a1f75..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,3.50000000000
-1,2034,R1,gasboiler,2025,3.50000000000
-1,2035,R1,gasboiler,2025,3.50000000000
-1,2039,R1,gasboiler,2025,3.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2025,R1,heatpump,2020,11.50000000000
-3,2030,R1,heatpump,2020,11.50000000000
-3,2034,R1,heatpump,2020,11.50000000000
-4,2030,R1,heatpump,2025,7.50000000000
-4,2034,R1,heatpump,2025,7.50000000000
-4,2035,R1,heatpump,2025,7.50000000000
-4,2039,R1,heatpump,2025,7.50000000000
-5,2035,R1,heatpump,2030,12.50000000000
-5,2039,R1,heatpump,2030,12.50000000000
-5,2040,R1,heatpump,2030,12.50000000000
-5,2044,R1,heatpump,2030,12.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index a6ec6231f..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,32 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,3.50000000000
-1,2034,R1,gasboiler,2025,3.50000000000
-1,2035,R1,gasboiler,2025,3.50000000000
-1,2039,R1,gasboiler,2025,3.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,4.50000000000
-3,2044,R1,gasboiler,2035,4.50000000000
-3,2045,R1,gasboiler,2035,4.50000000000
-3,2049,R1,gasboiler,2035,4.50000000000
-4,2025,R1,heatpump,2020,11.50000000000
-4,2030,R1,heatpump,2020,11.50000000000
-4,2034,R1,heatpump,2020,11.50000000000
-5,2030,R1,heatpump,2025,7.50000000000
-5,2034,R1,heatpump,2025,7.50000000000
-5,2035,R1,heatpump,2025,7.50000000000
-5,2039,R1,heatpump,2025,7.50000000000
-6,2035,R1,heatpump,2030,12.50000000000
-6,2039,R1,heatpump,2030,12.50000000000
-6,2040,R1,heatpump,2030,12.50000000000
-6,2044,R1,heatpump,2030,12.50000000000
-7,2040,R1,heatpump,2035,12.50000000000
-7,2044,R1,heatpump,2035,12.50000000000
-7,2045,R1,heatpump,2035,12.50000000000
-7,2049,R1,heatpump,2035,12.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index ebc8c8b55..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,40 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,3.50000000000
-1,2034,R1,gasboiler,2025,3.50000000000
-1,2035,R1,gasboiler,2025,3.50000000000
-1,2039,R1,gasboiler,2025,3.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,4.50000000000
-3,2044,R1,gasboiler,2035,4.50000000000
-3,2045,R1,gasboiler,2035,4.50000000000
-3,2049,R1,gasboiler,2035,4.50000000000
-4,2045,R1,gasboiler,2040,11.50000000000
-4,2049,R1,gasboiler,2040,11.50000000000
-4,2050,R1,gasboiler,2040,11.50000000000
-4,2054,R1,gasboiler,2040,11.50000000000
-5,2025,R1,heatpump,2020,11.50000000000
-5,2030,R1,heatpump,2020,11.50000000000
-5,2034,R1,heatpump,2020,11.50000000000
-6,2030,R1,heatpump,2025,7.50000000000
-6,2034,R1,heatpump,2025,7.50000000000
-6,2035,R1,heatpump,2025,7.50000000000
-6,2039,R1,heatpump,2025,7.50000000000
-7,2035,R1,heatpump,2030,12.50000000000
-7,2039,R1,heatpump,2030,12.50000000000
-7,2040,R1,heatpump,2030,12.50000000000
-7,2044,R1,heatpump,2030,12.50000000000
-8,2040,R1,heatpump,2035,12.50000000000
-8,2044,R1,heatpump,2035,12.50000000000
-8,2045,R1,heatpump,2035,12.50000000000
-8,2049,R1,heatpump,2035,12.50000000000
-9,2045,R1,heatpump,2040,19.50000000000
-9,2049,R1,heatpump,2040,19.50000000000
-9,2050,R1,heatpump,2040,19.50000000000
-9,2054,R1,heatpump,2040,19.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 82601e4d7..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,3.50000000000
-1,2034,R1,gasboiler,2025,3.50000000000
-1,2035,R1,gasboiler,2025,3.50000000000
-1,2039,R1,gasboiler,2025,3.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,4.50000000000
-3,2044,R1,gasboiler,2035,4.50000000000
-3,2045,R1,gasboiler,2035,4.50000000000
-3,2049,R1,gasboiler,2035,4.50000000000
-4,2045,R1,gasboiler,2040,11.50000000000
-4,2049,R1,gasboiler,2040,11.50000000000
-4,2050,R1,gasboiler,2040,11.50000000000
-4,2054,R1,gasboiler,2040,11.50000000000
-5,2025,R1,heatpump,2020,11.50000000000
-5,2030,R1,heatpump,2020,11.50000000000
-5,2034,R1,heatpump,2020,11.50000000000
-6,2030,R1,heatpump,2025,7.50000000000
-6,2034,R1,heatpump,2025,7.50000000000
-6,2035,R1,heatpump,2025,7.50000000000
-6,2039,R1,heatpump,2025,7.50000000000
-7,2035,R1,heatpump,2030,12.50000000000
-7,2039,R1,heatpump,2030,12.50000000000
-7,2040,R1,heatpump,2030,12.50000000000
-7,2044,R1,heatpump,2030,12.50000000000
-8,2040,R1,heatpump,2035,12.50000000000
-8,2044,R1,heatpump,2035,12.50000000000
-8,2045,R1,heatpump,2035,12.50000000000
-8,2049,R1,heatpump,2035,12.50000000000
-9,2045,R1,heatpump,2040,19.50000000000
-9,2049,R1,heatpump,2040,19.50000000000
-9,2050,R1,heatpump,2040,19.50000000000
-9,2054,R1,heatpump,2040,19.50000000000
-10,2050,R1,heatpump,2045,23.00000000000
-10,2054,R1,heatpump,2045,23.00000000000
-10,2055,R1,heatpump,2045,23.00000000000
-10,2059,R1,heatpump,2045,23.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 49fe9db08..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,48 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,12.50000000000
-0,2030,R1,gasboiler,2020,7.50000000000
-0,2034,R1,gasboiler,2020,7.50000000000
-1,2030,R1,gasboiler,2025,3.50000000000
-1,2034,R1,gasboiler,2025,3.50000000000
-1,2035,R1,gasboiler,2025,3.50000000000
-1,2039,R1,gasboiler,2025,3.50000000000
-2,2035,R1,gasboiler,2030,12.50000000000
-2,2039,R1,gasboiler,2030,12.50000000000
-2,2040,R1,gasboiler,2030,12.50000000000
-2,2044,R1,gasboiler,2030,12.50000000000
-3,2040,R1,gasboiler,2035,4.50000000000
-3,2044,R1,gasboiler,2035,4.50000000000
-3,2045,R1,gasboiler,2035,4.50000000000
-3,2049,R1,gasboiler,2035,4.50000000000
-4,2045,R1,gasboiler,2040,11.50000000000
-4,2049,R1,gasboiler,2040,11.50000000000
-4,2050,R1,gasboiler,2040,11.50000000000
-4,2054,R1,gasboiler,2040,11.50000000000
-5,2025,R1,heatpump,2020,11.50000000000
-5,2030,R1,heatpump,2020,11.50000000000
-5,2034,R1,heatpump,2020,11.50000000000
-6,2030,R1,heatpump,2025,7.50000000000
-6,2034,R1,heatpump,2025,7.50000000000
-6,2035,R1,heatpump,2025,7.50000000000
-6,2039,R1,heatpump,2025,7.50000000000
-7,2035,R1,heatpump,2030,12.50000000000
-7,2039,R1,heatpump,2030,12.50000000000
-7,2040,R1,heatpump,2030,12.50000000000
-7,2044,R1,heatpump,2030,12.50000000000
-8,2040,R1,heatpump,2035,12.50000000000
-8,2044,R1,heatpump,2035,12.50000000000
-8,2045,R1,heatpump,2035,12.50000000000
-8,2049,R1,heatpump,2035,12.50000000000
-9,2045,R1,heatpump,2040,19.50000000000
-9,2049,R1,heatpump,2040,19.50000000000
-9,2050,R1,heatpump,2040,19.50000000000
-9,2054,R1,heatpump,2040,19.50000000000
-10,2050,R1,heatpump,2045,23.00000000000
-10,2054,R1,heatpump,2045,23.00000000000
-10,2055,R1,heatpump,2045,23.00000000000
-10,2059,R1,heatpump,2045,23.00000000000
-11,2055,R1,heatpump,2050,31.00000000000
-11,2059,R1,heatpump,2050,31.00000000000
-11,2060,R1,heatpump,2050,31.00000000000
-11,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply.csv
new file mode 100644
index 000000000..2ad7c23b7
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply.csv
@@ -0,0 +1,199 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.69440000000,gasboiler,0,2025
+2,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,44.93750000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,1.04170000000,gasboiler,1,2025
+2,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,67.40620000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.69440000000,gasboiler,2,2025
+2,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,44.93750000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,1.04170000000,gasboiler,3,2025
+2,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,67.40620000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,2.08330000000,gasboiler,4,2025
+2,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,134.81250000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,1.38890000000,gasboiler,5,2025
+2,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,89.87500000000,gasboiler,5,2025
+0,heat,all-week,night,2020,all-year,R1,0.41670000000,gasboiler,0,2030
+1,heat,all-week,night,2025,all-year,R1,0.19440000000,gasboiler,0,2030
+3,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2030
+4,heat,all-week,night,2025,all-year,R1,0.41670000000,heatpump,0,2030
+0,CO2f,all-week,night,2020,all-year,R1,26.96250000000,gasboiler,0,2030
+1,CO2f,all-week,night,2025,all-year,R1,12.58250000000,gasboiler,0,2030
+0,heat,all-week,morning,2020,all-year,R1,0.62500000000,gasboiler,1,2030
+1,heat,all-week,morning,2025,all-year,R1,0.29170000000,gasboiler,1,2030
+3,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2030
+4,heat,all-week,morning,2025,all-year,R1,0.62500000000,heatpump,1,2030
+0,CO2f,all-week,morning,2020,all-year,R1,40.44370000000,gasboiler,1,2030
+1,CO2f,all-week,morning,2025,all-year,R1,18.87370000000,gasboiler,1,2030
+0,heat,all-week,afternoon,2020,all-year,R1,0.41670000000,gasboiler,2,2030
+1,heat,all-week,afternoon,2025,all-year,R1,0.19440000000,gasboiler,2,2030
+3,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2030
+4,heat,all-week,afternoon,2025,all-year,R1,0.41670000000,heatpump,2,2030
+0,CO2f,all-week,afternoon,2020,all-year,R1,26.96250000000,gasboiler,2,2030
+1,CO2f,all-week,afternoon,2025,all-year,R1,12.58250000000,gasboiler,2,2030
+0,heat,all-week,early-peak,2020,all-year,R1,0.62500000000,gasboiler,3,2030
+1,heat,all-week,early-peak,2025,all-year,R1,0.29170000000,gasboiler,3,2030
+3,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2030
+4,heat,all-week,early-peak,2025,all-year,R1,0.62500000000,heatpump,3,2030
+0,CO2f,all-week,early-peak,2020,all-year,R1,40.44370000000,gasboiler,3,2030
+1,CO2f,all-week,early-peak,2025,all-year,R1,18.87370000000,gasboiler,3,2030
+0,heat,all-week,late-peak,2020,all-year,R1,1.25000000000,gasboiler,4,2030
+1,heat,all-week,late-peak,2025,all-year,R1,0.58330000000,gasboiler,4,2030
+3,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2030
+4,heat,all-week,late-peak,2025,all-year,R1,1.25000000000,heatpump,4,2030
+0,CO2f,all-week,late-peak,2020,all-year,R1,80.88750000000,gasboiler,4,2030
+1,CO2f,all-week,late-peak,2025,all-year,R1,37.74750000000,gasboiler,4,2030
+0,heat,all-week,evening,2020,all-year,R1,0.83330000000,gasboiler,5,2030
+1,heat,all-week,evening,2025,all-year,R1,0.38890000000,gasboiler,5,2030
+3,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2030
+4,heat,all-week,evening,2025,all-year,R1,0.83330000000,heatpump,5,2030
+0,CO2f,all-week,evening,2020,all-year,R1,53.92500000000,gasboiler,5,2030
+1,CO2f,all-week,evening,2025,all-year,R1,25.16500000000,gasboiler,5,2030
+1,heat,all-week,night,2025,all-year,R1,0.19440000000,gasboiler,0,2035
+2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2035
+5,heat,all-week,night,2025,all-year,R1,0.41670000000,heatpump,0,2035
+6,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2035
+1,CO2f,all-week,night,2025,all-year,R1,12.58250000000,gasboiler,0,2035
+2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2035
+1,heat,all-week,morning,2025,all-year,R1,0.29170000000,gasboiler,1,2035
+2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2035
+5,heat,all-week,morning,2025,all-year,R1,0.62500000000,heatpump,1,2035
+6,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2035
+1,CO2f,all-week,morning,2025,all-year,R1,18.87370000000,gasboiler,1,2035
+2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2035
+1,heat,all-week,afternoon,2025,all-year,R1,0.19440000000,gasboiler,2,2035
+2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2035
+5,heat,all-week,afternoon,2025,all-year,R1,0.41670000000,heatpump,2,2035
+6,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2035
+1,CO2f,all-week,afternoon,2025,all-year,R1,12.58250000000,gasboiler,2,2035
+2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2035
+1,heat,all-week,early-peak,2025,all-year,R1,0.29170000000,gasboiler,3,2035
+2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2035
+5,heat,all-week,early-peak,2025,all-year,R1,0.62500000000,heatpump,3,2035
+6,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2035
+1,CO2f,all-week,early-peak,2025,all-year,R1,18.87370000000,gasboiler,3,2035
+2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2035
+1,heat,all-week,late-peak,2025,all-year,R1,0.58330000000,gasboiler,4,2035
+2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2035
+5,heat,all-week,late-peak,2025,all-year,R1,1.25000000000,heatpump,4,2035
+6,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2035
+1,CO2f,all-week,late-peak,2025,all-year,R1,37.74750000000,gasboiler,4,2035
+2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2035
+1,heat,all-week,evening,2025,all-year,R1,0.38890000000,gasboiler,5,2035
+2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2035
+5,heat,all-week,evening,2025,all-year,R1,0.83330000000,heatpump,5,2035
+6,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2035
+1,CO2f,all-week,evening,2025,all-year,R1,25.16500000000,gasboiler,5,2035
+2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2035
+2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2040
+3,heat,all-week,night,2035,all-year,R1,0.25000000000,gasboiler,0,2040
+7,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2040
+8,heat,all-week,night,2035,all-year,R1,0.69440000000,heatpump,0,2040
+2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2040
+3,CO2f,all-week,night,2035,all-year,R1,16.17750000000,gasboiler,0,2040
+2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2040
+3,heat,all-week,morning,2035,all-year,R1,0.37500000000,gasboiler,1,2040
+7,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2040
+8,heat,all-week,morning,2035,all-year,R1,1.04170000000,heatpump,1,2040
+2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2040
+3,CO2f,all-week,morning,2035,all-year,R1,24.26620000000,gasboiler,1,2040
+2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2040
+3,heat,all-week,afternoon,2035,all-year,R1,0.25000000000,gasboiler,2,2040
+7,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2040
+8,heat,all-week,afternoon,2035,all-year,R1,0.69440000000,heatpump,2,2040
+2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2040
+3,CO2f,all-week,afternoon,2035,all-year,R1,16.17750000000,gasboiler,2,2040
+2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2040
+3,heat,all-week,early-peak,2035,all-year,R1,0.37500000000,gasboiler,3,2040
+7,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2040
+8,heat,all-week,early-peak,2035,all-year,R1,1.04170000000,heatpump,3,2040
+2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2040
+3,CO2f,all-week,early-peak,2035,all-year,R1,24.26620000000,gasboiler,3,2040
+2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2040
+3,heat,all-week,late-peak,2035,all-year,R1,0.75000000000,gasboiler,4,2040
+7,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2040
+8,heat,all-week,late-peak,2035,all-year,R1,2.08330000000,heatpump,4,2040
+2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2040
+3,CO2f,all-week,late-peak,2035,all-year,R1,48.53250000000,gasboiler,4,2040
+2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2040
+3,heat,all-week,evening,2035,all-year,R1,0.50000000000,gasboiler,5,2040
+7,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2040
+8,heat,all-week,evening,2035,all-year,R1,1.38890000000,heatpump,5,2040
+2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2040
+3,CO2f,all-week,evening,2035,all-year,R1,32.35500000000,gasboiler,5,2040
+3,heat,all-week,night,2035,all-year,R1,0.25000000000,gasboiler,0,2045
+4,heat,all-week,night,2040,all-year,R1,0.63890000000,gasboiler,0,2045
+8,heat,all-week,night,2035,all-year,R1,0.69440000000,heatpump,0,2045
+9,heat,all-week,night,2040,all-year,R1,1.08330000000,heatpump,0,2045
+3,CO2f,all-week,night,2035,all-year,R1,16.17750000000,gasboiler,0,2045
+4,CO2f,all-week,night,2040,all-year,R1,41.34250000000,gasboiler,0,2045
+3,heat,all-week,morning,2035,all-year,R1,0.37500000000,gasboiler,1,2045
+4,heat,all-week,morning,2040,all-year,R1,0.95830000000,gasboiler,1,2045
+8,heat,all-week,morning,2035,all-year,R1,1.04170000000,heatpump,1,2045
+9,heat,all-week,morning,2040,all-year,R1,1.62500000000,heatpump,1,2045
+3,CO2f,all-week,morning,2035,all-year,R1,24.26620000000,gasboiler,1,2045
+4,CO2f,all-week,morning,2040,all-year,R1,62.01380000000,gasboiler,1,2045
+3,heat,all-week,afternoon,2035,all-year,R1,0.25000000000,gasboiler,2,2045
+4,heat,all-week,afternoon,2040,all-year,R1,0.63890000000,gasboiler,2,2045
+8,heat,all-week,afternoon,2035,all-year,R1,0.69440000000,heatpump,2,2045
+9,heat,all-week,afternoon,2040,all-year,R1,1.08330000000,heatpump,2,2045
+3,CO2f,all-week,afternoon,2035,all-year,R1,16.17750000000,gasboiler,2,2045
+4,CO2f,all-week,afternoon,2040,all-year,R1,41.34250000000,gasboiler,2,2045
+3,heat,all-week,early-peak,2035,all-year,R1,0.37500000000,gasboiler,3,2045
+4,heat,all-week,early-peak,2040,all-year,R1,0.95830000000,gasboiler,3,2045
+8,heat,all-week,early-peak,2035,all-year,R1,1.04170000000,heatpump,3,2045
+9,heat,all-week,early-peak,2040,all-year,R1,1.62500000000,heatpump,3,2045
+3,CO2f,all-week,early-peak,2035,all-year,R1,24.26620000000,gasboiler,3,2045
+4,CO2f,all-week,early-peak,2040,all-year,R1,62.01380000000,gasboiler,3,2045
+3,heat,all-week,late-peak,2035,all-year,R1,0.75000000000,gasboiler,4,2045
+4,heat,all-week,late-peak,2040,all-year,R1,1.91670000000,gasboiler,4,2045
+8,heat,all-week,late-peak,2035,all-year,R1,2.08330000000,heatpump,4,2045
+9,heat,all-week,late-peak,2040,all-year,R1,3.25000000000,heatpump,4,2045
+3,CO2f,all-week,late-peak,2035,all-year,R1,48.53250000000,gasboiler,4,2045
+4,CO2f,all-week,late-peak,2040,all-year,R1,124.02750000000,gasboiler,4,2045
+3,heat,all-week,evening,2035,all-year,R1,0.50000000000,gasboiler,5,2045
+4,heat,all-week,evening,2040,all-year,R1,1.27780000000,gasboiler,5,2045
+8,heat,all-week,evening,2035,all-year,R1,1.38890000000,heatpump,5,2045
+9,heat,all-week,evening,2040,all-year,R1,2.16670000000,heatpump,5,2045
+3,CO2f,all-week,evening,2035,all-year,R1,32.35500000000,gasboiler,5,2045
+4,CO2f,all-week,evening,2040,all-year,R1,82.68500000000,gasboiler,5,2045
+4,heat,all-week,night,2040,all-year,R1,0.63890000000,gasboiler,0,2050
+9,heat,all-week,night,2040,all-year,R1,1.08330000000,heatpump,0,2050
+10,heat,all-week,night,2045,all-year,R1,1.27780000000,heatpump,0,2050
+4,CO2f,all-week,night,2040,all-year,R1,41.34250000000,gasboiler,0,2050
+4,heat,all-week,morning,2040,all-year,R1,0.95830000000,gasboiler,1,2050
+9,heat,all-week,morning,2040,all-year,R1,1.62500000000,heatpump,1,2050
+10,heat,all-week,morning,2045,all-year,R1,1.91670000000,heatpump,1,2050
+4,CO2f,all-week,morning,2040,all-year,R1,62.01380000000,gasboiler,1,2050
+4,heat,all-week,afternoon,2040,all-year,R1,0.63890000000,gasboiler,2,2050
+9,heat,all-week,afternoon,2040,all-year,R1,1.08330000000,heatpump,2,2050
+10,heat,all-week,afternoon,2045,all-year,R1,1.27780000000,heatpump,2,2050
+4,CO2f,all-week,afternoon,2040,all-year,R1,41.34250000000,gasboiler,2,2050
+4,heat,all-week,early-peak,2040,all-year,R1,0.95830000000,gasboiler,3,2050
+9,heat,all-week,early-peak,2040,all-year,R1,1.62500000000,heatpump,3,2050
+10,heat,all-week,early-peak,2045,all-year,R1,1.91670000000,heatpump,3,2050
+4,CO2f,all-week,early-peak,2040,all-year,R1,62.01380000000,gasboiler,3,2050
+4,heat,all-week,late-peak,2040,all-year,R1,1.91670000000,gasboiler,4,2050
+9,heat,all-week,late-peak,2040,all-year,R1,3.25000000000,heatpump,4,2050
+10,heat,all-week,late-peak,2045,all-year,R1,3.83330000000,heatpump,4,2050
+4,CO2f,all-week,late-peak,2040,all-year,R1,124.02750000000,gasboiler,4,2050
+4,heat,all-week,evening,2040,all-year,R1,1.27780000000,gasboiler,5,2050
+9,heat,all-week,evening,2040,all-year,R1,2.16670000000,heatpump,5,2050
+10,heat,all-week,evening,2045,all-year,R1,2.55560000000,heatpump,5,2050
+4,CO2f,all-week,evening,2040,all-year,R1,82.68500000000,gasboiler,5,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
deleted file mode 100644
index cdc2e5a40..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 8ef451c83..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000
-0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.41670000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000
-0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000
-1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.62500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000
-1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000
-2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000
-2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000
-3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000
-3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000
-4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000
-4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000
-5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.83330000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000
-5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
deleted file mode 100644
index aeea8ae59..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000
-0,heat,2030,3,R1,all-year,all-week,night,heatpump,2020,0.63890000000
-0,heat,2030,4,R1,all-year,all-week,night,heatpump,2025,0.41670000000
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000
-0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2035,4,R1,all-year,all-week,night,heatpump,2025,0.41670000000
-0,heat,2035,5,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000
-0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000
-1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2020,0.95830000000
-1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2025,0.62500000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000
-1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2025,0.62500000000
-1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000
-1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000
-2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000
-2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000
-2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000
-2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000
-3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000
-3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000
-3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000
-3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000
-4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000
-4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000
-4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000
-4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000
-5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2020,1.27780000000
-5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2025,0.83330000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000
-5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2025,0.83330000000
-5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000
-5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 40bc2d929..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000
-0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2035,5,R1,all-year,all-week,night,heatpump,2025,0.41670000000
-0,heat,2035,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000
-0,heat,2040,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,heat,2040,7,R1,all-year,all-week,night,heatpump,2035,0.69440000000
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000
-0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000
-1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2025,0.62500000000
-1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000
-1,heat,2040,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2035,1.04170000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000
-1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000
-2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000
-2,heat,2040,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000
-2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000
-3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000
-3,heat,2040,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000
-3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000
-4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000
-4,heat,2040,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000
-4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000
-5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2025,0.83330000000
-5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000
-5,heat,2040,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2035,1.38890000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000
-5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
-5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
-5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 0f091fe39..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000
-0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000
-0,heat,2040,7,R1,all-year,all-week,night,heatpump,2030,0.69440000000
-0,heat,2040,8,R1,all-year,all-week,night,heatpump,2035,0.69440000000
-0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000
-0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000
-0,heat,2045,8,R1,all-year,all-week,night,heatpump,2035,0.69440000000
-0,heat,2045,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000
-0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000
-0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000
-0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000
-0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000
-1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000
-1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000
-1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2030,1.04170000000
-1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2035,1.04170000000
-1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000
-1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000
-1,heat,2045,8,R1,all-year,all-week,morning,heatpump,2035,1.04170000000
-1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000
-1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000
-1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000
-1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000
-1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000
-2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000
-2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000
-2,heat,2045,8,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000
-2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000
-2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000
-2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000
-2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000
-2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000
-3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000
-3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000
-3,heat,2045,8,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000
-3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000
-3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000
-3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000
-3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000
-3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000
-4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000
-4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000
-4,heat,2045,8,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000
-4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000
-4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000
-4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000
-4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000
-4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000
-5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000
-5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000
-5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2030,1.38890000000
-5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2035,1.38890000000
-5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000
-5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000
-5,heat,2045,8,R1,all-year,all-week,evening,heatpump,2035,1.38890000000
-5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000
-5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000
-5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000
-5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000
-5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 3846e0af7..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000
-0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000
-0,heat,2045,8,R1,all-year,all-week,night,heatpump,2035,0.69440000000
-0,heat,2045,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000
-0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000
-0,heat,2050,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000
-0,heat,2050,10,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000
-0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000
-0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000
-1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000
-1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000
-1,heat,2045,8,R1,all-year,all-week,morning,heatpump,2035,1.04170000000
-1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000
-1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000
-1,heat,2050,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000
-1,heat,2050,10,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000
-1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000
-1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000
-2,heat,2045,8,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000
-2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000
-2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000
-2,heat,2050,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000
-2,heat,2050,10,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000
-2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000
-2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000
-3,heat,2045,8,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000
-3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000
-3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000
-3,heat,2050,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000
-3,heat,2050,10,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000
-3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000
-3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000
-4,heat,2045,8,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000
-4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000
-4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000
-4,heat,2050,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000
-4,heat,2050,10,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000
-4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000
-4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000
-5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000
-5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000
-5,heat,2045,8,R1,all-year,all-week,evening,heatpump,2035,1.38890000000
-5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000
-5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000
-5,heat,2050,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000
-5,heat,2050,10,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000
-5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000
-5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 4c17f26c7..000000000
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000
-0,heat,2050,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000
-0,heat,2050,10,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,10,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,11,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000
-1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000
-1,heat,2050,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000
-1,heat,2050,10,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,10,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,11,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000
-2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000
-2,heat,2050,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000
-2,heat,2050,10,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,10,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,11,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000
-3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000
-3,heat,2050,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000
-3,heat,2050,10,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,10,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,11,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000
-4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000
-4,heat,2050,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000
-4,heat,2050,10,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,10,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,11,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000
-5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000
-5,heat,2050,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000
-5,heat,2050,10,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,10,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,11,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
-5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 29306d1c9..9d851f603 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..07daecef1
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity.csv
@@ -0,0 +1,33 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+1,15.00000000000,2020,R2,gassupply1,2020
+0,16.46440000000,2020,R1,gassupply1,2025
+2,16.46440000000,2020,R2,gassupply1,2025
+0,8.96440000000,2020,R1,gassupply1,2030
+1,9.22000000000,2025,R1,gassupply1,2030
+3,8.96440000000,2020,R2,gassupply1,2030
+4,9.22000000000,2025,R2,gassupply1,2030
+0,1.46440000000,2020,R1,gassupply1,2035
+1,9.22000000000,2025,R1,gassupply1,2035
+2,7.50000000000,2030,R1,gassupply1,2035
+3,1.46440000000,2020,R2,gassupply1,2035
+4,9.22000000000,2025,R2,gassupply1,2035
+5,7.50000000000,2030,R2,gassupply1,2035
+0,1.46440000000,2020,R1,gassupply1,2040
+1,9.22000000000,2025,R1,gassupply1,2040
+2,7.50000000000,2030,R1,gassupply1,2040
+3,1.46440000000,2020,R2,gassupply1,2040
+4,9.22000000000,2025,R2,gassupply1,2040
+5,7.50000000000,2030,R2,gassupply1,2040
+0,1.46440000000,2020,R1,gassupply1,2045
+1,9.22000000000,2025,R1,gassupply1,2045
+2,7.50000000000,2030,R1,gassupply1,2045
+3,1.46440000000,2020,R2,gassupply1,2045
+4,9.22000000000,2025,R2,gassupply1,2045
+5,7.50000000000,2030,R2,gassupply1,2045
+0,1.46440000000,2020,R1,gassupply1,2050
+1,9.22000000000,2025,R1,gassupply1,2050
+2,7.50000000000,2030,R1,gassupply1,2050
+3,1.46440000000,2020,R2,gassupply1,2050
+4,9.22000000000,2025,R2,gassupply1,2050
+5,7.50000000000,2030,R2,gassupply1,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index a9f8dab3c..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,16.46440000000
-1,2030,R2,gassupply1,2020,8.96440000000
-1,2035,R2,gassupply1,2020,1.46440000000
-1,2040,R2,gassupply1,2020,1.46440000000
-1,2045,R2,gassupply1,2020,1.46440000000
-1,2050,R2,gassupply1,2020,1.46440000000
-1,2059,R2,gassupply1,2020,1.46440000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 0435bbe20..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,16.46440000000
-2,2030,R2,gassupply1,2020,8.96440000000
-2,2035,R2,gassupply1,2020,1.46440000000
-2,2040,R2,gassupply1,2020,1.46440000000
-2,2045,R2,gassupply1,2020,1.46440000000
-2,2050,R2,gassupply1,2020,1.46440000000
-2,2059,R2,gassupply1,2020,1.46440000000
-3,2030,R2,gassupply1,2025,9.22000000000
-3,2035,R2,gassupply1,2025,9.22000000000
-3,2040,R2,gassupply1,2025,9.22000000000
-3,2045,R2,gassupply1,2025,9.22000000000
-3,2050,R2,gassupply1,2025,9.22000000000
-3,2059,R2,gassupply1,2025,9.22000000000
-3,2060,R2,gassupply1,2025,9.22000000000
-3,2064,R2,gassupply1,2025,9.22000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 0fc96ab80..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.46440000000
-3,2030,R2,gassupply1,2020,8.96440000000
-3,2035,R2,gassupply1,2020,1.46440000000
-3,2040,R2,gassupply1,2020,1.46440000000
-3,2045,R2,gassupply1,2020,1.46440000000
-3,2050,R2,gassupply1,2020,1.46440000000
-3,2059,R2,gassupply1,2020,1.46440000000
-4,2030,R2,gassupply1,2025,9.22000000000
-4,2035,R2,gassupply1,2025,9.22000000000
-4,2040,R2,gassupply1,2025,9.22000000000
-4,2045,R2,gassupply1,2025,9.22000000000
-4,2050,R2,gassupply1,2025,9.22000000000
-4,2059,R2,gassupply1,2025,9.22000000000
-4,2060,R2,gassupply1,2025,9.22000000000
-4,2064,R2,gassupply1,2025,9.22000000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 0fc96ab80..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.46440000000
-3,2030,R2,gassupply1,2020,8.96440000000
-3,2035,R2,gassupply1,2020,1.46440000000
-3,2040,R2,gassupply1,2020,1.46440000000
-3,2045,R2,gassupply1,2020,1.46440000000
-3,2050,R2,gassupply1,2020,1.46440000000
-3,2059,R2,gassupply1,2020,1.46440000000
-4,2030,R2,gassupply1,2025,9.22000000000
-4,2035,R2,gassupply1,2025,9.22000000000
-4,2040,R2,gassupply1,2025,9.22000000000
-4,2045,R2,gassupply1,2025,9.22000000000
-4,2050,R2,gassupply1,2025,9.22000000000
-4,2059,R2,gassupply1,2025,9.22000000000
-4,2060,R2,gassupply1,2025,9.22000000000
-4,2064,R2,gassupply1,2025,9.22000000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 0fc96ab80..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.46440000000
-3,2030,R2,gassupply1,2020,8.96440000000
-3,2035,R2,gassupply1,2020,1.46440000000
-3,2040,R2,gassupply1,2020,1.46440000000
-3,2045,R2,gassupply1,2020,1.46440000000
-3,2050,R2,gassupply1,2020,1.46440000000
-3,2059,R2,gassupply1,2020,1.46440000000
-4,2030,R2,gassupply1,2025,9.22000000000
-4,2035,R2,gassupply1,2025,9.22000000000
-4,2040,R2,gassupply1,2025,9.22000000000
-4,2045,R2,gassupply1,2025,9.22000000000
-4,2050,R2,gassupply1,2025,9.22000000000
-4,2059,R2,gassupply1,2025,9.22000000000
-4,2060,R2,gassupply1,2025,9.22000000000
-4,2064,R2,gassupply1,2025,9.22000000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 0fc96ab80..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.46440000000
-3,2030,R2,gassupply1,2020,8.96440000000
-3,2035,R2,gassupply1,2020,1.46440000000
-3,2040,R2,gassupply1,2020,1.46440000000
-3,2045,R2,gassupply1,2020,1.46440000000
-3,2050,R2,gassupply1,2020,1.46440000000
-3,2059,R2,gassupply1,2020,1.46440000000
-4,2030,R2,gassupply1,2025,9.22000000000
-4,2035,R2,gassupply1,2025,9.22000000000
-4,2040,R2,gassupply1,2025,9.22000000000
-4,2045,R2,gassupply1,2025,9.22000000000
-4,2050,R2,gassupply1,2025,9.22000000000
-4,2059,R2,gassupply1,2025,9.22000000000
-4,2060,R2,gassupply1,2025,9.22000000000
-4,2064,R2,gassupply1,2025,9.22000000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 0fc96ab80..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,9.22000000000
-1,2035,R1,gassupply1,2025,9.22000000000
-1,2040,R1,gassupply1,2025,9.22000000000
-1,2045,R1,gassupply1,2025,9.22000000000
-1,2050,R1,gassupply1,2025,9.22000000000
-1,2059,R1,gassupply1,2025,9.22000000000
-1,2060,R1,gassupply1,2025,9.22000000000
-1,2064,R1,gassupply1,2025,9.22000000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.46440000000
-3,2030,R2,gassupply1,2020,8.96440000000
-3,2035,R2,gassupply1,2020,1.46440000000
-3,2040,R2,gassupply1,2020,1.46440000000
-3,2045,R2,gassupply1,2020,1.46440000000
-3,2050,R2,gassupply1,2020,1.46440000000
-3,2059,R2,gassupply1,2020,1.46440000000
-4,2030,R2,gassupply1,2025,9.22000000000
-4,2035,R2,gassupply1,2025,9.22000000000
-4,2040,R2,gassupply1,2025,9.22000000000
-4,2045,R2,gassupply1,2025,9.22000000000
-4,2050,R2,gassupply1,2025,9.22000000000
-4,2059,R2,gassupply1,2025,9.22000000000
-4,2060,R2,gassupply1,2025,9.22000000000
-4,2064,R2,gassupply1,2025,9.22000000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity.csv
new file mode 100644
index 000000000..63f0b9018
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity.csv
@@ -0,0 +1,57 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+2,1.00000000000,2020,R2,gasCCGT,2020
+0,6.00000000000,2020,R1,gasCCGT,2025
+2,5.50000000000,2020,R1,windturbine,2025
+3,6.00000000000,2020,R2,gasCCGT,2025
+5,5.50000000000,2020,R2,windturbine,2025
+0,5.00000000000,2020,R1,gasCCGT,2030
+1,5.88890000000,2025,R1,gasCCGT,2030
+3,5.50000000000,2020,R1,windturbine,2030
+4,5.00000000000,2020,R2,gasCCGT,2030
+5,5.88890000000,2025,R2,gasCCGT,2030
+7,5.50000000000,2020,R2,windturbine,2030
+0,5.00000000000,2020,R1,gasCCGT,2035
+1,5.88890000000,2025,R1,gasCCGT,2035
+2,6.00000000000,2030,R1,solarPV,2035
+4,5.50000000000,2020,R1,windturbine,2035
+5,5.00000000000,2020,R2,gasCCGT,2035
+6,5.88890000000,2025,R2,gasCCGT,2035
+7,6.00000000000,2030,R2,solarPV,2035
+9,5.50000000000,2020,R2,windturbine,2035
+0,5.00000000000,2020,R1,gasCCGT,2040
+1,5.88890000000,2025,R1,gasCCGT,2040
+2,6.00000000000,2030,R1,solarPV,2040
+3,6.00000000000,2035,R1,solarPV,2040
+5,5.50000000000,2020,R1,windturbine,2040
+6,5.00000000000,2020,R2,gasCCGT,2040
+7,5.88890000000,2025,R2,gasCCGT,2040
+8,6.00000000000,2030,R2,solarPV,2040
+9,6.00000000000,2035,R2,solarPV,2040
+11,5.50000000000,2020,R2,windturbine,2040
+0,5.00000000000,2020,R1,gasCCGT,2045
+1,5.88890000000,2025,R1,gasCCGT,2045
+2,6.00000000000,2030,R1,solarPV,2045
+3,6.00000000000,2035,R1,solarPV,2045
+4,6.00000000000,2040,R1,solarPV,2045
+6,5.50000000000,2020,R1,windturbine,2045
+8,5.00000000000,2020,R2,gasCCGT,2045
+9,5.88890000000,2025,R2,gasCCGT,2045
+10,6.00000000000,2030,R2,solarPV,2045
+11,6.00000000000,2035,R2,solarPV,2045
+12,6.00000000000,2040,R2,solarPV,2045
+14,5.50000000000,2020,R2,windturbine,2045
+0,5.00000000000,2020,R1,gasCCGT,2050
+1,5.88890000000,2025,R1,gasCCGT,2050
+2,6.00000000000,2030,R1,solarPV,2050
+3,6.00000000000,2035,R1,solarPV,2050
+4,6.00000000000,2040,R1,solarPV,2050
+5,10.00000000000,2045,R1,solarPV,2050
+7,1.50000000000,2045,R1,windturbine,2050
+8,5.00000000000,2020,R2,gasCCGT,2050
+9,5.88890000000,2025,R2,gasCCGT,2050
+10,6.00000000000,2030,R2,solarPV,2050
+11,6.00000000000,2035,R2,solarPV,2050
+12,6.00000000000,2040,R2,solarPV,2050
+13,10.00000000000,2045,R2,solarPV,2050
+15,1.50000000000,2045,R2,windturbine,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 230d15447..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2025,R1,windturbine,2020,5.50000000000
-1,2030,R1,windturbine,2020,5.50000000000
-1,2035,R1,windturbine,2020,5.50000000000
-1,2040,R1,windturbine,2020,5.50000000000
-1,2045,R1,windturbine,2020,5.50000000000
-1,2049,R1,windturbine,2020,5.50000000000
-2,2020,R2,gasCCGT,2020,1.00000000000
-2,2025,R2,gasCCGT,2020,6.00000000000
-2,2030,R2,gasCCGT,2020,5.00000000000
-2,2035,R2,gasCCGT,2020,5.00000000000
-2,2040,R2,gasCCGT,2020,5.00000000000
-2,2045,R2,gasCCGT,2020,5.00000000000
-2,2049,R2,gasCCGT,2020,5.00000000000
-2,2050,R2,gasCCGT,2020,5.00000000000
-2,2059,R2,gasCCGT,2020,5.00000000000
-3,2025,R2,windturbine,2020,5.50000000000
-3,2030,R2,windturbine,2020,5.50000000000
-3,2035,R2,windturbine,2020,5.50000000000
-3,2040,R2,windturbine,2020,5.50000000000
-3,2045,R2,windturbine,2020,5.50000000000
-3,2049,R2,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
deleted file mode 100644
index d8d5ff9a6..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,windturbine,2020,5.50000000000
-2,2030,R1,windturbine,2020,5.50000000000
-2,2035,R1,windturbine,2020,5.50000000000
-2,2040,R1,windturbine,2020,5.50000000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
-3,2020,R2,gasCCGT,2020,1.00000000000
-3,2025,R2,gasCCGT,2020,6.00000000000
-3,2030,R2,gasCCGT,2020,5.00000000000
-3,2035,R2,gasCCGT,2020,5.00000000000
-3,2040,R2,gasCCGT,2020,5.00000000000
-3,2045,R2,gasCCGT,2020,5.00000000000
-3,2049,R2,gasCCGT,2020,5.00000000000
-3,2050,R2,gasCCGT,2020,5.00000000000
-3,2059,R2,gasCCGT,2020,5.00000000000
-4,2030,R2,gasCCGT,2025,5.88890000000
-4,2035,R2,gasCCGT,2025,5.88890000000
-4,2040,R2,gasCCGT,2025,5.88890000000
-4,2045,R2,gasCCGT,2025,5.88890000000
-4,2049,R2,gasCCGT,2025,5.88890000000
-4,2050,R2,gasCCGT,2025,5.88890000000
-4,2059,R2,gasCCGT,2025,5.88890000000
-4,2060,R2,gasCCGT,2025,5.88890000000
-4,2064,R2,gasCCGT,2025,5.88890000000
-5,2025,R2,windturbine,2020,5.50000000000
-5,2030,R2,windturbine,2020,5.50000000000
-5,2035,R2,windturbine,2020,5.50000000000
-5,2040,R2,windturbine,2020,5.50000000000
-5,2045,R2,windturbine,2020,5.50000000000
-5,2049,R2,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
deleted file mode 100644
index a1f378b94..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2025,R1,windturbine,2020,5.50000000000
-3,2030,R1,windturbine,2020,5.50000000000
-3,2035,R1,windturbine,2020,5.50000000000
-3,2040,R1,windturbine,2020,5.50000000000
-3,2045,R1,windturbine,2020,5.50000000000
-3,2049,R1,windturbine,2020,5.50000000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,6.00000000000
-4,2030,R2,gasCCGT,2020,5.00000000000
-4,2035,R2,gasCCGT,2020,5.00000000000
-4,2040,R2,gasCCGT,2020,5.00000000000
-4,2045,R2,gasCCGT,2020,5.00000000000
-4,2049,R2,gasCCGT,2020,5.00000000000
-4,2050,R2,gasCCGT,2020,5.00000000000
-4,2059,R2,gasCCGT,2020,5.00000000000
-5,2030,R2,gasCCGT,2025,5.88890000000
-5,2035,R2,gasCCGT,2025,5.88890000000
-5,2040,R2,gasCCGT,2025,5.88890000000
-5,2045,R2,gasCCGT,2025,5.88890000000
-5,2049,R2,gasCCGT,2025,5.88890000000
-5,2050,R2,gasCCGT,2025,5.88890000000
-5,2059,R2,gasCCGT,2025,5.88890000000
-5,2060,R2,gasCCGT,2025,5.88890000000
-5,2064,R2,gasCCGT,2025,5.88890000000
-6,2035,R2,solarPV,2030,6.00000000000
-6,2040,R2,solarPV,2030,6.00000000000
-6,2045,R2,solarPV,2030,6.00000000000
-6,2049,R2,solarPV,2030,6.00000000000
-6,2050,R2,solarPV,2030,6.00000000000
-6,2059,R2,solarPV,2030,6.00000000000
-7,2025,R2,windturbine,2020,5.50000000000
-7,2030,R2,windturbine,2020,5.50000000000
-7,2035,R2,windturbine,2020,5.50000000000
-7,2040,R2,windturbine,2020,5.50000000000
-7,2045,R2,windturbine,2020,5.50000000000
-7,2049,R2,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 22f75e3b2..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,75 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2025,R1,windturbine,2020,5.50000000000
-4,2030,R1,windturbine,2020,5.50000000000
-4,2035,R1,windturbine,2020,5.50000000000
-4,2040,R1,windturbine,2020,5.50000000000
-4,2045,R1,windturbine,2020,5.50000000000
-4,2049,R1,windturbine,2020,5.50000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,6.00000000000
-5,2030,R2,gasCCGT,2020,5.00000000000
-5,2035,R2,gasCCGT,2020,5.00000000000
-5,2040,R2,gasCCGT,2020,5.00000000000
-5,2045,R2,gasCCGT,2020,5.00000000000
-5,2049,R2,gasCCGT,2020,5.00000000000
-5,2050,R2,gasCCGT,2020,5.00000000000
-5,2059,R2,gasCCGT,2020,5.00000000000
-6,2030,R2,gasCCGT,2025,5.88890000000
-6,2035,R2,gasCCGT,2025,5.88890000000
-6,2040,R2,gasCCGT,2025,5.88890000000
-6,2045,R2,gasCCGT,2025,5.88890000000
-6,2049,R2,gasCCGT,2025,5.88890000000
-6,2050,R2,gasCCGT,2025,5.88890000000
-6,2059,R2,gasCCGT,2025,5.88890000000
-6,2060,R2,gasCCGT,2025,5.88890000000
-6,2064,R2,gasCCGT,2025,5.88890000000
-7,2035,R2,solarPV,2030,6.00000000000
-7,2040,R2,solarPV,2030,6.00000000000
-7,2045,R2,solarPV,2030,6.00000000000
-7,2049,R2,solarPV,2030,6.00000000000
-7,2050,R2,solarPV,2030,6.00000000000
-7,2059,R2,solarPV,2030,6.00000000000
-8,2040,R2,solarPV,2035,6.00000000000
-8,2045,R2,solarPV,2035,6.00000000000
-8,2049,R2,solarPV,2035,6.00000000000
-8,2050,R2,solarPV,2035,6.00000000000
-8,2059,R2,solarPV,2035,6.00000000000
-8,2060,R2,solarPV,2035,6.00000000000
-8,2064,R2,solarPV,2035,6.00000000000
-9,2025,R2,windturbine,2020,5.50000000000
-9,2030,R2,windturbine,2020,5.50000000000
-9,2035,R2,windturbine,2020,5.50000000000
-9,2040,R2,windturbine,2020,5.50000000000
-9,2045,R2,windturbine,2020,5.50000000000
-9,2049,R2,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 8dd1d23f2..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,91 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2025,R1,windturbine,2020,5.50000000000
-5,2030,R1,windturbine,2020,5.50000000000
-5,2035,R1,windturbine,2020,5.50000000000
-5,2040,R1,windturbine,2020,5.50000000000
-5,2045,R1,windturbine,2020,5.50000000000
-5,2049,R1,windturbine,2020,5.50000000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,6.00000000000
-6,2030,R2,gasCCGT,2020,5.00000000000
-6,2035,R2,gasCCGT,2020,5.00000000000
-6,2040,R2,gasCCGT,2020,5.00000000000
-6,2045,R2,gasCCGT,2020,5.00000000000
-6,2049,R2,gasCCGT,2020,5.00000000000
-6,2050,R2,gasCCGT,2020,5.00000000000
-6,2059,R2,gasCCGT,2020,5.00000000000
-7,2030,R2,gasCCGT,2025,5.88890000000
-7,2035,R2,gasCCGT,2025,5.88890000000
-7,2040,R2,gasCCGT,2025,5.88890000000
-7,2045,R2,gasCCGT,2025,5.88890000000
-7,2049,R2,gasCCGT,2025,5.88890000000
-7,2050,R2,gasCCGT,2025,5.88890000000
-7,2059,R2,gasCCGT,2025,5.88890000000
-7,2060,R2,gasCCGT,2025,5.88890000000
-7,2064,R2,gasCCGT,2025,5.88890000000
-8,2035,R2,solarPV,2030,6.00000000000
-8,2040,R2,solarPV,2030,6.00000000000
-8,2045,R2,solarPV,2030,6.00000000000
-8,2049,R2,solarPV,2030,6.00000000000
-8,2050,R2,solarPV,2030,6.00000000000
-8,2059,R2,solarPV,2030,6.00000000000
-9,2040,R2,solarPV,2035,6.00000000000
-9,2045,R2,solarPV,2035,6.00000000000
-9,2049,R2,solarPV,2035,6.00000000000
-9,2050,R2,solarPV,2035,6.00000000000
-9,2059,R2,solarPV,2035,6.00000000000
-9,2060,R2,solarPV,2035,6.00000000000
-9,2064,R2,solarPV,2035,6.00000000000
-10,2045,R2,solarPV,2040,6.00000000000
-10,2049,R2,solarPV,2040,6.00000000000
-10,2050,R2,solarPV,2040,6.00000000000
-10,2059,R2,solarPV,2040,6.00000000000
-10,2060,R2,solarPV,2040,6.00000000000
-10,2064,R2,solarPV,2040,6.00000000000
-10,2065,R2,solarPV,2040,6.00000000000
-10,2069,R2,solarPV,2040,6.00000000000
-11,2025,R2,windturbine,2020,5.50000000000
-11,2030,R2,windturbine,2020,5.50000000000
-11,2035,R2,windturbine,2020,5.50000000000
-11,2040,R2,windturbine,2020,5.50000000000
-11,2045,R2,windturbine,2020,5.50000000000
-11,2049,R2,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
deleted file mode 100644
index aa854417a..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,123 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,10.00000000000
-5,2059,R1,solarPV,2045,10.00000000000
-5,2060,R1,solarPV,2045,10.00000000000
-5,2064,R1,solarPV,2045,10.00000000000
-5,2065,R1,solarPV,2045,10.00000000000
-5,2069,R1,solarPV,2045,10.00000000000
-5,2070,R1,solarPV,2045,10.00000000000
-5,2074,R1,solarPV,2045,10.00000000000
-6,2025,R1,windturbine,2020,5.50000000000
-6,2030,R1,windturbine,2020,5.50000000000
-6,2035,R1,windturbine,2020,5.50000000000
-6,2040,R1,windturbine,2020,5.50000000000
-6,2045,R1,windturbine,2020,5.50000000000
-6,2049,R1,windturbine,2020,5.50000000000
-7,2050,R1,windturbine,2045,1.50000000000
-7,2059,R1,windturbine,2045,1.50000000000
-7,2060,R1,windturbine,2045,1.50000000000
-7,2064,R1,windturbine,2045,1.50000000000
-7,2065,R1,windturbine,2045,1.50000000000
-7,2069,R1,windturbine,2045,1.50000000000
-7,2070,R1,windturbine,2045,1.50000000000
-7,2074,R1,windturbine,2045,1.50000000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,6.00000000000
-8,2030,R2,gasCCGT,2020,5.00000000000
-8,2035,R2,gasCCGT,2020,5.00000000000
-8,2040,R2,gasCCGT,2020,5.00000000000
-8,2045,R2,gasCCGT,2020,5.00000000000
-8,2049,R2,gasCCGT,2020,5.00000000000
-8,2050,R2,gasCCGT,2020,5.00000000000
-8,2059,R2,gasCCGT,2020,5.00000000000
-9,2030,R2,gasCCGT,2025,5.88890000000
-9,2035,R2,gasCCGT,2025,5.88890000000
-9,2040,R2,gasCCGT,2025,5.88890000000
-9,2045,R2,gasCCGT,2025,5.88890000000
-9,2049,R2,gasCCGT,2025,5.88890000000
-9,2050,R2,gasCCGT,2025,5.88890000000
-9,2059,R2,gasCCGT,2025,5.88890000000
-9,2060,R2,gasCCGT,2025,5.88890000000
-9,2064,R2,gasCCGT,2025,5.88890000000
-10,2035,R2,solarPV,2030,6.00000000000
-10,2040,R2,solarPV,2030,6.00000000000
-10,2045,R2,solarPV,2030,6.00000000000
-10,2049,R2,solarPV,2030,6.00000000000
-10,2050,R2,solarPV,2030,6.00000000000
-10,2059,R2,solarPV,2030,6.00000000000
-11,2040,R2,solarPV,2035,6.00000000000
-11,2045,R2,solarPV,2035,6.00000000000
-11,2049,R2,solarPV,2035,6.00000000000
-11,2050,R2,solarPV,2035,6.00000000000
-11,2059,R2,solarPV,2035,6.00000000000
-11,2060,R2,solarPV,2035,6.00000000000
-11,2064,R2,solarPV,2035,6.00000000000
-12,2045,R2,solarPV,2040,6.00000000000
-12,2049,R2,solarPV,2040,6.00000000000
-12,2050,R2,solarPV,2040,6.00000000000
-12,2059,R2,solarPV,2040,6.00000000000
-12,2060,R2,solarPV,2040,6.00000000000
-12,2064,R2,solarPV,2040,6.00000000000
-12,2065,R2,solarPV,2040,6.00000000000
-12,2069,R2,solarPV,2040,6.00000000000
-13,2050,R2,solarPV,2045,10.00000000000
-13,2059,R2,solarPV,2045,10.00000000000
-13,2060,R2,solarPV,2045,10.00000000000
-13,2064,R2,solarPV,2045,10.00000000000
-13,2065,R2,solarPV,2045,10.00000000000
-13,2069,R2,solarPV,2045,10.00000000000
-13,2070,R2,solarPV,2045,10.00000000000
-13,2074,R2,solarPV,2045,10.00000000000
-14,2025,R2,windturbine,2020,5.50000000000
-14,2030,R2,windturbine,2020,5.50000000000
-14,2035,R2,windturbine,2020,5.50000000000
-14,2040,R2,windturbine,2020,5.50000000000
-14,2045,R2,windturbine,2020,5.50000000000
-14,2049,R2,windturbine,2020,5.50000000000
-15,2050,R2,windturbine,2045,1.50000000000
-15,2059,R2,windturbine,2045,1.50000000000
-15,2060,R2,windturbine,2045,1.50000000000
-15,2064,R2,windturbine,2045,1.50000000000
-15,2065,R2,windturbine,2045,1.50000000000
-15,2069,R2,windturbine,2045,1.50000000000
-15,2070,R2,windturbine,2045,1.50000000000
-15,2074,R2,windturbine,2045,1.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
deleted file mode 100644
index aa854417a..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,123 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2035,R1,solarPV,2030,6.00000000000
-2,2040,R1,solarPV,2030,6.00000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,10.00000000000
-5,2059,R1,solarPV,2045,10.00000000000
-5,2060,R1,solarPV,2045,10.00000000000
-5,2064,R1,solarPV,2045,10.00000000000
-5,2065,R1,solarPV,2045,10.00000000000
-5,2069,R1,solarPV,2045,10.00000000000
-5,2070,R1,solarPV,2045,10.00000000000
-5,2074,R1,solarPV,2045,10.00000000000
-6,2025,R1,windturbine,2020,5.50000000000
-6,2030,R1,windturbine,2020,5.50000000000
-6,2035,R1,windturbine,2020,5.50000000000
-6,2040,R1,windturbine,2020,5.50000000000
-6,2045,R1,windturbine,2020,5.50000000000
-6,2049,R1,windturbine,2020,5.50000000000
-7,2050,R1,windturbine,2045,1.50000000000
-7,2059,R1,windturbine,2045,1.50000000000
-7,2060,R1,windturbine,2045,1.50000000000
-7,2064,R1,windturbine,2045,1.50000000000
-7,2065,R1,windturbine,2045,1.50000000000
-7,2069,R1,windturbine,2045,1.50000000000
-7,2070,R1,windturbine,2045,1.50000000000
-7,2074,R1,windturbine,2045,1.50000000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,6.00000000000
-8,2030,R2,gasCCGT,2020,5.00000000000
-8,2035,R2,gasCCGT,2020,5.00000000000
-8,2040,R2,gasCCGT,2020,5.00000000000
-8,2045,R2,gasCCGT,2020,5.00000000000
-8,2049,R2,gasCCGT,2020,5.00000000000
-8,2050,R2,gasCCGT,2020,5.00000000000
-8,2059,R2,gasCCGT,2020,5.00000000000
-9,2030,R2,gasCCGT,2025,5.88890000000
-9,2035,R2,gasCCGT,2025,5.88890000000
-9,2040,R2,gasCCGT,2025,5.88890000000
-9,2045,R2,gasCCGT,2025,5.88890000000
-9,2049,R2,gasCCGT,2025,5.88890000000
-9,2050,R2,gasCCGT,2025,5.88890000000
-9,2059,R2,gasCCGT,2025,5.88890000000
-9,2060,R2,gasCCGT,2025,5.88890000000
-9,2064,R2,gasCCGT,2025,5.88890000000
-10,2035,R2,solarPV,2030,6.00000000000
-10,2040,R2,solarPV,2030,6.00000000000
-10,2045,R2,solarPV,2030,6.00000000000
-10,2049,R2,solarPV,2030,6.00000000000
-10,2050,R2,solarPV,2030,6.00000000000
-10,2059,R2,solarPV,2030,6.00000000000
-11,2040,R2,solarPV,2035,6.00000000000
-11,2045,R2,solarPV,2035,6.00000000000
-11,2049,R2,solarPV,2035,6.00000000000
-11,2050,R2,solarPV,2035,6.00000000000
-11,2059,R2,solarPV,2035,6.00000000000
-11,2060,R2,solarPV,2035,6.00000000000
-11,2064,R2,solarPV,2035,6.00000000000
-12,2045,R2,solarPV,2040,6.00000000000
-12,2049,R2,solarPV,2040,6.00000000000
-12,2050,R2,solarPV,2040,6.00000000000
-12,2059,R2,solarPV,2040,6.00000000000
-12,2060,R2,solarPV,2040,6.00000000000
-12,2064,R2,solarPV,2040,6.00000000000
-12,2065,R2,solarPV,2040,6.00000000000
-12,2069,R2,solarPV,2040,6.00000000000
-13,2050,R2,solarPV,2045,10.00000000000
-13,2059,R2,solarPV,2045,10.00000000000
-13,2060,R2,solarPV,2045,10.00000000000
-13,2064,R2,solarPV,2045,10.00000000000
-13,2065,R2,solarPV,2045,10.00000000000
-13,2069,R2,solarPV,2045,10.00000000000
-13,2070,R2,solarPV,2045,10.00000000000
-13,2074,R2,solarPV,2045,10.00000000000
-14,2025,R2,windturbine,2020,5.50000000000
-14,2030,R2,windturbine,2020,5.50000000000
-14,2035,R2,windturbine,2020,5.50000000000
-14,2040,R2,windturbine,2020,5.50000000000
-14,2045,R2,windturbine,2020,5.50000000000
-14,2049,R2,windturbine,2020,5.50000000000
-15,2050,R2,windturbine,2045,1.50000000000
-15,2059,R2,windturbine,2045,1.50000000000
-15,2060,R2,windturbine,2045,1.50000000000
-15,2064,R2,windturbine,2045,1.50000000000
-15,2065,R2,windturbine,2045,1.50000000000
-15,2069,R2,windturbine,2045,1.50000000000
-15,2070,R2,windturbine,2045,1.50000000000
-15,2074,R2,windturbine,2045,1.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..fa93142ea
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity.csv
@@ -0,0 +1,27 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+2,10,2020,R2,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+3,5,2020,R2,gasboiler,2025
+4,19,2020,R2,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+5,19,2020,R2,heatpump,2030
+6,10,2025,R2,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+7,10,2025,R2,heatpump,2035
+8,26,2030,R2,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+9,26,2030,R2,heatpump,2040
+10,16,2035,R2,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+11,16,2035,R2,heatpump,2045
+12,32,2040,R2,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
+13,32,2040,R2,heatpump,2050
+14,22,2045,R2,heatpump,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 65f38fdbc..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2020,R2,gasboiler,2020,10
-2,2025,R2,gasboiler,2020,5
-3,2025,R2,heatpump,2020,19
-3,2030,R2,heatpump,2020,19
-3,2034,R2,heatpump,2020,19
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 570b873b3..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2020,R2,gasboiler,2020,10
-3,2025,R2,gasboiler,2020,5
-4,2025,R2,heatpump,2020,19
-4,2030,R2,heatpump,2020,19
-4,2034,R2,heatpump,2020,19
-5,2030,R2,heatpump,2025,10
-5,2034,R2,heatpump,2025,10
-5,2035,R2,heatpump,2025,10
-5,2039,R2,heatpump,2025,10
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 30f35eb48..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2020,R2,gasboiler,2020,10
-4,2025,R2,gasboiler,2020,5
-5,2025,R2,heatpump,2020,19
-5,2030,R2,heatpump,2020,19
-5,2034,R2,heatpump,2020,19
-6,2030,R2,heatpump,2025,10
-6,2034,R2,heatpump,2025,10
-6,2035,R2,heatpump,2025,10
-6,2039,R2,heatpump,2025,10
-7,2035,R2,heatpump,2030,26
-7,2039,R2,heatpump,2030,26
-7,2040,R2,heatpump,2030,26
-7,2044,R2,heatpump,2030,26
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 88b92f80d..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2020,R2,gasboiler,2020,10
-5,2025,R2,gasboiler,2020,5
-6,2025,R2,heatpump,2020,19
-6,2030,R2,heatpump,2020,19
-6,2034,R2,heatpump,2020,19
-7,2030,R2,heatpump,2025,10
-7,2034,R2,heatpump,2025,10
-7,2035,R2,heatpump,2025,10
-7,2039,R2,heatpump,2025,10
-8,2035,R2,heatpump,2030,26
-8,2039,R2,heatpump,2030,26
-8,2040,R2,heatpump,2030,26
-8,2044,R2,heatpump,2030,26
-9,2040,R2,heatpump,2035,16
-9,2044,R2,heatpump,2035,16
-9,2045,R2,heatpump,2035,16
-9,2049,R2,heatpump,2035,16
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 937e46004..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2020,R2,gasboiler,2020,10
-6,2025,R2,gasboiler,2020,5
-7,2025,R2,heatpump,2020,19
-7,2030,R2,heatpump,2020,19
-7,2034,R2,heatpump,2020,19
-8,2030,R2,heatpump,2025,10
-8,2034,R2,heatpump,2025,10
-8,2035,R2,heatpump,2025,10
-8,2039,R2,heatpump,2025,10
-9,2035,R2,heatpump,2030,26
-9,2039,R2,heatpump,2030,26
-9,2040,R2,heatpump,2030,26
-9,2044,R2,heatpump,2030,26
-10,2040,R2,heatpump,2035,16
-10,2044,R2,heatpump,2035,16
-10,2045,R2,heatpump,2035,16
-10,2049,R2,heatpump,2035,16
-11,2045,R2,heatpump,2040,32
-11,2049,R2,heatpump,2040,32
-11,2050,R2,heatpump,2040,32
-11,2054,R2,heatpump,2040,32
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index b12e02b22..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2020,R2,gasboiler,2020,10
-7,2025,R2,gasboiler,2020,5
-8,2025,R2,heatpump,2020,19
-8,2030,R2,heatpump,2020,19
-8,2034,R2,heatpump,2020,19
-9,2030,R2,heatpump,2025,10
-9,2034,R2,heatpump,2025,10
-9,2035,R2,heatpump,2025,10
-9,2039,R2,heatpump,2025,10
-10,2035,R2,heatpump,2030,26
-10,2039,R2,heatpump,2030,26
-10,2040,R2,heatpump,2030,26
-10,2044,R2,heatpump,2030,26
-11,2040,R2,heatpump,2035,16
-11,2044,R2,heatpump,2035,16
-11,2045,R2,heatpump,2035,16
-11,2049,R2,heatpump,2035,16
-12,2045,R2,heatpump,2040,32
-12,2049,R2,heatpump,2040,32
-12,2050,R2,heatpump,2040,32
-12,2054,R2,heatpump,2040,32
-13,2050,R2,heatpump,2045,22
-13,2054,R2,heatpump,2045,22
-13,2055,R2,heatpump,2045,22
-13,2059,R2,heatpump,2045,22
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 59b8c0a49..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,59 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
-8,2020,R2,gasboiler,2020,10
-8,2025,R2,gasboiler,2020,5
-9,2025,R2,heatpump,2020,19
-9,2030,R2,heatpump,2020,19
-9,2034,R2,heatpump,2020,19
-10,2030,R2,heatpump,2025,10
-10,2034,R2,heatpump,2025,10
-10,2035,R2,heatpump,2025,10
-10,2039,R2,heatpump,2025,10
-11,2035,R2,heatpump,2030,26
-11,2039,R2,heatpump,2030,26
-11,2040,R2,heatpump,2030,26
-11,2044,R2,heatpump,2030,26
-12,2040,R2,heatpump,2035,16
-12,2044,R2,heatpump,2035,16
-12,2045,R2,heatpump,2035,16
-12,2049,R2,heatpump,2035,16
-13,2045,R2,heatpump,2040,32
-13,2049,R2,heatpump,2040,32
-13,2050,R2,heatpump,2040,32
-13,2054,R2,heatpump,2040,32
-14,2050,R2,heatpump,2045,22
-14,2054,R2,heatpump,2045,22
-14,2055,R2,heatpump,2045,22
-14,2059,R2,heatpump,2045,22
-15,2055,R2,heatpump,2050,32
-15,2059,R2,heatpump,2050,32
-15,2060,R2,heatpump,2050,32
-15,2064,R2,heatpump,2050,32
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply.csv
new file mode 100644
index 000000000..1874a28ca
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply.csv
@@ -0,0 +1,361 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,0.50000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R1,0.50000000000,gasboiler,0,2020
+0,heat,all-week,night,2020,all-year,R2,0.50000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R2,0.50000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,32.35500000000,gasboiler,0,2020
+2,CO2f,all-week,night,2020,all-year,R1,32.35500000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R2,32.35500000000,gasboiler,0,2020
+2,CO2f,all-week,night,2020,all-year,R2,32.35500000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,0.75000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R1,0.75000000000,gasboiler,1,2020
+0,heat,all-week,morning,2020,all-year,R2,0.75000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R2,0.75000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,48.53250000000,gasboiler,1,2020
+2,CO2f,all-week,morning,2020,all-year,R1,48.53250000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R2,48.53250000000,gasboiler,1,2020
+2,CO2f,all-week,morning,2020,all-year,R2,48.53250000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,0.50000000000,gasboiler,2,2020
+2,heat,all-week,afternoon,2020,all-year,R1,0.50000000000,gasboiler,2,2020
+0,heat,all-week,afternoon,2020,all-year,R2,0.50000000000,gasboiler,2,2020
+2,heat,all-week,afternoon,2020,all-year,R2,0.50000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,32.35500000000,gasboiler,2,2020
+2,CO2f,all-week,afternoon,2020,all-year,R1,32.35500000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R2,32.35500000000,gasboiler,2,2020
+2,CO2f,all-week,afternoon,2020,all-year,R2,32.35500000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,0.75000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R1,0.75000000000,gasboiler,3,2020
+0,heat,all-week,early-peak,2020,all-year,R2,0.75000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R2,0.75000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,48.53250000000,gasboiler,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R1,48.53250000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R2,48.53250000000,gasboiler,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R2,48.53250000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,1.50000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R1,1.50000000000,gasboiler,4,2020
+0,heat,all-week,late-peak,2020,all-year,R2,1.50000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R2,1.50000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,97.06500000000,gasboiler,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R1,97.06500000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R2,97.06500000000,gasboiler,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R2,97.06500000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,1.00000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R1,1.00000000000,gasboiler,5,2020
+0,heat,all-week,evening,2020,all-year,R2,1.00000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R2,1.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,64.71000000000,gasboiler,5,2020
+2,CO2f,all-week,evening,2020,all-year,R1,64.71000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R2,64.71000000000,gasboiler,5,2020
+2,CO2f,all-week,evening,2020,all-year,R2,64.71000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.13890000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,0.52780000000,heatpump,0,2025
+3,heat,all-week,night,2020,all-year,R1,0.13890000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R1,0.52780000000,heatpump,0,2025
+0,heat,all-week,night,2020,all-year,R2,0.13890000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R2,0.52780000000,heatpump,0,2025
+3,heat,all-week,night,2020,all-year,R2,0.13890000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R2,0.52780000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,8.98750000000,gasboiler,0,2025
+3,CO2f,all-week,night,2020,all-year,R1,8.98750000000,gasboiler,0,2025
+0,CO2f,all-week,night,2020,all-year,R2,8.98750000000,gasboiler,0,2025
+3,CO2f,all-week,night,2020,all-year,R2,8.98750000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.20830000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,0.79170000000,heatpump,1,2025
+3,heat,all-week,morning,2020,all-year,R1,0.20830000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R1,0.79170000000,heatpump,1,2025
+0,heat,all-week,morning,2020,all-year,R2,0.20830000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R2,0.79170000000,heatpump,1,2025
+3,heat,all-week,morning,2020,all-year,R2,0.20830000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R2,0.79170000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,13.48120000000,gasboiler,1,2025
+3,CO2f,all-week,morning,2020,all-year,R1,13.48120000000,gasboiler,1,2025
+0,CO2f,all-week,morning,2020,all-year,R2,13.48120000000,gasboiler,1,2025
+3,CO2f,all-week,morning,2020,all-year,R2,13.48120000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.13890000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,0.52780000000,heatpump,2,2025
+3,heat,all-week,afternoon,2020,all-year,R1,0.13890000000,gasboiler,2,2025
+4,heat,all-week,afternoon,2020,all-year,R1,0.52780000000,heatpump,2,2025
+0,heat,all-week,afternoon,2020,all-year,R2,0.13890000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R2,0.52780000000,heatpump,2,2025
+3,heat,all-week,afternoon,2020,all-year,R2,0.13890000000,gasboiler,2,2025
+4,heat,all-week,afternoon,2020,all-year,R2,0.52780000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,8.98750000000,gasboiler,2,2025
+3,CO2f,all-week,afternoon,2020,all-year,R1,8.98750000000,gasboiler,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R2,8.98750000000,gasboiler,2,2025
+3,CO2f,all-week,afternoon,2020,all-year,R2,8.98750000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.20830000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,0.79170000000,heatpump,3,2025
+3,heat,all-week,early-peak,2020,all-year,R1,0.20830000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R1,0.79170000000,heatpump,3,2025
+0,heat,all-week,early-peak,2020,all-year,R2,0.20830000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R2,0.79170000000,heatpump,3,2025
+3,heat,all-week,early-peak,2020,all-year,R2,0.20830000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R2,0.79170000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,13.48120000000,gasboiler,3,2025
+3,CO2f,all-week,early-peak,2020,all-year,R1,13.48120000000,gasboiler,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R2,13.48120000000,gasboiler,3,2025
+3,CO2f,all-week,early-peak,2020,all-year,R2,13.48120000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.41670000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,1.58330000000,heatpump,4,2025
+3,heat,all-week,late-peak,2020,all-year,R1,0.41670000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R1,1.58330000000,heatpump,4,2025
+0,heat,all-week,late-peak,2020,all-year,R2,0.41670000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R2,1.58330000000,heatpump,4,2025
+3,heat,all-week,late-peak,2020,all-year,R2,0.41670000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R2,1.58330000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,26.96250000000,gasboiler,4,2025
+3,CO2f,all-week,late-peak,2020,all-year,R1,26.96250000000,gasboiler,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R2,26.96250000000,gasboiler,4,2025
+3,CO2f,all-week,late-peak,2020,all-year,R2,26.96250000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.27780000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,1.05560000000,heatpump,5,2025
+3,heat,all-week,evening,2020,all-year,R1,0.27780000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R1,1.05560000000,heatpump,5,2025
+0,heat,all-week,evening,2020,all-year,R2,0.27780000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R2,1.05560000000,heatpump,5,2025
+3,heat,all-week,evening,2020,all-year,R2,0.27780000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R2,1.05560000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,17.97500000000,gasboiler,5,2025
+3,CO2f,all-week,evening,2020,all-year,R1,17.97500000000,gasboiler,5,2025
+0,CO2f,all-week,evening,2020,all-year,R2,17.97500000000,gasboiler,5,2025
+3,CO2f,all-week,evening,2020,all-year,R2,17.97500000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,0.54600000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.28740000000,heatpump,0,2030
+5,heat,all-week,night,2020,all-year,R1,0.54600000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R1,0.28740000000,heatpump,0,2030
+1,heat,all-week,night,2020,all-year,R2,0.54600000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R2,0.28740000000,heatpump,0,2030
+5,heat,all-week,night,2020,all-year,R2,0.54600000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R2,0.28740000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,0.81900000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.43100000000,heatpump,1,2030
+5,heat,all-week,morning,2020,all-year,R1,0.81900000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R1,0.43100000000,heatpump,1,2030
+1,heat,all-week,morning,2020,all-year,R2,0.81900000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R2,0.43100000000,heatpump,1,2030
+5,heat,all-week,morning,2020,all-year,R2,0.81900000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R2,0.43100000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,0.54600000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.28740000000,heatpump,2,2030
+5,heat,all-week,afternoon,2020,all-year,R1,0.54600000000,heatpump,2,2030
+6,heat,all-week,afternoon,2025,all-year,R1,0.28740000000,heatpump,2,2030
+1,heat,all-week,afternoon,2020,all-year,R2,0.54600000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R2,0.28740000000,heatpump,2,2030
+5,heat,all-week,afternoon,2020,all-year,R2,0.54600000000,heatpump,2,2030
+6,heat,all-week,afternoon,2025,all-year,R2,0.28740000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,0.81900000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.43100000000,heatpump,3,2030
+5,heat,all-week,early-peak,2020,all-year,R1,0.81900000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R1,0.43100000000,heatpump,3,2030
+1,heat,all-week,early-peak,2020,all-year,R2,0.81900000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R2,0.43100000000,heatpump,3,2030
+5,heat,all-week,early-peak,2020,all-year,R2,0.81900000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R2,0.43100000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,1.63790000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,0.86210000000,heatpump,4,2030
+5,heat,all-week,late-peak,2020,all-year,R1,1.63790000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R1,0.86210000000,heatpump,4,2030
+1,heat,all-week,late-peak,2020,all-year,R2,1.63790000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R2,0.86210000000,heatpump,4,2030
+5,heat,all-week,late-peak,2020,all-year,R2,1.63790000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R2,0.86210000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,1.09200000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,0.57470000000,heatpump,5,2030
+5,heat,all-week,evening,2020,all-year,R1,1.09200000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R1,0.57470000000,heatpump,5,2030
+1,heat,all-week,evening,2020,all-year,R2,1.09200000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R2,0.57470000000,heatpump,5,2030
+5,heat,all-week,evening,2020,all-year,R2,1.09200000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R2,0.57470000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.27780000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2035
+7,heat,all-week,night,2025,all-year,R1,0.27780000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2035
+2,heat,all-week,night,2025,all-year,R2,0.27780000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2035
+7,heat,all-week,night,2025,all-year,R2,0.27780000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.41670000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2035
+7,heat,all-week,morning,2025,all-year,R1,0.41670000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2035
+2,heat,all-week,morning,2025,all-year,R2,0.41670000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2035
+7,heat,all-week,morning,2025,all-year,R2,0.41670000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.27780000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2035
+7,heat,all-week,afternoon,2025,all-year,R1,0.27780000000,heatpump,2,2035
+8,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2035
+2,heat,all-week,afternoon,2025,all-year,R2,0.27780000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2035
+7,heat,all-week,afternoon,2025,all-year,R2,0.27780000000,heatpump,2,2035
+8,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.41670000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2035
+7,heat,all-week,early-peak,2025,all-year,R1,0.41670000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2035
+2,heat,all-week,early-peak,2025,all-year,R2,0.41670000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2035
+7,heat,all-week,early-peak,2025,all-year,R2,0.41670000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,0.83330000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2035
+7,heat,all-week,late-peak,2025,all-year,R1,0.83330000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2035
+2,heat,all-week,late-peak,2025,all-year,R2,0.83330000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2035
+7,heat,all-week,late-peak,2025,all-year,R2,0.83330000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,0.55560000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2035
+7,heat,all-week,evening,2025,all-year,R1,0.55560000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2035
+2,heat,all-week,evening,2025,all-year,R2,0.55560000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2035
+7,heat,all-week,evening,2025,all-year,R2,0.55560000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2040
+9,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2040
+3,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2040
+9,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2040
+9,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2040
+3,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2040
+9,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2040
+9,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2040
+10,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2040
+3,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2040
+9,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2040
+10,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2040
+9,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2040
+3,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2040
+9,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2040
+9,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2040
+3,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2040
+9,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2040
+9,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2040
+3,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2040
+9,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2045
+11,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2045
+4,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2045
+11,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2045
+11,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2045
+4,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2045
+11,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2045
+11,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2045
+12,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2045
+4,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2045
+11,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2045
+12,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2045
+11,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2045
+4,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2045
+11,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2045
+11,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2045
+4,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2045
+11,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2045
+11,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2045
+4,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2045
+11,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,0.61110000000,heatpump,0,2050
+13,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R1,0.61110000000,heatpump,0,2050
+5,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R2,0.61110000000,heatpump,0,2050
+13,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R2,0.61110000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,0.91670000000,heatpump,1,2050
+13,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R1,0.91670000000,heatpump,1,2050
+5,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R2,0.91670000000,heatpump,1,2050
+13,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R2,0.91670000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,0.61110000000,heatpump,2,2050
+13,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2050
+14,heat,all-week,afternoon,2045,all-year,R1,0.61110000000,heatpump,2,2050
+5,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R2,0.61110000000,heatpump,2,2050
+13,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2050
+14,heat,all-week,afternoon,2045,all-year,R2,0.61110000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,0.91670000000,heatpump,3,2050
+13,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R1,0.91670000000,heatpump,3,2050
+5,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R2,0.91670000000,heatpump,3,2050
+13,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R2,0.91670000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,1.83330000000,heatpump,4,2050
+13,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R1,1.83330000000,heatpump,4,2050
+5,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R2,1.83330000000,heatpump,4,2050
+13,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R2,1.83330000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,1.22220000000,heatpump,5,2050
+13,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R1,1.22220000000,heatpump,5,2050
+5,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R2,1.22220000000,heatpump,5,2050
+13,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R2,1.22220000000,heatpump,5,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 597d50b71..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.50000000000
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.50000000000
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.50000000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.50000000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.52780000000
-0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,32.35500000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,32.35500000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,32.35500000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,32.35500000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,8.98750000000
-1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.75000000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.75000000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.75000000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.75000000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,48.53250000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,48.53250000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,48.53250000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,48.53250000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,13.48120000000
-2,heat,R1,2020,0,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-2,heat,R1,2020,2,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R1,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R1,2025,3,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R2,2020,0,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-2,heat,R2,2020,2,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R2,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R2,2025,3,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,CO2f,R1,2020,0,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-2,CO2f,R1,2020,2,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2020,0,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-2,CO2f,R2,2020,2,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,1.00000000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,1.00000000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,1.00000000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,1.00000000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,64.71000000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,64.71000000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,64.71000000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,64.71000000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,17.97500000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 8a6b5683e..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
-2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R1,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R1,2025,4,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R1,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R2,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R2,2025,4,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R2,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.79170000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.58330000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
deleted file mode 100644
index 190d0953a..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
-2,heat,R1,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
deleted file mode 100644
index f7f707816..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
-2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 7b22f1702..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
-2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 383d0d541..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
-2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 803ba2580..000000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
-2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R1,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R2,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 176c43825..85f2f50ce 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..8f9bbbf79
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity.csv
@@ -0,0 +1,33 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+1,15.00000000000,2020,R2,gassupply1,2020
+0,16.58160000000,2020,R1,gassupply1,2025
+2,16.58160000000,2020,R2,gassupply1,2025
+0,9.08160000000,2020,R1,gassupply1,2030
+1,8.87340000000,2025,R1,gassupply1,2030
+3,9.08160000000,2020,R2,gassupply1,2030
+4,8.87340000000,2025,R2,gassupply1,2030
+0,1.58160000000,2020,R1,gassupply1,2035
+1,8.87340000000,2025,R1,gassupply1,2035
+2,7.50000000000,2030,R1,gassupply1,2035
+3,1.58160000000,2020,R2,gassupply1,2035
+4,8.87340000000,2025,R2,gassupply1,2035
+5,7.50000000000,2030,R2,gassupply1,2035
+0,1.58160000000,2020,R1,gassupply1,2040
+1,8.87340000000,2025,R1,gassupply1,2040
+2,7.50000000000,2030,R1,gassupply1,2040
+3,1.58160000000,2020,R2,gassupply1,2040
+4,8.87340000000,2025,R2,gassupply1,2040
+5,7.50000000000,2030,R2,gassupply1,2040
+0,1.58160000000,2020,R1,gassupply1,2045
+1,8.87340000000,2025,R1,gassupply1,2045
+2,7.50000000000,2030,R1,gassupply1,2045
+3,1.58160000000,2020,R2,gassupply1,2045
+4,8.87340000000,2025,R2,gassupply1,2045
+5,7.50000000000,2030,R2,gassupply1,2045
+0,1.58160000000,2020,R1,gassupply1,2050
+1,8.87340000000,2025,R1,gassupply1,2050
+2,7.50000000000,2030,R1,gassupply1,2050
+3,1.58160000000,2020,R2,gassupply1,2050
+4,8.87340000000,2025,R2,gassupply1,2050
+5,7.50000000000,2030,R2,gassupply1,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index b21dfd655..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,16.58160000000
-1,2030,R2,gassupply1,2020,9.08160000000
-1,2035,R2,gassupply1,2020,1.58160000000
-1,2040,R2,gassupply1,2020,1.58160000000
-1,2045,R2,gassupply1,2020,1.58160000000
-1,2050,R2,gassupply1,2020,1.58160000000
-1,2059,R2,gassupply1,2020,1.58160000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 628decd54..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2030,R1,gassupply1,2025,8.87340000000
-1,2035,R1,gassupply1,2025,8.87340000000
-1,2040,R1,gassupply1,2025,8.87340000000
-1,2045,R1,gassupply1,2025,8.87340000000
-1,2050,R1,gassupply1,2025,8.87340000000
-1,2059,R1,gassupply1,2025,8.87340000000
-1,2060,R1,gassupply1,2025,8.87340000000
-1,2064,R1,gassupply1,2025,8.87340000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,16.58160000000
-2,2030,R2,gassupply1,2020,9.08160000000
-2,2035,R2,gassupply1,2020,1.58160000000
-2,2040,R2,gassupply1,2020,1.58160000000
-2,2045,R2,gassupply1,2020,1.58160000000
-2,2050,R2,gassupply1,2020,1.58160000000
-2,2059,R2,gassupply1,2020,1.58160000000
-3,2030,R2,gassupply1,2025,8.87340000000
-3,2035,R2,gassupply1,2025,8.87340000000
-3,2040,R2,gassupply1,2025,8.87340000000
-3,2045,R2,gassupply1,2025,8.87340000000
-3,2050,R2,gassupply1,2025,8.87340000000
-3,2059,R2,gassupply1,2025,8.87340000000
-3,2060,R2,gassupply1,2025,8.87340000000
-3,2064,R2,gassupply1,2025,8.87340000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 9d0e267ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2030,R1,gassupply1,2025,8.87340000000
-1,2035,R1,gassupply1,2025,8.87340000000
-1,2040,R1,gassupply1,2025,8.87340000000
-1,2045,R1,gassupply1,2025,8.87340000000
-1,2050,R1,gassupply1,2025,8.87340000000
-1,2059,R1,gassupply1,2025,8.87340000000
-1,2060,R1,gassupply1,2025,8.87340000000
-1,2064,R1,gassupply1,2025,8.87340000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.58160000000
-3,2030,R2,gassupply1,2020,9.08160000000
-3,2035,R2,gassupply1,2020,1.58160000000
-3,2040,R2,gassupply1,2020,1.58160000000
-3,2045,R2,gassupply1,2020,1.58160000000
-3,2050,R2,gassupply1,2020,1.58160000000
-3,2059,R2,gassupply1,2020,1.58160000000
-4,2030,R2,gassupply1,2025,8.87340000000
-4,2035,R2,gassupply1,2025,8.87340000000
-4,2040,R2,gassupply1,2025,8.87340000000
-4,2045,R2,gassupply1,2025,8.87340000000
-4,2050,R2,gassupply1,2025,8.87340000000
-4,2059,R2,gassupply1,2025,8.87340000000
-4,2060,R2,gassupply1,2025,8.87340000000
-4,2064,R2,gassupply1,2025,8.87340000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 9d0e267ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2030,R1,gassupply1,2025,8.87340000000
-1,2035,R1,gassupply1,2025,8.87340000000
-1,2040,R1,gassupply1,2025,8.87340000000
-1,2045,R1,gassupply1,2025,8.87340000000
-1,2050,R1,gassupply1,2025,8.87340000000
-1,2059,R1,gassupply1,2025,8.87340000000
-1,2060,R1,gassupply1,2025,8.87340000000
-1,2064,R1,gassupply1,2025,8.87340000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.58160000000
-3,2030,R2,gassupply1,2020,9.08160000000
-3,2035,R2,gassupply1,2020,1.58160000000
-3,2040,R2,gassupply1,2020,1.58160000000
-3,2045,R2,gassupply1,2020,1.58160000000
-3,2050,R2,gassupply1,2020,1.58160000000
-3,2059,R2,gassupply1,2020,1.58160000000
-4,2030,R2,gassupply1,2025,8.87340000000
-4,2035,R2,gassupply1,2025,8.87340000000
-4,2040,R2,gassupply1,2025,8.87340000000
-4,2045,R2,gassupply1,2025,8.87340000000
-4,2050,R2,gassupply1,2025,8.87340000000
-4,2059,R2,gassupply1,2025,8.87340000000
-4,2060,R2,gassupply1,2025,8.87340000000
-4,2064,R2,gassupply1,2025,8.87340000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 9d0e267ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2030,R1,gassupply1,2025,8.87340000000
-1,2035,R1,gassupply1,2025,8.87340000000
-1,2040,R1,gassupply1,2025,8.87340000000
-1,2045,R1,gassupply1,2025,8.87340000000
-1,2050,R1,gassupply1,2025,8.87340000000
-1,2059,R1,gassupply1,2025,8.87340000000
-1,2060,R1,gassupply1,2025,8.87340000000
-1,2064,R1,gassupply1,2025,8.87340000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.58160000000
-3,2030,R2,gassupply1,2020,9.08160000000
-3,2035,R2,gassupply1,2020,1.58160000000
-3,2040,R2,gassupply1,2020,1.58160000000
-3,2045,R2,gassupply1,2020,1.58160000000
-3,2050,R2,gassupply1,2020,1.58160000000
-3,2059,R2,gassupply1,2020,1.58160000000
-4,2030,R2,gassupply1,2025,8.87340000000
-4,2035,R2,gassupply1,2025,8.87340000000
-4,2040,R2,gassupply1,2025,8.87340000000
-4,2045,R2,gassupply1,2025,8.87340000000
-4,2050,R2,gassupply1,2025,8.87340000000
-4,2059,R2,gassupply1,2025,8.87340000000
-4,2060,R2,gassupply1,2025,8.87340000000
-4,2064,R2,gassupply1,2025,8.87340000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 9d0e267ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2030,R1,gassupply1,2025,8.87340000000
-1,2035,R1,gassupply1,2025,8.87340000000
-1,2040,R1,gassupply1,2025,8.87340000000
-1,2045,R1,gassupply1,2025,8.87340000000
-1,2050,R1,gassupply1,2025,8.87340000000
-1,2059,R1,gassupply1,2025,8.87340000000
-1,2060,R1,gassupply1,2025,8.87340000000
-1,2064,R1,gassupply1,2025,8.87340000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.58160000000
-3,2030,R2,gassupply1,2020,9.08160000000
-3,2035,R2,gassupply1,2020,1.58160000000
-3,2040,R2,gassupply1,2020,1.58160000000
-3,2045,R2,gassupply1,2020,1.58160000000
-3,2050,R2,gassupply1,2020,1.58160000000
-3,2059,R2,gassupply1,2020,1.58160000000
-4,2030,R2,gassupply1,2025,8.87340000000
-4,2035,R2,gassupply1,2025,8.87340000000
-4,2040,R2,gassupply1,2025,8.87340000000
-4,2045,R2,gassupply1,2025,8.87340000000
-4,2050,R2,gassupply1,2025,8.87340000000
-4,2059,R2,gassupply1,2025,8.87340000000
-4,2060,R2,gassupply1,2025,8.87340000000
-4,2064,R2,gassupply1,2025,8.87340000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 9d0e267ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.58160000000
-0,2030,R1,gassupply1,2020,9.08160000000
-0,2035,R1,gassupply1,2020,1.58160000000
-0,2040,R1,gassupply1,2020,1.58160000000
-0,2045,R1,gassupply1,2020,1.58160000000
-0,2050,R1,gassupply1,2020,1.58160000000
-0,2059,R1,gassupply1,2020,1.58160000000
-1,2030,R1,gassupply1,2025,8.87340000000
-1,2035,R1,gassupply1,2025,8.87340000000
-1,2040,R1,gassupply1,2025,8.87340000000
-1,2045,R1,gassupply1,2025,8.87340000000
-1,2050,R1,gassupply1,2025,8.87340000000
-1,2059,R1,gassupply1,2025,8.87340000000
-1,2060,R1,gassupply1,2025,8.87340000000
-1,2064,R1,gassupply1,2025,8.87340000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,16.58160000000
-3,2030,R2,gassupply1,2020,9.08160000000
-3,2035,R2,gassupply1,2020,1.58160000000
-3,2040,R2,gassupply1,2020,1.58160000000
-3,2045,R2,gassupply1,2020,1.58160000000
-3,2050,R2,gassupply1,2020,1.58160000000
-3,2059,R2,gassupply1,2020,1.58160000000
-4,2030,R2,gassupply1,2025,8.87340000000
-4,2035,R2,gassupply1,2025,8.87340000000
-4,2040,R2,gassupply1,2025,8.87340000000
-4,2045,R2,gassupply1,2025,8.87340000000
-4,2050,R2,gassupply1,2025,8.87340000000
-4,2059,R2,gassupply1,2025,8.87340000000
-4,2060,R2,gassupply1,2025,8.87340000000
-4,2064,R2,gassupply1,2025,8.87340000000
-5,2035,R2,gassupply1,2030,7.50000000000
-5,2040,R2,gassupply1,2030,7.50000000000
-5,2045,R2,gassupply1,2030,7.50000000000
-5,2050,R2,gassupply1,2030,7.50000000000
-5,2059,R2,gassupply1,2030,7.50000000000
-5,2060,R2,gassupply1,2030,7.50000000000
-5,2064,R2,gassupply1,2030,7.50000000000
-5,2065,R2,gassupply1,2030,7.50000000000
-5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity.csv
new file mode 100644
index 000000000..2accdace0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity.csv
@@ -0,0 +1,55 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+2,1.00000000000,2020,R2,gasCCGT,2020
+0,6.00000000000,2020,R1,gasCCGT,2025
+2,3.80910000000,2020,R1,windturbine,2025
+3,6.00000000000,2020,R2,gasCCGT,2025
+5,3.80910000000,2020,R2,windturbine,2025
+0,5.00000000000,2020,R1,gasCCGT,2030
+1,5.75150000000,2025,R1,gasCCGT,2030
+3,3.80910000000,2020,R1,windturbine,2030
+4,5.00000000000,2020,R2,gasCCGT,2030
+5,5.75150000000,2025,R2,gasCCGT,2030
+7,3.80910000000,2020,R2,windturbine,2030
+0,5.00000000000,2020,R1,gasCCGT,2035
+1,5.75150000000,2025,R1,gasCCGT,2035
+2,5.60000000000,2030,R1,solarPV,2035
+4,3.80910000000,2020,R1,windturbine,2035
+5,5.00000000000,2020,R2,gasCCGT,2035
+6,5.75150000000,2025,R2,gasCCGT,2035
+7,5.60000000000,2030,R2,solarPV,2035
+9,3.80910000000,2020,R2,windturbine,2035
+0,5.00000000000,2020,R1,gasCCGT,2040
+1,5.75150000000,2025,R1,gasCCGT,2040
+2,5.60000000000,2030,R1,solarPV,2040
+3,5.60000000000,2035,R1,solarPV,2040
+5,3.80910000000,2020,R1,windturbine,2040
+6,5.00000000000,2020,R2,gasCCGT,2040
+7,5.75150000000,2025,R2,gasCCGT,2040
+8,5.60000000000,2030,R2,solarPV,2040
+9,5.60000000000,2035,R2,solarPV,2040
+11,3.80910000000,2020,R2,windturbine,2040
+0,5.00000000000,2020,R1,gasCCGT,2045
+1,5.75150000000,2025,R1,gasCCGT,2045
+2,5.60000000000,2030,R1,solarPV,2045
+3,5.60000000000,2035,R1,solarPV,2045
+4,5.60000000000,2040,R1,solarPV,2045
+6,3.80910000000,2020,R1,windturbine,2045
+7,5.00000000000,2020,R2,gasCCGT,2045
+8,5.75150000000,2025,R2,gasCCGT,2045
+9,5.60000000000,2030,R2,solarPV,2045
+10,5.60000000000,2035,R2,solarPV,2045
+11,5.60000000000,2040,R2,solarPV,2045
+13,3.80910000000,2020,R2,windturbine,2045
+0,5.00000000000,2020,R1,gasCCGT,2050
+1,5.75150000000,2025,R1,gasCCGT,2050
+2,5.60000000000,2030,R1,solarPV,2050
+3,5.60000000000,2035,R1,solarPV,2050
+4,5.60000000000,2040,R1,solarPV,2050
+5,9.40910000000,2045,R1,solarPV,2050
+7,5.00000000000,2020,R2,gasCCGT,2050
+8,5.75150000000,2025,R2,gasCCGT,2050
+9,5.60000000000,2030,R2,solarPV,2050
+10,5.60000000000,2035,R2,solarPV,2050
+11,5.60000000000,2040,R2,solarPV,2050
+12,9.40910000000,2045,R2,solarPV,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 37e1d4d6e..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2025,R1,windturbine,2020,3.80910000000
-1,2030,R1,windturbine,2020,3.80910000000
-1,2035,R1,windturbine,2020,3.80910000000
-1,2040,R1,windturbine,2020,3.80910000000
-1,2045,R1,windturbine,2020,3.80910000000
-1,2049,R1,windturbine,2020,3.80910000000
-2,2020,R2,gasCCGT,2020,1.00000000000
-2,2025,R2,gasCCGT,2020,6.00000000000
-2,2030,R2,gasCCGT,2020,5.00000000000
-2,2035,R2,gasCCGT,2020,5.00000000000
-2,2040,R2,gasCCGT,2020,5.00000000000
-2,2045,R2,gasCCGT,2020,5.00000000000
-2,2049,R2,gasCCGT,2020,5.00000000000
-2,2050,R2,gasCCGT,2020,5.00000000000
-2,2059,R2,gasCCGT,2020,5.00000000000
-3,2025,R2,windturbine,2020,3.80910000000
-3,2030,R2,windturbine,2020,3.80910000000
-3,2035,R2,windturbine,2020,3.80910000000
-3,2040,R2,windturbine,2020,3.80910000000
-3,2045,R2,windturbine,2020,3.80910000000
-3,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
deleted file mode 100644
index c142f4594..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.75150000000
-1,2035,R1,gasCCGT,2025,5.75150000000
-1,2040,R1,gasCCGT,2025,5.75150000000
-1,2045,R1,gasCCGT,2025,5.75150000000
-1,2049,R1,gasCCGT,2025,5.75150000000
-1,2050,R1,gasCCGT,2025,5.75150000000
-1,2059,R1,gasCCGT,2025,5.75150000000
-1,2060,R1,gasCCGT,2025,5.75150000000
-1,2064,R1,gasCCGT,2025,5.75150000000
-2,2025,R1,windturbine,2020,3.80910000000
-2,2030,R1,windturbine,2020,3.80910000000
-2,2035,R1,windturbine,2020,3.80910000000
-2,2040,R1,windturbine,2020,3.80910000000
-2,2045,R1,windturbine,2020,3.80910000000
-2,2049,R1,windturbine,2020,3.80910000000
-3,2020,R2,gasCCGT,2020,1.00000000000
-3,2025,R2,gasCCGT,2020,6.00000000000
-3,2030,R2,gasCCGT,2020,5.00000000000
-3,2035,R2,gasCCGT,2020,5.00000000000
-3,2040,R2,gasCCGT,2020,5.00000000000
-3,2045,R2,gasCCGT,2020,5.00000000000
-3,2049,R2,gasCCGT,2020,5.00000000000
-3,2050,R2,gasCCGT,2020,5.00000000000
-3,2059,R2,gasCCGT,2020,5.00000000000
-4,2030,R2,gasCCGT,2025,5.75150000000
-4,2035,R2,gasCCGT,2025,5.75150000000
-4,2040,R2,gasCCGT,2025,5.75150000000
-4,2045,R2,gasCCGT,2025,5.75150000000
-4,2049,R2,gasCCGT,2025,5.75150000000
-4,2050,R2,gasCCGT,2025,5.75150000000
-4,2059,R2,gasCCGT,2025,5.75150000000
-4,2060,R2,gasCCGT,2025,5.75150000000
-4,2064,R2,gasCCGT,2025,5.75150000000
-5,2025,R2,windturbine,2020,3.80910000000
-5,2030,R2,windturbine,2020,3.80910000000
-5,2035,R2,windturbine,2020,3.80910000000
-5,2040,R2,windturbine,2020,3.80910000000
-5,2045,R2,windturbine,2020,3.80910000000
-5,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 8e89f6260..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.75150000000
-1,2035,R1,gasCCGT,2025,5.75150000000
-1,2040,R1,gasCCGT,2025,5.75150000000
-1,2045,R1,gasCCGT,2025,5.75150000000
-1,2049,R1,gasCCGT,2025,5.75150000000
-1,2050,R1,gasCCGT,2025,5.75150000000
-1,2059,R1,gasCCGT,2025,5.75150000000
-1,2060,R1,gasCCGT,2025,5.75150000000
-1,2064,R1,gasCCGT,2025,5.75150000000
-2,2035,R1,solarPV,2030,5.60000000000
-2,2040,R1,solarPV,2030,5.60000000000
-2,2045,R1,solarPV,2030,5.60000000000
-2,2049,R1,solarPV,2030,5.60000000000
-2,2050,R1,solarPV,2030,5.60000000000
-2,2059,R1,solarPV,2030,5.60000000000
-3,2025,R1,windturbine,2020,3.80910000000
-3,2030,R1,windturbine,2020,3.80910000000
-3,2035,R1,windturbine,2020,3.80910000000
-3,2040,R1,windturbine,2020,3.80910000000
-3,2045,R1,windturbine,2020,3.80910000000
-3,2049,R1,windturbine,2020,3.80910000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,6.00000000000
-4,2030,R2,gasCCGT,2020,5.00000000000
-4,2035,R2,gasCCGT,2020,5.00000000000
-4,2040,R2,gasCCGT,2020,5.00000000000
-4,2045,R2,gasCCGT,2020,5.00000000000
-4,2049,R2,gasCCGT,2020,5.00000000000
-4,2050,R2,gasCCGT,2020,5.00000000000
-4,2059,R2,gasCCGT,2020,5.00000000000
-5,2030,R2,gasCCGT,2025,5.75150000000
-5,2035,R2,gasCCGT,2025,5.75150000000
-5,2040,R2,gasCCGT,2025,5.75150000000
-5,2045,R2,gasCCGT,2025,5.75150000000
-5,2049,R2,gasCCGT,2025,5.75150000000
-5,2050,R2,gasCCGT,2025,5.75150000000
-5,2059,R2,gasCCGT,2025,5.75150000000
-5,2060,R2,gasCCGT,2025,5.75150000000
-5,2064,R2,gasCCGT,2025,5.75150000000
-6,2035,R2,solarPV,2030,5.60000000000
-6,2040,R2,solarPV,2030,5.60000000000
-6,2045,R2,solarPV,2030,5.60000000000
-6,2049,R2,solarPV,2030,5.60000000000
-6,2050,R2,solarPV,2030,5.60000000000
-6,2059,R2,solarPV,2030,5.60000000000
-7,2025,R2,windturbine,2020,3.80910000000
-7,2030,R2,windturbine,2020,3.80910000000
-7,2035,R2,windturbine,2020,3.80910000000
-7,2040,R2,windturbine,2020,3.80910000000
-7,2045,R2,windturbine,2020,3.80910000000
-7,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 3bf1bc025..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,75 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.75150000000
-1,2035,R1,gasCCGT,2025,5.75150000000
-1,2040,R1,gasCCGT,2025,5.75150000000
-1,2045,R1,gasCCGT,2025,5.75150000000
-1,2049,R1,gasCCGT,2025,5.75150000000
-1,2050,R1,gasCCGT,2025,5.75150000000
-1,2059,R1,gasCCGT,2025,5.75150000000
-1,2060,R1,gasCCGT,2025,5.75150000000
-1,2064,R1,gasCCGT,2025,5.75150000000
-2,2035,R1,solarPV,2030,5.60000000000
-2,2040,R1,solarPV,2030,5.60000000000
-2,2045,R1,solarPV,2030,5.60000000000
-2,2049,R1,solarPV,2030,5.60000000000
-2,2050,R1,solarPV,2030,5.60000000000
-2,2059,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2035,5.60000000000
-3,2045,R1,solarPV,2035,5.60000000000
-3,2049,R1,solarPV,2035,5.60000000000
-3,2050,R1,solarPV,2035,5.60000000000
-3,2059,R1,solarPV,2035,5.60000000000
-3,2060,R1,solarPV,2035,5.60000000000
-3,2064,R1,solarPV,2035,5.60000000000
-4,2025,R1,windturbine,2020,3.80910000000
-4,2030,R1,windturbine,2020,3.80910000000
-4,2035,R1,windturbine,2020,3.80910000000
-4,2040,R1,windturbine,2020,3.80910000000
-4,2045,R1,windturbine,2020,3.80910000000
-4,2049,R1,windturbine,2020,3.80910000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,6.00000000000
-5,2030,R2,gasCCGT,2020,5.00000000000
-5,2035,R2,gasCCGT,2020,5.00000000000
-5,2040,R2,gasCCGT,2020,5.00000000000
-5,2045,R2,gasCCGT,2020,5.00000000000
-5,2049,R2,gasCCGT,2020,5.00000000000
-5,2050,R2,gasCCGT,2020,5.00000000000
-5,2059,R2,gasCCGT,2020,5.00000000000
-6,2030,R2,gasCCGT,2025,5.75150000000
-6,2035,R2,gasCCGT,2025,5.75150000000
-6,2040,R2,gasCCGT,2025,5.75150000000
-6,2045,R2,gasCCGT,2025,5.75150000000
-6,2049,R2,gasCCGT,2025,5.75150000000
-6,2050,R2,gasCCGT,2025,5.75150000000
-6,2059,R2,gasCCGT,2025,5.75150000000
-6,2060,R2,gasCCGT,2025,5.75150000000
-6,2064,R2,gasCCGT,2025,5.75150000000
-7,2035,R2,solarPV,2030,5.60000000000
-7,2040,R2,solarPV,2030,5.60000000000
-7,2045,R2,solarPV,2030,5.60000000000
-7,2049,R2,solarPV,2030,5.60000000000
-7,2050,R2,solarPV,2030,5.60000000000
-7,2059,R2,solarPV,2030,5.60000000000
-8,2040,R2,solarPV,2035,5.60000000000
-8,2045,R2,solarPV,2035,5.60000000000
-8,2049,R2,solarPV,2035,5.60000000000
-8,2050,R2,solarPV,2035,5.60000000000
-8,2059,R2,solarPV,2035,5.60000000000
-8,2060,R2,solarPV,2035,5.60000000000
-8,2064,R2,solarPV,2035,5.60000000000
-9,2025,R2,windturbine,2020,3.80910000000
-9,2030,R2,windturbine,2020,3.80910000000
-9,2035,R2,windturbine,2020,3.80910000000
-9,2040,R2,windturbine,2020,3.80910000000
-9,2045,R2,windturbine,2020,3.80910000000
-9,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
deleted file mode 100644
index af661b198..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,91 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.75150000000
-1,2035,R1,gasCCGT,2025,5.75150000000
-1,2040,R1,gasCCGT,2025,5.75150000000
-1,2045,R1,gasCCGT,2025,5.75150000000
-1,2049,R1,gasCCGT,2025,5.75150000000
-1,2050,R1,gasCCGT,2025,5.75150000000
-1,2059,R1,gasCCGT,2025,5.75150000000
-1,2060,R1,gasCCGT,2025,5.75150000000
-1,2064,R1,gasCCGT,2025,5.75150000000
-2,2035,R1,solarPV,2030,5.60000000000
-2,2040,R1,solarPV,2030,5.60000000000
-2,2045,R1,solarPV,2030,5.60000000000
-2,2049,R1,solarPV,2030,5.60000000000
-2,2050,R1,solarPV,2030,5.60000000000
-2,2059,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2035,5.60000000000
-3,2045,R1,solarPV,2035,5.60000000000
-3,2049,R1,solarPV,2035,5.60000000000
-3,2050,R1,solarPV,2035,5.60000000000
-3,2059,R1,solarPV,2035,5.60000000000
-3,2060,R1,solarPV,2035,5.60000000000
-3,2064,R1,solarPV,2035,5.60000000000
-4,2045,R1,solarPV,2040,5.60000000000
-4,2049,R1,solarPV,2040,5.60000000000
-4,2050,R1,solarPV,2040,5.60000000000
-4,2059,R1,solarPV,2040,5.60000000000
-4,2060,R1,solarPV,2040,5.60000000000
-4,2064,R1,solarPV,2040,5.60000000000
-4,2065,R1,solarPV,2040,5.60000000000
-4,2069,R1,solarPV,2040,5.60000000000
-5,2025,R1,windturbine,2020,3.80910000000
-5,2030,R1,windturbine,2020,3.80910000000
-5,2035,R1,windturbine,2020,3.80910000000
-5,2040,R1,windturbine,2020,3.80910000000
-5,2045,R1,windturbine,2020,3.80910000000
-5,2049,R1,windturbine,2020,3.80910000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,6.00000000000
-6,2030,R2,gasCCGT,2020,5.00000000000
-6,2035,R2,gasCCGT,2020,5.00000000000
-6,2040,R2,gasCCGT,2020,5.00000000000
-6,2045,R2,gasCCGT,2020,5.00000000000
-6,2049,R2,gasCCGT,2020,5.00000000000
-6,2050,R2,gasCCGT,2020,5.00000000000
-6,2059,R2,gasCCGT,2020,5.00000000000
-7,2030,R2,gasCCGT,2025,5.75150000000
-7,2035,R2,gasCCGT,2025,5.75150000000
-7,2040,R2,gasCCGT,2025,5.75150000000
-7,2045,R2,gasCCGT,2025,5.75150000000
-7,2049,R2,gasCCGT,2025,5.75150000000
-7,2050,R2,gasCCGT,2025,5.75150000000
-7,2059,R2,gasCCGT,2025,5.75150000000
-7,2060,R2,gasCCGT,2025,5.75150000000
-7,2064,R2,gasCCGT,2025,5.75150000000
-8,2035,R2,solarPV,2030,5.60000000000
-8,2040,R2,solarPV,2030,5.60000000000
-8,2045,R2,solarPV,2030,5.60000000000
-8,2049,R2,solarPV,2030,5.60000000000
-8,2050,R2,solarPV,2030,5.60000000000
-8,2059,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2035,5.60000000000
-9,2045,R2,solarPV,2035,5.60000000000
-9,2049,R2,solarPV,2035,5.60000000000
-9,2050,R2,solarPV,2035,5.60000000000
-9,2059,R2,solarPV,2035,5.60000000000
-9,2060,R2,solarPV,2035,5.60000000000
-9,2064,R2,solarPV,2035,5.60000000000
-10,2045,R2,solarPV,2040,5.60000000000
-10,2049,R2,solarPV,2040,5.60000000000
-10,2050,R2,solarPV,2040,5.60000000000
-10,2059,R2,solarPV,2040,5.60000000000
-10,2060,R2,solarPV,2040,5.60000000000
-10,2064,R2,solarPV,2040,5.60000000000
-10,2065,R2,solarPV,2040,5.60000000000
-10,2069,R2,solarPV,2040,5.60000000000
-11,2025,R2,windturbine,2020,3.80910000000
-11,2030,R2,windturbine,2020,3.80910000000
-11,2035,R2,windturbine,2020,3.80910000000
-11,2040,R2,windturbine,2020,3.80910000000
-11,2045,R2,windturbine,2020,3.80910000000
-11,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 609d25b90..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,107 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.75150000000
-1,2035,R1,gasCCGT,2025,5.75150000000
-1,2040,R1,gasCCGT,2025,5.75150000000
-1,2045,R1,gasCCGT,2025,5.75150000000
-1,2049,R1,gasCCGT,2025,5.75150000000
-1,2050,R1,gasCCGT,2025,5.75150000000
-1,2059,R1,gasCCGT,2025,5.75150000000
-1,2060,R1,gasCCGT,2025,5.75150000000
-1,2064,R1,gasCCGT,2025,5.75150000000
-2,2035,R1,solarPV,2030,5.60000000000
-2,2040,R1,solarPV,2030,5.60000000000
-2,2045,R1,solarPV,2030,5.60000000000
-2,2049,R1,solarPV,2030,5.60000000000
-2,2050,R1,solarPV,2030,5.60000000000
-2,2059,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2035,5.60000000000
-3,2045,R1,solarPV,2035,5.60000000000
-3,2049,R1,solarPV,2035,5.60000000000
-3,2050,R1,solarPV,2035,5.60000000000
-3,2059,R1,solarPV,2035,5.60000000000
-3,2060,R1,solarPV,2035,5.60000000000
-3,2064,R1,solarPV,2035,5.60000000000
-4,2045,R1,solarPV,2040,5.60000000000
-4,2049,R1,solarPV,2040,5.60000000000
-4,2050,R1,solarPV,2040,5.60000000000
-4,2059,R1,solarPV,2040,5.60000000000
-4,2060,R1,solarPV,2040,5.60000000000
-4,2064,R1,solarPV,2040,5.60000000000
-4,2065,R1,solarPV,2040,5.60000000000
-4,2069,R1,solarPV,2040,5.60000000000
-5,2050,R1,solarPV,2045,9.40910000000
-5,2059,R1,solarPV,2045,9.40910000000
-5,2060,R1,solarPV,2045,9.40910000000
-5,2064,R1,solarPV,2045,9.40910000000
-5,2065,R1,solarPV,2045,9.40910000000
-5,2069,R1,solarPV,2045,9.40910000000
-5,2070,R1,solarPV,2045,9.40910000000
-5,2074,R1,solarPV,2045,9.40910000000
-6,2025,R1,windturbine,2020,3.80910000000
-6,2030,R1,windturbine,2020,3.80910000000
-6,2035,R1,windturbine,2020,3.80910000000
-6,2040,R1,windturbine,2020,3.80910000000
-6,2045,R1,windturbine,2020,3.80910000000
-6,2049,R1,windturbine,2020,3.80910000000
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,6.00000000000
-7,2030,R2,gasCCGT,2020,5.00000000000
-7,2035,R2,gasCCGT,2020,5.00000000000
-7,2040,R2,gasCCGT,2020,5.00000000000
-7,2045,R2,gasCCGT,2020,5.00000000000
-7,2049,R2,gasCCGT,2020,5.00000000000
-7,2050,R2,gasCCGT,2020,5.00000000000
-7,2059,R2,gasCCGT,2020,5.00000000000
-8,2030,R2,gasCCGT,2025,5.75150000000
-8,2035,R2,gasCCGT,2025,5.75150000000
-8,2040,R2,gasCCGT,2025,5.75150000000
-8,2045,R2,gasCCGT,2025,5.75150000000
-8,2049,R2,gasCCGT,2025,5.75150000000
-8,2050,R2,gasCCGT,2025,5.75150000000
-8,2059,R2,gasCCGT,2025,5.75150000000
-8,2060,R2,gasCCGT,2025,5.75150000000
-8,2064,R2,gasCCGT,2025,5.75150000000
-9,2035,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2030,5.60000000000
-9,2045,R2,solarPV,2030,5.60000000000
-9,2049,R2,solarPV,2030,5.60000000000
-9,2050,R2,solarPV,2030,5.60000000000
-9,2059,R2,solarPV,2030,5.60000000000
-10,2040,R2,solarPV,2035,5.60000000000
-10,2045,R2,solarPV,2035,5.60000000000
-10,2049,R2,solarPV,2035,5.60000000000
-10,2050,R2,solarPV,2035,5.60000000000
-10,2059,R2,solarPV,2035,5.60000000000
-10,2060,R2,solarPV,2035,5.60000000000
-10,2064,R2,solarPV,2035,5.60000000000
-11,2045,R2,solarPV,2040,5.60000000000
-11,2049,R2,solarPV,2040,5.60000000000
-11,2050,R2,solarPV,2040,5.60000000000
-11,2059,R2,solarPV,2040,5.60000000000
-11,2060,R2,solarPV,2040,5.60000000000
-11,2064,R2,solarPV,2040,5.60000000000
-11,2065,R2,solarPV,2040,5.60000000000
-11,2069,R2,solarPV,2040,5.60000000000
-12,2050,R2,solarPV,2045,9.40910000000
-12,2059,R2,solarPV,2045,9.40910000000
-12,2060,R2,solarPV,2045,9.40910000000
-12,2064,R2,solarPV,2045,9.40910000000
-12,2065,R2,solarPV,2045,9.40910000000
-12,2069,R2,solarPV,2045,9.40910000000
-12,2070,R2,solarPV,2045,9.40910000000
-12,2074,R2,solarPV,2045,9.40910000000
-13,2025,R2,windturbine,2020,3.80910000000
-13,2030,R2,windturbine,2020,3.80910000000
-13,2035,R2,windturbine,2020,3.80910000000
-13,2040,R2,windturbine,2020,3.80910000000
-13,2045,R2,windturbine,2020,3.80910000000
-13,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 609d25b90..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,107 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,5.75150000000
-1,2035,R1,gasCCGT,2025,5.75150000000
-1,2040,R1,gasCCGT,2025,5.75150000000
-1,2045,R1,gasCCGT,2025,5.75150000000
-1,2049,R1,gasCCGT,2025,5.75150000000
-1,2050,R1,gasCCGT,2025,5.75150000000
-1,2059,R1,gasCCGT,2025,5.75150000000
-1,2060,R1,gasCCGT,2025,5.75150000000
-1,2064,R1,gasCCGT,2025,5.75150000000
-2,2035,R1,solarPV,2030,5.60000000000
-2,2040,R1,solarPV,2030,5.60000000000
-2,2045,R1,solarPV,2030,5.60000000000
-2,2049,R1,solarPV,2030,5.60000000000
-2,2050,R1,solarPV,2030,5.60000000000
-2,2059,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2035,5.60000000000
-3,2045,R1,solarPV,2035,5.60000000000
-3,2049,R1,solarPV,2035,5.60000000000
-3,2050,R1,solarPV,2035,5.60000000000
-3,2059,R1,solarPV,2035,5.60000000000
-3,2060,R1,solarPV,2035,5.60000000000
-3,2064,R1,solarPV,2035,5.60000000000
-4,2045,R1,solarPV,2040,5.60000000000
-4,2049,R1,solarPV,2040,5.60000000000
-4,2050,R1,solarPV,2040,5.60000000000
-4,2059,R1,solarPV,2040,5.60000000000
-4,2060,R1,solarPV,2040,5.60000000000
-4,2064,R1,solarPV,2040,5.60000000000
-4,2065,R1,solarPV,2040,5.60000000000
-4,2069,R1,solarPV,2040,5.60000000000
-5,2050,R1,solarPV,2045,9.40910000000
-5,2059,R1,solarPV,2045,9.40910000000
-5,2060,R1,solarPV,2045,9.40910000000
-5,2064,R1,solarPV,2045,9.40910000000
-5,2065,R1,solarPV,2045,9.40910000000
-5,2069,R1,solarPV,2045,9.40910000000
-5,2070,R1,solarPV,2045,9.40910000000
-5,2074,R1,solarPV,2045,9.40910000000
-6,2025,R1,windturbine,2020,3.80910000000
-6,2030,R1,windturbine,2020,3.80910000000
-6,2035,R1,windturbine,2020,3.80910000000
-6,2040,R1,windturbine,2020,3.80910000000
-6,2045,R1,windturbine,2020,3.80910000000
-6,2049,R1,windturbine,2020,3.80910000000
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,6.00000000000
-7,2030,R2,gasCCGT,2020,5.00000000000
-7,2035,R2,gasCCGT,2020,5.00000000000
-7,2040,R2,gasCCGT,2020,5.00000000000
-7,2045,R2,gasCCGT,2020,5.00000000000
-7,2049,R2,gasCCGT,2020,5.00000000000
-7,2050,R2,gasCCGT,2020,5.00000000000
-7,2059,R2,gasCCGT,2020,5.00000000000
-8,2030,R2,gasCCGT,2025,5.75150000000
-8,2035,R2,gasCCGT,2025,5.75150000000
-8,2040,R2,gasCCGT,2025,5.75150000000
-8,2045,R2,gasCCGT,2025,5.75150000000
-8,2049,R2,gasCCGT,2025,5.75150000000
-8,2050,R2,gasCCGT,2025,5.75150000000
-8,2059,R2,gasCCGT,2025,5.75150000000
-8,2060,R2,gasCCGT,2025,5.75150000000
-8,2064,R2,gasCCGT,2025,5.75150000000
-9,2035,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2030,5.60000000000
-9,2045,R2,solarPV,2030,5.60000000000
-9,2049,R2,solarPV,2030,5.60000000000
-9,2050,R2,solarPV,2030,5.60000000000
-9,2059,R2,solarPV,2030,5.60000000000
-10,2040,R2,solarPV,2035,5.60000000000
-10,2045,R2,solarPV,2035,5.60000000000
-10,2049,R2,solarPV,2035,5.60000000000
-10,2050,R2,solarPV,2035,5.60000000000
-10,2059,R2,solarPV,2035,5.60000000000
-10,2060,R2,solarPV,2035,5.60000000000
-10,2064,R2,solarPV,2035,5.60000000000
-11,2045,R2,solarPV,2040,5.60000000000
-11,2049,R2,solarPV,2040,5.60000000000
-11,2050,R2,solarPV,2040,5.60000000000
-11,2059,R2,solarPV,2040,5.60000000000
-11,2060,R2,solarPV,2040,5.60000000000
-11,2064,R2,solarPV,2040,5.60000000000
-11,2065,R2,solarPV,2040,5.60000000000
-11,2069,R2,solarPV,2040,5.60000000000
-12,2050,R2,solarPV,2045,9.40910000000
-12,2059,R2,solarPV,2045,9.40910000000
-12,2060,R2,solarPV,2045,9.40910000000
-12,2064,R2,solarPV,2045,9.40910000000
-12,2065,R2,solarPV,2045,9.40910000000
-12,2069,R2,solarPV,2045,9.40910000000
-12,2070,R2,solarPV,2045,9.40910000000
-12,2074,R2,solarPV,2045,9.40910000000
-13,2025,R2,windturbine,2020,3.80910000000
-13,2030,R2,windturbine,2020,3.80910000000
-13,2035,R2,windturbine,2020,3.80910000000
-13,2040,R2,windturbine,2020,3.80910000000
-13,2045,R2,windturbine,2020,3.80910000000
-13,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..1be1b0e29
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity.csv
@@ -0,0 +1,27 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+2,10,2020,R2,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,17,2020,R1,heatpump,2025
+3,5,2020,R2,gasboiler,2025
+4,17,2020,R2,heatpump,2025
+1,17,2020,R1,heatpump,2030
+2,11,2025,R1,heatpump,2030
+5,17,2020,R2,heatpump,2030
+6,11,2025,R2,heatpump,2030
+2,11,2025,R1,heatpump,2035
+3,22,2030,R1,heatpump,2035
+7,11,2025,R2,heatpump,2035
+8,22,2030,R2,heatpump,2035
+3,22,2030,R1,heatpump,2040
+4,17,2035,R1,heatpump,2040
+9,22,2030,R2,heatpump,2040
+10,17,2035,R2,heatpump,2040
+4,17,2035,R1,heatpump,2045
+5,27,2040,R1,heatpump,2045
+11,17,2035,R2,heatpump,2045
+12,27,2040,R2,heatpump,2045
+5,27,2040,R1,heatpump,2050
+6,23,2045,R1,heatpump,2050
+13,27,2040,R2,heatpump,2050
+14,23,2045,R2,heatpump,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index ab90205fa..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2020,R2,gasboiler,2020,10
-2,2025,R2,gasboiler,2020,5
-3,2025,R2,heatpump,2020,17
-3,2030,R2,heatpump,2020,17
-3,2034,R2,heatpump,2020,17
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index b3afecf7f..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2030,R1,heatpump,2025,11
-2,2034,R1,heatpump,2025,11
-2,2035,R1,heatpump,2025,11
-2,2039,R1,heatpump,2025,11
-3,2020,R2,gasboiler,2020,10
-3,2025,R2,gasboiler,2020,5
-4,2025,R2,heatpump,2020,17
-4,2030,R2,heatpump,2020,17
-4,2034,R2,heatpump,2020,17
-5,2030,R2,heatpump,2025,11
-5,2034,R2,heatpump,2025,11
-5,2035,R2,heatpump,2025,11
-5,2039,R2,heatpump,2025,11
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 76959a847..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2030,R1,heatpump,2025,11
-2,2034,R1,heatpump,2025,11
-2,2035,R1,heatpump,2025,11
-2,2039,R1,heatpump,2025,11
-3,2035,R1,heatpump,2030,22
-3,2039,R1,heatpump,2030,22
-3,2040,R1,heatpump,2030,22
-3,2044,R1,heatpump,2030,22
-4,2020,R2,gasboiler,2020,10
-4,2025,R2,gasboiler,2020,5
-5,2025,R2,heatpump,2020,17
-5,2030,R2,heatpump,2020,17
-5,2034,R2,heatpump,2020,17
-6,2030,R2,heatpump,2025,11
-6,2034,R2,heatpump,2025,11
-6,2035,R2,heatpump,2025,11
-6,2039,R2,heatpump,2025,11
-7,2035,R2,heatpump,2030,22
-7,2039,R2,heatpump,2030,22
-7,2040,R2,heatpump,2030,22
-7,2044,R2,heatpump,2030,22
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 7e4028597..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2030,R1,heatpump,2025,11
-2,2034,R1,heatpump,2025,11
-2,2035,R1,heatpump,2025,11
-2,2039,R1,heatpump,2025,11
-3,2035,R1,heatpump,2030,22
-3,2039,R1,heatpump,2030,22
-3,2040,R1,heatpump,2030,22
-3,2044,R1,heatpump,2030,22
-4,2040,R1,heatpump,2035,17
-4,2044,R1,heatpump,2035,17
-4,2045,R1,heatpump,2035,17
-4,2049,R1,heatpump,2035,17
-5,2020,R2,gasboiler,2020,10
-5,2025,R2,gasboiler,2020,5
-6,2025,R2,heatpump,2020,17
-6,2030,R2,heatpump,2020,17
-6,2034,R2,heatpump,2020,17
-7,2030,R2,heatpump,2025,11
-7,2034,R2,heatpump,2025,11
-7,2035,R2,heatpump,2025,11
-7,2039,R2,heatpump,2025,11
-8,2035,R2,heatpump,2030,22
-8,2039,R2,heatpump,2030,22
-8,2040,R2,heatpump,2030,22
-8,2044,R2,heatpump,2030,22
-9,2040,R2,heatpump,2035,17
-9,2044,R2,heatpump,2035,17
-9,2045,R2,heatpump,2035,17
-9,2049,R2,heatpump,2035,17
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 55b961b26..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2030,R1,heatpump,2025,11
-2,2034,R1,heatpump,2025,11
-2,2035,R1,heatpump,2025,11
-2,2039,R1,heatpump,2025,11
-3,2035,R1,heatpump,2030,22
-3,2039,R1,heatpump,2030,22
-3,2040,R1,heatpump,2030,22
-3,2044,R1,heatpump,2030,22
-4,2040,R1,heatpump,2035,17
-4,2044,R1,heatpump,2035,17
-4,2045,R1,heatpump,2035,17
-4,2049,R1,heatpump,2035,17
-5,2045,R1,heatpump,2040,27
-5,2049,R1,heatpump,2040,27
-5,2050,R1,heatpump,2040,27
-5,2054,R1,heatpump,2040,27
-6,2020,R2,gasboiler,2020,10
-6,2025,R2,gasboiler,2020,5
-7,2025,R2,heatpump,2020,17
-7,2030,R2,heatpump,2020,17
-7,2034,R2,heatpump,2020,17
-8,2030,R2,heatpump,2025,11
-8,2034,R2,heatpump,2025,11
-8,2035,R2,heatpump,2025,11
-8,2039,R2,heatpump,2025,11
-9,2035,R2,heatpump,2030,22
-9,2039,R2,heatpump,2030,22
-9,2040,R2,heatpump,2030,22
-9,2044,R2,heatpump,2030,22
-10,2040,R2,heatpump,2035,17
-10,2044,R2,heatpump,2035,17
-10,2045,R2,heatpump,2035,17
-10,2049,R2,heatpump,2035,17
-11,2045,R2,heatpump,2040,27
-11,2049,R2,heatpump,2040,27
-11,2050,R2,heatpump,2040,27
-11,2054,R2,heatpump,2040,27
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index ae848c126..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2030,R1,heatpump,2025,11
-2,2034,R1,heatpump,2025,11
-2,2035,R1,heatpump,2025,11
-2,2039,R1,heatpump,2025,11
-3,2035,R1,heatpump,2030,22
-3,2039,R1,heatpump,2030,22
-3,2040,R1,heatpump,2030,22
-3,2044,R1,heatpump,2030,22
-4,2040,R1,heatpump,2035,17
-4,2044,R1,heatpump,2035,17
-4,2045,R1,heatpump,2035,17
-4,2049,R1,heatpump,2035,17
-5,2045,R1,heatpump,2040,27
-5,2049,R1,heatpump,2040,27
-5,2050,R1,heatpump,2040,27
-5,2054,R1,heatpump,2040,27
-6,2050,R1,heatpump,2045,23
-6,2054,R1,heatpump,2045,23
-6,2055,R1,heatpump,2045,23
-6,2059,R1,heatpump,2045,23
-7,2020,R2,gasboiler,2020,10
-7,2025,R2,gasboiler,2020,5
-8,2025,R2,heatpump,2020,17
-8,2030,R2,heatpump,2020,17
-8,2034,R2,heatpump,2020,17
-9,2030,R2,heatpump,2025,11
-9,2034,R2,heatpump,2025,11
-9,2035,R2,heatpump,2025,11
-9,2039,R2,heatpump,2025,11
-10,2035,R2,heatpump,2030,22
-10,2039,R2,heatpump,2030,22
-10,2040,R2,heatpump,2030,22
-10,2044,R2,heatpump,2030,22
-11,2040,R2,heatpump,2035,17
-11,2044,R2,heatpump,2035,17
-11,2045,R2,heatpump,2035,17
-11,2049,R2,heatpump,2035,17
-12,2045,R2,heatpump,2040,27
-12,2049,R2,heatpump,2040,27
-12,2050,R2,heatpump,2040,27
-12,2054,R2,heatpump,2040,27
-13,2050,R2,heatpump,2045,23
-13,2054,R2,heatpump,2045,23
-13,2055,R2,heatpump,2045,23
-13,2059,R2,heatpump,2045,23
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 5fafee941..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,59 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,17
-1,2030,R1,heatpump,2020,17
-1,2034,R1,heatpump,2020,17
-2,2030,R1,heatpump,2025,11
-2,2034,R1,heatpump,2025,11
-2,2035,R1,heatpump,2025,11
-2,2039,R1,heatpump,2025,11
-3,2035,R1,heatpump,2030,22
-3,2039,R1,heatpump,2030,22
-3,2040,R1,heatpump,2030,22
-3,2044,R1,heatpump,2030,22
-4,2040,R1,heatpump,2035,17
-4,2044,R1,heatpump,2035,17
-4,2045,R1,heatpump,2035,17
-4,2049,R1,heatpump,2035,17
-5,2045,R1,heatpump,2040,27
-5,2049,R1,heatpump,2040,27
-5,2050,R1,heatpump,2040,27
-5,2054,R1,heatpump,2040,27
-6,2050,R1,heatpump,2045,23
-6,2054,R1,heatpump,2045,23
-6,2055,R1,heatpump,2045,23
-6,2059,R1,heatpump,2045,23
-7,2055,R1,heatpump,2050,27
-7,2059,R1,heatpump,2050,27
-7,2060,R1,heatpump,2050,27
-7,2064,R1,heatpump,2050,27
-8,2020,R2,gasboiler,2020,10
-8,2025,R2,gasboiler,2020,5
-9,2025,R2,heatpump,2020,17
-9,2030,R2,heatpump,2020,17
-9,2034,R2,heatpump,2020,17
-10,2030,R2,heatpump,2025,11
-10,2034,R2,heatpump,2025,11
-10,2035,R2,heatpump,2025,11
-10,2039,R2,heatpump,2025,11
-11,2035,R2,heatpump,2030,22
-11,2039,R2,heatpump,2030,22
-11,2040,R2,heatpump,2030,22
-11,2044,R2,heatpump,2030,22
-12,2040,R2,heatpump,2035,17
-12,2044,R2,heatpump,2035,17
-12,2045,R2,heatpump,2035,17
-12,2049,R2,heatpump,2035,17
-13,2045,R2,heatpump,2040,27
-13,2049,R2,heatpump,2040,27
-13,2050,R2,heatpump,2040,27
-13,2054,R2,heatpump,2040,27
-14,2050,R2,heatpump,2045,23
-14,2054,R2,heatpump,2045,23
-14,2055,R2,heatpump,2045,23
-14,2059,R2,heatpump,2045,23
-15,2055,R2,heatpump,2050,27
-15,2059,R2,heatpump,2050,27
-15,2060,R2,heatpump,2050,27
-15,2064,R2,heatpump,2050,27
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply.csv
new file mode 100644
index 000000000..fb7cd7e16
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply.csv
@@ -0,0 +1,481 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020
+0,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020
+2,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020
+2,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020
+0,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020
+2,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020
+2,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020
+2,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020
+2,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020
+2,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020
+2,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020
+0,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020
+0,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020
+0,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020
+2,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020
+2,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020
+0,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020
+2,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020
+0,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020
+2,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020
+0,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020
+2,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020
+0,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020
+2,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020
+2,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020
+2,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020
+2,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020
+2,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020
+0,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025
+3,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025
+0,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025
+3,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025
+3,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025
+0,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025
+3,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025
+3,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025
+0,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025
+3,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025
+3,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025
+0,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025
+3,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025
+3,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025
+4,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025
+3,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025
+4,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025
+3,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025
+3,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025
+3,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025
+0,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025
+3,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025
+3,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025
+3,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025
+3,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025
+0,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025
+3,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025
+3,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025
+3,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025
+3,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025
+0,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025
+3,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025
+3,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025
+0,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025
+3,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025
+0,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025
+1,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025
+3,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025
+4,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025
+0,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025
+1,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025
+3,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025
+4,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025
+0,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025
+3,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025
+0,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025
+3,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025
+3,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025
+4,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025
+3,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025
+4,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025
+3,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025
+3,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025
+1,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030
+5,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030
+1,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030
+5,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030
+5,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030
+1,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030
+5,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030
+2,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030
+5,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030
+6,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030
+2,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030
+5,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030
+6,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030
+5,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030
+1,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030
+5,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030
+5,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030
+1,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030
+5,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030
+5,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030
+1,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030
+5,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030
+1,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030
+2,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030
+5,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030
+6,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030
+1,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030
+2,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030
+5,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030
+6,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030
+2,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030
+5,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030
+6,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030
+2,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030
+5,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030
+6,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030
+2,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035
+7,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035
+2,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035
+7,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035
+7,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035
+2,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035
+7,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035
+2,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035
+3,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035
+7,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035
+8,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035
+2,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035
+3,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035
+7,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035
+8,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035
+7,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035
+2,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035
+7,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035
+7,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035
+2,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035
+7,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035
+7,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035
+2,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035
+7,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035
+2,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035
+3,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035
+7,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035
+8,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035
+2,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035
+3,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035
+7,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035
+8,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035
+2,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035
+3,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035
+7,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035
+8,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035
+2,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035
+3,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035
+7,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035
+8,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035
+3,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040
+9,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040
+3,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040
+9,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040
+9,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040
+3,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040
+9,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040
+3,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040
+4,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040
+9,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040
+10,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040
+3,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040
+4,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040
+9,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040
+10,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040
+9,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040
+3,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040
+9,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040
+9,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040
+3,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040
+9,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040
+9,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040
+3,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040
+9,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040
+3,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040
+4,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040
+9,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040
+10,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040
+3,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040
+4,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040
+9,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040
+10,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040
+3,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040
+4,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040
+9,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040
+10,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040
+3,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040
+4,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040
+9,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040
+10,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040
+4,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045
+11,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045
+4,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045
+11,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045
+11,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045
+4,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045
+11,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045
+4,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045
+5,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045
+11,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045
+12,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045
+4,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045
+5,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045
+11,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045
+12,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045
+11,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045
+4,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045
+11,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045
+11,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045
+4,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045
+11,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045
+11,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045
+4,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045
+11,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045
+4,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045
+5,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045
+11,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045
+12,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045
+4,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045
+5,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045
+11,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045
+12,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045
+4,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045
+5,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045
+11,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045
+12,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045
+4,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045
+5,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045
+11,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045
+12,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045
+5,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050
+13,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050
+5,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050
+13,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050
+13,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050
+5,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050
+13,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050
+5,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050
+6,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050
+13,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050
+14,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050
+5,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050
+6,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050
+13,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050
+14,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050
+13,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050
+5,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050
+13,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050
+13,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050
+5,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050
+13,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050
+13,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050
+5,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050
+13,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050
+5,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050
+6,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050
+13,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050
+14,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050
+5,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050
+6,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050
+13,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050
+14,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050
+5,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050
+6,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050
+13,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050
+14,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050
+5,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050
+6,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050
+13,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050
+14,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 3d4d9c155..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,161 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
deleted file mode 100644
index fa946f653..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,161 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
deleted file mode 100644
index c3a18f30b..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
deleted file mode 100644
index a1ad7b716..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
deleted file mode 100644
index d8cce15a7..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 498d5e242..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
deleted file mode 100644
index fe854b70e..000000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 95082ec6d..c6580ca28 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..8c854add8
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity.csv
@@ -0,0 +1,91 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+1,15.00000000000,2020,R2,gassupply1,2020
+0,15.34280000000,2020,R1,gassupply1,2022
+2,15.34280000000,2020,R2,gassupply1,2022
+0,15.34280000000,2020,R1,gassupply1,2024
+1,0.60380000000,2022,R1,gassupply1,2024
+3,15.34280000000,2020,R2,gassupply1,2024
+4,0.60380000000,2022,R2,gassupply1,2024
+0,13.84280000000,2020,R1,gassupply1,2026
+1,0.60380000000,2022,R1,gassupply1,2026
+2,2.07490000000,2024,R1,gassupply1,2026
+4,13.84280000000,2020,R2,gassupply1,2026
+5,0.60380000000,2022,R2,gassupply1,2026
+6,2.07490000000,2024,R2,gassupply1,2026
+0,10.84280000000,2020,R1,gassupply1,2028
+1,0.60380000000,2022,R1,gassupply1,2028
+2,2.07490000000,2024,R1,gassupply1,2028
+3,3.55300000000,2026,R1,gassupply1,2028
+5,10.84280000000,2020,R2,gassupply1,2028
+6,0.60380000000,2022,R2,gassupply1,2028
+7,2.07490000000,2024,R2,gassupply1,2028
+8,3.55300000000,2026,R2,gassupply1,2028
+0,7.84280000000,2020,R1,gassupply1,2030
+1,0.60380000000,2022,R1,gassupply1,2030
+2,2.07490000000,2024,R1,gassupply1,2030
+3,3.55300000000,2026,R1,gassupply1,2030
+4,3.53600000000,2028,R1,gassupply1,2030
+6,7.84280000000,2020,R2,gassupply1,2030
+7,0.60380000000,2022,R2,gassupply1,2030
+8,2.07490000000,2024,R2,gassupply1,2030
+9,3.55300000000,2026,R2,gassupply1,2030
+10,3.53600000000,2028,R2,gassupply1,2030
+0,4.84280000000,2020,R1,gassupply1,2032
+1,0.60380000000,2022,R1,gassupply1,2032
+2,2.07490000000,2024,R1,gassupply1,2032
+3,3.55300000000,2026,R1,gassupply1,2032
+4,3.53600000000,2028,R1,gassupply1,2032
+5,4.66260000000,2030,R1,gassupply1,2032
+7,4.84280000000,2020,R2,gassupply1,2032
+8,0.60380000000,2022,R2,gassupply1,2032
+9,2.07490000000,2024,R2,gassupply1,2032
+10,3.55300000000,2026,R2,gassupply1,2032
+11,3.53600000000,2028,R2,gassupply1,2032
+12,4.66260000000,2030,R2,gassupply1,2032
+0,1.84280000000,2020,R1,gassupply1,2034
+1,0.60380000000,2022,R1,gassupply1,2034
+2,2.07490000000,2024,R1,gassupply1,2034
+3,3.55300000000,2026,R1,gassupply1,2034
+4,3.53600000000,2028,R1,gassupply1,2034
+5,4.66260000000,2030,R1,gassupply1,2034
+6,3.62850000000,2032,R1,gassupply1,2034
+8,1.84280000000,2020,R2,gassupply1,2034
+9,0.60380000000,2022,R2,gassupply1,2034
+10,2.07490000000,2024,R2,gassupply1,2034
+11,3.55300000000,2026,R2,gassupply1,2034
+12,3.53600000000,2028,R2,gassupply1,2034
+13,4.66260000000,2030,R2,gassupply1,2034
+14,3.62850000000,2032,R2,gassupply1,2034
+0,0.34280000000,2020,R1,gassupply1,2036
+1,0.60380000000,2022,R1,gassupply1,2036
+2,2.07490000000,2024,R1,gassupply1,2036
+3,3.55300000000,2026,R1,gassupply1,2036
+4,3.53600000000,2028,R1,gassupply1,2036
+5,4.66260000000,2030,R1,gassupply1,2036
+6,3.62850000000,2032,R1,gassupply1,2036
+7,1.50000000000,2034,R1,gassupply1,2036
+8,0.34280000000,2020,R2,gassupply1,2036
+9,0.60380000000,2022,R2,gassupply1,2036
+10,2.07490000000,2024,R2,gassupply1,2036
+11,3.55300000000,2026,R2,gassupply1,2036
+12,3.53600000000,2028,R2,gassupply1,2036
+13,4.66260000000,2030,R2,gassupply1,2036
+14,3.62850000000,2032,R2,gassupply1,2036
+15,1.50000000000,2034,R2,gassupply1,2036
+0,0.34280000000,2020,R1,gassupply1,2040
+1,0.60380000000,2022,R1,gassupply1,2040
+2,2.07490000000,2024,R1,gassupply1,2040
+3,3.55300000000,2026,R1,gassupply1,2040
+4,3.53600000000,2028,R1,gassupply1,2040
+5,4.66260000000,2030,R1,gassupply1,2040
+6,3.62850000000,2032,R1,gassupply1,2040
+7,1.50000000000,2034,R1,gassupply1,2040
+8,0.34280000000,2020,R2,gassupply1,2040
+9,0.60380000000,2022,R2,gassupply1,2040
+10,2.07490000000,2024,R2,gassupply1,2040
+11,3.55300000000,2026,R2,gassupply1,2040
+12,3.53600000000,2028,R2,gassupply1,2040
+13,4.66260000000,2030,R2,gassupply1,2040
+14,3.62850000000,2032,R2,gassupply1,2040
+15,1.50000000000,2034,R2,gassupply1,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 3213f6b12..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2020,R2,gassupply1,2020,15.00000000000
-1,2022,R2,gassupply1,2020,15.34280000000
-1,2025,R2,gassupply1,2020,15.34280000000
-1,2030,R2,gassupply1,2020,7.84280000000
-1,2035,R2,gassupply1,2020,0.34280000000
-1,2040,R2,gassupply1,2020,0.34280000000
-1,2045,R2,gassupply1,2020,0.34280000000
-1,2050,R2,gassupply1,2020,0.34280000000
-1,2056,R2,gassupply1,2020,0.34280000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
deleted file mode 100644
index fe400f81c..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2022,R2,gassupply1,2020,15.34280000000
-2,2024,R2,gassupply1,2020,15.34280000000
-2,2025,R2,gassupply1,2020,15.34280000000
-2,2030,R2,gassupply1,2020,7.84280000000
-2,2035,R2,gassupply1,2020,0.34280000000
-2,2040,R2,gassupply1,2020,0.34280000000
-2,2045,R2,gassupply1,2020,0.34280000000
-2,2050,R2,gassupply1,2020,0.34280000000
-2,2056,R2,gassupply1,2020,0.34280000000
-3,2024,R2,gassupply1,2022,0.60380000000
-3,2025,R2,gassupply1,2022,0.60380000000
-3,2030,R2,gassupply1,2022,0.60380000000
-3,2035,R2,gassupply1,2022,0.60380000000
-3,2040,R2,gassupply1,2022,0.60380000000
-3,2045,R2,gassupply1,2022,0.60380000000
-3,2050,R2,gassupply1,2022,0.60380000000
-3,2056,R2,gassupply1,2022,0.60380000000
-3,2057,R2,gassupply1,2022,0.60380000000
-3,2058,R2,gassupply1,2022,0.60380000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
deleted file mode 100644
index e25eb5ce0..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2022,R2,gassupply1,2020,15.34280000000
-3,2024,R2,gassupply1,2020,15.34280000000
-3,2025,R2,gassupply1,2020,15.34280000000
-3,2026,R2,gassupply1,2020,13.84280000000
-3,2030,R2,gassupply1,2020,7.84280000000
-3,2035,R2,gassupply1,2020,0.34280000000
-3,2040,R2,gassupply1,2020,0.34280000000
-3,2045,R2,gassupply1,2020,0.34280000000
-3,2050,R2,gassupply1,2020,0.34280000000
-3,2056,R2,gassupply1,2020,0.34280000000
-4,2024,R2,gassupply1,2022,0.60380000000
-4,2025,R2,gassupply1,2022,0.60380000000
-4,2026,R2,gassupply1,2022,0.60380000000
-4,2030,R2,gassupply1,2022,0.60380000000
-4,2035,R2,gassupply1,2022,0.60380000000
-4,2040,R2,gassupply1,2022,0.60380000000
-4,2045,R2,gassupply1,2022,0.60380000000
-4,2050,R2,gassupply1,2022,0.60380000000
-4,2056,R2,gassupply1,2022,0.60380000000
-4,2057,R2,gassupply1,2022,0.60380000000
-4,2058,R2,gassupply1,2022,0.60380000000
-5,2026,R2,gassupply1,2024,2.07490000000
-5,2030,R2,gassupply1,2024,2.07490000000
-5,2035,R2,gassupply1,2024,2.07490000000
-5,2040,R2,gassupply1,2024,2.07490000000
-5,2045,R2,gassupply1,2024,2.07490000000
-5,2050,R2,gassupply1,2024,2.07490000000
-5,2056,R2,gassupply1,2024,2.07490000000
-5,2057,R2,gassupply1,2024,2.07490000000
-5,2058,R2,gassupply1,2024,2.07490000000
-5,2059,R2,gassupply1,2024,2.07490000000
-5,2060,R2,gassupply1,2024,2.07490000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
deleted file mode 100644
index 61b66fd9a..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
+++ /dev/null
@@ -1,99 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2022,R2,gassupply1,2020,15.34280000000
-4,2024,R2,gassupply1,2020,15.34280000000
-4,2025,R2,gassupply1,2020,15.34280000000
-4,2026,R2,gassupply1,2020,13.84280000000
-4,2028,R2,gassupply1,2020,10.84280000000
-4,2030,R2,gassupply1,2020,7.84280000000
-4,2035,R2,gassupply1,2020,0.34280000000
-4,2040,R2,gassupply1,2020,0.34280000000
-4,2045,R2,gassupply1,2020,0.34280000000
-4,2050,R2,gassupply1,2020,0.34280000000
-4,2056,R2,gassupply1,2020,0.34280000000
-5,2024,R2,gassupply1,2022,0.60380000000
-5,2025,R2,gassupply1,2022,0.60380000000
-5,2026,R2,gassupply1,2022,0.60380000000
-5,2028,R2,gassupply1,2022,0.60380000000
-5,2030,R2,gassupply1,2022,0.60380000000
-5,2035,R2,gassupply1,2022,0.60380000000
-5,2040,R2,gassupply1,2022,0.60380000000
-5,2045,R2,gassupply1,2022,0.60380000000
-5,2050,R2,gassupply1,2022,0.60380000000
-5,2056,R2,gassupply1,2022,0.60380000000
-5,2057,R2,gassupply1,2022,0.60380000000
-5,2058,R2,gassupply1,2022,0.60380000000
-6,2026,R2,gassupply1,2024,2.07490000000
-6,2028,R2,gassupply1,2024,2.07490000000
-6,2030,R2,gassupply1,2024,2.07490000000
-6,2035,R2,gassupply1,2024,2.07490000000
-6,2040,R2,gassupply1,2024,2.07490000000
-6,2045,R2,gassupply1,2024,2.07490000000
-6,2050,R2,gassupply1,2024,2.07490000000
-6,2056,R2,gassupply1,2024,2.07490000000
-6,2057,R2,gassupply1,2024,2.07490000000
-6,2058,R2,gassupply1,2024,2.07490000000
-6,2059,R2,gassupply1,2024,2.07490000000
-6,2060,R2,gassupply1,2024,2.07490000000
-7,2028,R2,gassupply1,2026,3.55300000000
-7,2030,R2,gassupply1,2026,3.55300000000
-7,2035,R2,gassupply1,2026,3.55300000000
-7,2040,R2,gassupply1,2026,3.55300000000
-7,2045,R2,gassupply1,2026,3.55300000000
-7,2050,R2,gassupply1,2026,3.55300000000
-7,2056,R2,gassupply1,2026,3.55300000000
-7,2057,R2,gassupply1,2026,3.55300000000
-7,2058,R2,gassupply1,2026,3.55300000000
-7,2059,R2,gassupply1,2026,3.55300000000
-7,2060,R2,gassupply1,2026,3.55300000000
-7,2061,R2,gassupply1,2026,3.55300000000
-7,2062,R2,gassupply1,2026,3.55300000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
deleted file mode 100644
index 1d3a800fb..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
+++ /dev/null
@@ -1,127 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2020,R2,gassupply1,2020,15.00000000000
-5,2022,R2,gassupply1,2020,15.34280000000
-5,2024,R2,gassupply1,2020,15.34280000000
-5,2025,R2,gassupply1,2020,15.34280000000
-5,2026,R2,gassupply1,2020,13.84280000000
-5,2028,R2,gassupply1,2020,10.84280000000
-5,2030,R2,gassupply1,2020,7.84280000000
-5,2035,R2,gassupply1,2020,0.34280000000
-5,2040,R2,gassupply1,2020,0.34280000000
-5,2045,R2,gassupply1,2020,0.34280000000
-5,2050,R2,gassupply1,2020,0.34280000000
-5,2056,R2,gassupply1,2020,0.34280000000
-6,2024,R2,gassupply1,2022,0.60380000000
-6,2025,R2,gassupply1,2022,0.60380000000
-6,2026,R2,gassupply1,2022,0.60380000000
-6,2028,R2,gassupply1,2022,0.60380000000
-6,2030,R2,gassupply1,2022,0.60380000000
-6,2035,R2,gassupply1,2022,0.60380000000
-6,2040,R2,gassupply1,2022,0.60380000000
-6,2045,R2,gassupply1,2022,0.60380000000
-6,2050,R2,gassupply1,2022,0.60380000000
-6,2056,R2,gassupply1,2022,0.60380000000
-6,2057,R2,gassupply1,2022,0.60380000000
-6,2058,R2,gassupply1,2022,0.60380000000
-7,2026,R2,gassupply1,2024,2.07490000000
-7,2028,R2,gassupply1,2024,2.07490000000
-7,2030,R2,gassupply1,2024,2.07490000000
-7,2035,R2,gassupply1,2024,2.07490000000
-7,2040,R2,gassupply1,2024,2.07490000000
-7,2045,R2,gassupply1,2024,2.07490000000
-7,2050,R2,gassupply1,2024,2.07490000000
-7,2056,R2,gassupply1,2024,2.07490000000
-7,2057,R2,gassupply1,2024,2.07490000000
-7,2058,R2,gassupply1,2024,2.07490000000
-7,2059,R2,gassupply1,2024,2.07490000000
-7,2060,R2,gassupply1,2024,2.07490000000
-8,2028,R2,gassupply1,2026,3.55300000000
-8,2030,R2,gassupply1,2026,3.55300000000
-8,2035,R2,gassupply1,2026,3.55300000000
-8,2040,R2,gassupply1,2026,3.55300000000
-8,2045,R2,gassupply1,2026,3.55300000000
-8,2050,R2,gassupply1,2026,3.55300000000
-8,2056,R2,gassupply1,2026,3.55300000000
-8,2057,R2,gassupply1,2026,3.55300000000
-8,2058,R2,gassupply1,2026,3.55300000000
-8,2059,R2,gassupply1,2026,3.55300000000
-8,2060,R2,gassupply1,2026,3.55300000000
-8,2061,R2,gassupply1,2026,3.55300000000
-8,2062,R2,gassupply1,2026,3.55300000000
-9,2030,R2,gassupply1,2028,3.53600000000
-9,2035,R2,gassupply1,2028,3.53600000000
-9,2040,R2,gassupply1,2028,3.53600000000
-9,2045,R2,gassupply1,2028,3.53600000000
-9,2050,R2,gassupply1,2028,3.53600000000
-9,2056,R2,gassupply1,2028,3.53600000000
-9,2057,R2,gassupply1,2028,3.53600000000
-9,2058,R2,gassupply1,2028,3.53600000000
-9,2059,R2,gassupply1,2028,3.53600000000
-9,2060,R2,gassupply1,2028,3.53600000000
-9,2061,R2,gassupply1,2028,3.53600000000
-9,2062,R2,gassupply1,2028,3.53600000000
-9,2063,R2,gassupply1,2028,3.53600000000
-9,2064,R2,gassupply1,2028,3.53600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index a560f88e3..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2032,R1,gassupply1,2020,4.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2032,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2032,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2032,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2032,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2032,R1,gassupply1,2030,4.66260000000
-5,2035,R1,gassupply1,2030,4.66260000000
-5,2040,R1,gassupply1,2030,4.66260000000
-5,2045,R1,gassupply1,2030,4.66260000000
-5,2050,R1,gassupply1,2030,4.66260000000
-5,2056,R1,gassupply1,2030,4.66260000000
-5,2057,R1,gassupply1,2030,4.66260000000
-5,2058,R1,gassupply1,2030,4.66260000000
-5,2059,R1,gassupply1,2030,4.66260000000
-5,2060,R1,gassupply1,2030,4.66260000000
-5,2061,R1,gassupply1,2030,4.66260000000
-5,2062,R1,gassupply1,2030,4.66260000000
-5,2063,R1,gassupply1,2030,4.66260000000
-5,2064,R1,gassupply1,2030,4.66260000000
-5,2065,R1,gassupply1,2030,4.66260000000
-5,2066,R1,gassupply1,2030,4.66260000000
-6,2020,R2,gassupply1,2020,15.00000000000
-6,2022,R2,gassupply1,2020,15.34280000000
-6,2024,R2,gassupply1,2020,15.34280000000
-6,2025,R2,gassupply1,2020,15.34280000000
-6,2026,R2,gassupply1,2020,13.84280000000
-6,2028,R2,gassupply1,2020,10.84280000000
-6,2030,R2,gassupply1,2020,7.84280000000
-6,2032,R2,gassupply1,2020,4.84280000000
-6,2035,R2,gassupply1,2020,0.34280000000
-6,2040,R2,gassupply1,2020,0.34280000000
-6,2045,R2,gassupply1,2020,0.34280000000
-6,2050,R2,gassupply1,2020,0.34280000000
-6,2056,R2,gassupply1,2020,0.34280000000
-7,2024,R2,gassupply1,2022,0.60380000000
-7,2025,R2,gassupply1,2022,0.60380000000
-7,2026,R2,gassupply1,2022,0.60380000000
-7,2028,R2,gassupply1,2022,0.60380000000
-7,2030,R2,gassupply1,2022,0.60380000000
-7,2032,R2,gassupply1,2022,0.60380000000
-7,2035,R2,gassupply1,2022,0.60380000000
-7,2040,R2,gassupply1,2022,0.60380000000
-7,2045,R2,gassupply1,2022,0.60380000000
-7,2050,R2,gassupply1,2022,0.60380000000
-7,2056,R2,gassupply1,2022,0.60380000000
-7,2057,R2,gassupply1,2022,0.60380000000
-7,2058,R2,gassupply1,2022,0.60380000000
-8,2026,R2,gassupply1,2024,2.07490000000
-8,2028,R2,gassupply1,2024,2.07490000000
-8,2030,R2,gassupply1,2024,2.07490000000
-8,2032,R2,gassupply1,2024,2.07490000000
-8,2035,R2,gassupply1,2024,2.07490000000
-8,2040,R2,gassupply1,2024,2.07490000000
-8,2045,R2,gassupply1,2024,2.07490000000
-8,2050,R2,gassupply1,2024,2.07490000000
-8,2056,R2,gassupply1,2024,2.07490000000
-8,2057,R2,gassupply1,2024,2.07490000000
-8,2058,R2,gassupply1,2024,2.07490000000
-8,2059,R2,gassupply1,2024,2.07490000000
-8,2060,R2,gassupply1,2024,2.07490000000
-9,2028,R2,gassupply1,2026,3.55300000000
-9,2030,R2,gassupply1,2026,3.55300000000
-9,2032,R2,gassupply1,2026,3.55300000000
-9,2035,R2,gassupply1,2026,3.55300000000
-9,2040,R2,gassupply1,2026,3.55300000000
-9,2045,R2,gassupply1,2026,3.55300000000
-9,2050,R2,gassupply1,2026,3.55300000000
-9,2056,R2,gassupply1,2026,3.55300000000
-9,2057,R2,gassupply1,2026,3.55300000000
-9,2058,R2,gassupply1,2026,3.55300000000
-9,2059,R2,gassupply1,2026,3.55300000000
-9,2060,R2,gassupply1,2026,3.55300000000
-9,2061,R2,gassupply1,2026,3.55300000000
-9,2062,R2,gassupply1,2026,3.55300000000
-10,2030,R2,gassupply1,2028,3.53600000000
-10,2032,R2,gassupply1,2028,3.53600000000
-10,2035,R2,gassupply1,2028,3.53600000000
-10,2040,R2,gassupply1,2028,3.53600000000
-10,2045,R2,gassupply1,2028,3.53600000000
-10,2050,R2,gassupply1,2028,3.53600000000
-10,2056,R2,gassupply1,2028,3.53600000000
-10,2057,R2,gassupply1,2028,3.53600000000
-10,2058,R2,gassupply1,2028,3.53600000000
-10,2059,R2,gassupply1,2028,3.53600000000
-10,2060,R2,gassupply1,2028,3.53600000000
-10,2061,R2,gassupply1,2028,3.53600000000
-10,2062,R2,gassupply1,2028,3.53600000000
-10,2063,R2,gassupply1,2028,3.53600000000
-10,2064,R2,gassupply1,2028,3.53600000000
-11,2032,R2,gassupply1,2030,4.66260000000
-11,2035,R2,gassupply1,2030,4.66260000000
-11,2040,R2,gassupply1,2030,4.66260000000
-11,2045,R2,gassupply1,2030,4.66260000000
-11,2050,R2,gassupply1,2030,4.66260000000
-11,2056,R2,gassupply1,2030,4.66260000000
-11,2057,R2,gassupply1,2030,4.66260000000
-11,2058,R2,gassupply1,2030,4.66260000000
-11,2059,R2,gassupply1,2030,4.66260000000
-11,2060,R2,gassupply1,2030,4.66260000000
-11,2061,R2,gassupply1,2030,4.66260000000
-11,2062,R2,gassupply1,2030,4.66260000000
-11,2063,R2,gassupply1,2030,4.66260000000
-11,2064,R2,gassupply1,2030,4.66260000000
-11,2065,R2,gassupply1,2030,4.66260000000
-11,2066,R2,gassupply1,2030,4.66260000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
deleted file mode 100644
index 7bb6534a9..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
+++ /dev/null
@@ -1,217 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2032,R1,gassupply1,2020,4.84280000000
-0,2034,R1,gassupply1,2020,1.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2032,R1,gassupply1,2022,0.60380000000
-1,2034,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2032,R1,gassupply1,2024,2.07490000000
-2,2034,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2032,R1,gassupply1,2026,3.55300000000
-3,2034,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2032,R1,gassupply1,2028,3.53600000000
-4,2034,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2032,R1,gassupply1,2030,4.66260000000
-5,2034,R1,gassupply1,2030,4.66260000000
-5,2035,R1,gassupply1,2030,4.66260000000
-5,2040,R1,gassupply1,2030,4.66260000000
-5,2045,R1,gassupply1,2030,4.66260000000
-5,2050,R1,gassupply1,2030,4.66260000000
-5,2056,R1,gassupply1,2030,4.66260000000
-5,2057,R1,gassupply1,2030,4.66260000000
-5,2058,R1,gassupply1,2030,4.66260000000
-5,2059,R1,gassupply1,2030,4.66260000000
-5,2060,R1,gassupply1,2030,4.66260000000
-5,2061,R1,gassupply1,2030,4.66260000000
-5,2062,R1,gassupply1,2030,4.66260000000
-5,2063,R1,gassupply1,2030,4.66260000000
-5,2064,R1,gassupply1,2030,4.66260000000
-5,2065,R1,gassupply1,2030,4.66260000000
-5,2066,R1,gassupply1,2030,4.66260000000
-6,2034,R1,gassupply1,2032,3.62850000000
-6,2035,R1,gassupply1,2032,3.62850000000
-6,2040,R1,gassupply1,2032,3.62850000000
-6,2045,R1,gassupply1,2032,3.62850000000
-6,2050,R1,gassupply1,2032,3.62850000000
-6,2056,R1,gassupply1,2032,3.62850000000
-6,2057,R1,gassupply1,2032,3.62850000000
-6,2058,R1,gassupply1,2032,3.62850000000
-6,2059,R1,gassupply1,2032,3.62850000000
-6,2060,R1,gassupply1,2032,3.62850000000
-6,2061,R1,gassupply1,2032,3.62850000000
-6,2062,R1,gassupply1,2032,3.62850000000
-6,2063,R1,gassupply1,2032,3.62850000000
-6,2064,R1,gassupply1,2032,3.62850000000
-6,2065,R1,gassupply1,2032,3.62850000000
-6,2066,R1,gassupply1,2032,3.62850000000
-6,2067,R1,gassupply1,2032,3.62850000000
-6,2068,R1,gassupply1,2032,3.62850000000
-7,2020,R2,gassupply1,2020,15.00000000000
-7,2022,R2,gassupply1,2020,15.34280000000
-7,2024,R2,gassupply1,2020,15.34280000000
-7,2025,R2,gassupply1,2020,15.34280000000
-7,2026,R2,gassupply1,2020,13.84280000000
-7,2028,R2,gassupply1,2020,10.84280000000
-7,2030,R2,gassupply1,2020,7.84280000000
-7,2032,R2,gassupply1,2020,4.84280000000
-7,2034,R2,gassupply1,2020,1.84280000000
-7,2035,R2,gassupply1,2020,0.34280000000
-7,2040,R2,gassupply1,2020,0.34280000000
-7,2045,R2,gassupply1,2020,0.34280000000
-7,2050,R2,gassupply1,2020,0.34280000000
-7,2056,R2,gassupply1,2020,0.34280000000
-8,2024,R2,gassupply1,2022,0.60380000000
-8,2025,R2,gassupply1,2022,0.60380000000
-8,2026,R2,gassupply1,2022,0.60380000000
-8,2028,R2,gassupply1,2022,0.60380000000
-8,2030,R2,gassupply1,2022,0.60380000000
-8,2032,R2,gassupply1,2022,0.60380000000
-8,2034,R2,gassupply1,2022,0.60380000000
-8,2035,R2,gassupply1,2022,0.60380000000
-8,2040,R2,gassupply1,2022,0.60380000000
-8,2045,R2,gassupply1,2022,0.60380000000
-8,2050,R2,gassupply1,2022,0.60380000000
-8,2056,R2,gassupply1,2022,0.60380000000
-8,2057,R2,gassupply1,2022,0.60380000000
-8,2058,R2,gassupply1,2022,0.60380000000
-9,2026,R2,gassupply1,2024,2.07490000000
-9,2028,R2,gassupply1,2024,2.07490000000
-9,2030,R2,gassupply1,2024,2.07490000000
-9,2032,R2,gassupply1,2024,2.07490000000
-9,2034,R2,gassupply1,2024,2.07490000000
-9,2035,R2,gassupply1,2024,2.07490000000
-9,2040,R2,gassupply1,2024,2.07490000000
-9,2045,R2,gassupply1,2024,2.07490000000
-9,2050,R2,gassupply1,2024,2.07490000000
-9,2056,R2,gassupply1,2024,2.07490000000
-9,2057,R2,gassupply1,2024,2.07490000000
-9,2058,R2,gassupply1,2024,2.07490000000
-9,2059,R2,gassupply1,2024,2.07490000000
-9,2060,R2,gassupply1,2024,2.07490000000
-10,2028,R2,gassupply1,2026,3.55300000000
-10,2030,R2,gassupply1,2026,3.55300000000
-10,2032,R2,gassupply1,2026,3.55300000000
-10,2034,R2,gassupply1,2026,3.55300000000
-10,2035,R2,gassupply1,2026,3.55300000000
-10,2040,R2,gassupply1,2026,3.55300000000
-10,2045,R2,gassupply1,2026,3.55300000000
-10,2050,R2,gassupply1,2026,3.55300000000
-10,2056,R2,gassupply1,2026,3.55300000000
-10,2057,R2,gassupply1,2026,3.55300000000
-10,2058,R2,gassupply1,2026,3.55300000000
-10,2059,R2,gassupply1,2026,3.55300000000
-10,2060,R2,gassupply1,2026,3.55300000000
-10,2061,R2,gassupply1,2026,3.55300000000
-10,2062,R2,gassupply1,2026,3.55300000000
-11,2030,R2,gassupply1,2028,3.53600000000
-11,2032,R2,gassupply1,2028,3.53600000000
-11,2034,R2,gassupply1,2028,3.53600000000
-11,2035,R2,gassupply1,2028,3.53600000000
-11,2040,R2,gassupply1,2028,3.53600000000
-11,2045,R2,gassupply1,2028,3.53600000000
-11,2050,R2,gassupply1,2028,3.53600000000
-11,2056,R2,gassupply1,2028,3.53600000000
-11,2057,R2,gassupply1,2028,3.53600000000
-11,2058,R2,gassupply1,2028,3.53600000000
-11,2059,R2,gassupply1,2028,3.53600000000
-11,2060,R2,gassupply1,2028,3.53600000000
-11,2061,R2,gassupply1,2028,3.53600000000
-11,2062,R2,gassupply1,2028,3.53600000000
-11,2063,R2,gassupply1,2028,3.53600000000
-11,2064,R2,gassupply1,2028,3.53600000000
-12,2032,R2,gassupply1,2030,4.66260000000
-12,2034,R2,gassupply1,2030,4.66260000000
-12,2035,R2,gassupply1,2030,4.66260000000
-12,2040,R2,gassupply1,2030,4.66260000000
-12,2045,R2,gassupply1,2030,4.66260000000
-12,2050,R2,gassupply1,2030,4.66260000000
-12,2056,R2,gassupply1,2030,4.66260000000
-12,2057,R2,gassupply1,2030,4.66260000000
-12,2058,R2,gassupply1,2030,4.66260000000
-12,2059,R2,gassupply1,2030,4.66260000000
-12,2060,R2,gassupply1,2030,4.66260000000
-12,2061,R2,gassupply1,2030,4.66260000000
-12,2062,R2,gassupply1,2030,4.66260000000
-12,2063,R2,gassupply1,2030,4.66260000000
-12,2064,R2,gassupply1,2030,4.66260000000
-12,2065,R2,gassupply1,2030,4.66260000000
-12,2066,R2,gassupply1,2030,4.66260000000
-13,2034,R2,gassupply1,2032,3.62850000000
-13,2035,R2,gassupply1,2032,3.62850000000
-13,2040,R2,gassupply1,2032,3.62850000000
-13,2045,R2,gassupply1,2032,3.62850000000
-13,2050,R2,gassupply1,2032,3.62850000000
-13,2056,R2,gassupply1,2032,3.62850000000
-13,2057,R2,gassupply1,2032,3.62850000000
-13,2058,R2,gassupply1,2032,3.62850000000
-13,2059,R2,gassupply1,2032,3.62850000000
-13,2060,R2,gassupply1,2032,3.62850000000
-13,2061,R2,gassupply1,2032,3.62850000000
-13,2062,R2,gassupply1,2032,3.62850000000
-13,2063,R2,gassupply1,2032,3.62850000000
-13,2064,R2,gassupply1,2032,3.62850000000
-13,2065,R2,gassupply1,2032,3.62850000000
-13,2066,R2,gassupply1,2032,3.62850000000
-13,2067,R2,gassupply1,2032,3.62850000000
-13,2068,R2,gassupply1,2032,3.62850000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
deleted file mode 100644
index 37ffe197a..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
+++ /dev/null
@@ -1,269 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2032,R1,gassupply1,2020,4.84280000000
-0,2034,R1,gassupply1,2020,1.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2036,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2032,R1,gassupply1,2022,0.60380000000
-1,2034,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2036,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2032,R1,gassupply1,2024,2.07490000000
-2,2034,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2036,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2032,R1,gassupply1,2026,3.55300000000
-3,2034,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2036,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2032,R1,gassupply1,2028,3.53600000000
-4,2034,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2036,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2032,R1,gassupply1,2030,4.66260000000
-5,2034,R1,gassupply1,2030,4.66260000000
-5,2035,R1,gassupply1,2030,4.66260000000
-5,2036,R1,gassupply1,2030,4.66260000000
-5,2040,R1,gassupply1,2030,4.66260000000
-5,2045,R1,gassupply1,2030,4.66260000000
-5,2050,R1,gassupply1,2030,4.66260000000
-5,2056,R1,gassupply1,2030,4.66260000000
-5,2057,R1,gassupply1,2030,4.66260000000
-5,2058,R1,gassupply1,2030,4.66260000000
-5,2059,R1,gassupply1,2030,4.66260000000
-5,2060,R1,gassupply1,2030,4.66260000000
-5,2061,R1,gassupply1,2030,4.66260000000
-5,2062,R1,gassupply1,2030,4.66260000000
-5,2063,R1,gassupply1,2030,4.66260000000
-5,2064,R1,gassupply1,2030,4.66260000000
-5,2065,R1,gassupply1,2030,4.66260000000
-5,2066,R1,gassupply1,2030,4.66260000000
-6,2034,R1,gassupply1,2032,3.62850000000
-6,2035,R1,gassupply1,2032,3.62850000000
-6,2036,R1,gassupply1,2032,3.62850000000
-6,2040,R1,gassupply1,2032,3.62850000000
-6,2045,R1,gassupply1,2032,3.62850000000
-6,2050,R1,gassupply1,2032,3.62850000000
-6,2056,R1,gassupply1,2032,3.62850000000
-6,2057,R1,gassupply1,2032,3.62850000000
-6,2058,R1,gassupply1,2032,3.62850000000
-6,2059,R1,gassupply1,2032,3.62850000000
-6,2060,R1,gassupply1,2032,3.62850000000
-6,2061,R1,gassupply1,2032,3.62850000000
-6,2062,R1,gassupply1,2032,3.62850000000
-6,2063,R1,gassupply1,2032,3.62850000000
-6,2064,R1,gassupply1,2032,3.62850000000
-6,2065,R1,gassupply1,2032,3.62850000000
-6,2066,R1,gassupply1,2032,3.62850000000
-6,2067,R1,gassupply1,2032,3.62850000000
-6,2068,R1,gassupply1,2032,3.62850000000
-7,2036,R1,gassupply1,2034,1.50000000000
-7,2040,R1,gassupply1,2034,1.50000000000
-7,2045,R1,gassupply1,2034,1.50000000000
-7,2050,R1,gassupply1,2034,1.50000000000
-7,2056,R1,gassupply1,2034,1.50000000000
-7,2057,R1,gassupply1,2034,1.50000000000
-7,2058,R1,gassupply1,2034,1.50000000000
-7,2059,R1,gassupply1,2034,1.50000000000
-7,2060,R1,gassupply1,2034,1.50000000000
-7,2061,R1,gassupply1,2034,1.50000000000
-7,2062,R1,gassupply1,2034,1.50000000000
-7,2063,R1,gassupply1,2034,1.50000000000
-7,2064,R1,gassupply1,2034,1.50000000000
-7,2065,R1,gassupply1,2034,1.50000000000
-7,2066,R1,gassupply1,2034,1.50000000000
-7,2067,R1,gassupply1,2034,1.50000000000
-7,2068,R1,gassupply1,2034,1.50000000000
-7,2069,R1,gassupply1,2034,1.50000000000
-7,2070,R1,gassupply1,2034,1.50000000000
-8,2020,R2,gassupply1,2020,15.00000000000
-8,2022,R2,gassupply1,2020,15.34280000000
-8,2024,R2,gassupply1,2020,15.34280000000
-8,2025,R2,gassupply1,2020,15.34280000000
-8,2026,R2,gassupply1,2020,13.84280000000
-8,2028,R2,gassupply1,2020,10.84280000000
-8,2030,R2,gassupply1,2020,7.84280000000
-8,2032,R2,gassupply1,2020,4.84280000000
-8,2034,R2,gassupply1,2020,1.84280000000
-8,2035,R2,gassupply1,2020,0.34280000000
-8,2036,R2,gassupply1,2020,0.34280000000
-8,2040,R2,gassupply1,2020,0.34280000000
-8,2045,R2,gassupply1,2020,0.34280000000
-8,2050,R2,gassupply1,2020,0.34280000000
-8,2056,R2,gassupply1,2020,0.34280000000
-9,2024,R2,gassupply1,2022,0.60380000000
-9,2025,R2,gassupply1,2022,0.60380000000
-9,2026,R2,gassupply1,2022,0.60380000000
-9,2028,R2,gassupply1,2022,0.60380000000
-9,2030,R2,gassupply1,2022,0.60380000000
-9,2032,R2,gassupply1,2022,0.60380000000
-9,2034,R2,gassupply1,2022,0.60380000000
-9,2035,R2,gassupply1,2022,0.60380000000
-9,2036,R2,gassupply1,2022,0.60380000000
-9,2040,R2,gassupply1,2022,0.60380000000
-9,2045,R2,gassupply1,2022,0.60380000000
-9,2050,R2,gassupply1,2022,0.60380000000
-9,2056,R2,gassupply1,2022,0.60380000000
-9,2057,R2,gassupply1,2022,0.60380000000
-9,2058,R2,gassupply1,2022,0.60380000000
-10,2026,R2,gassupply1,2024,2.07490000000
-10,2028,R2,gassupply1,2024,2.07490000000
-10,2030,R2,gassupply1,2024,2.07490000000
-10,2032,R2,gassupply1,2024,2.07490000000
-10,2034,R2,gassupply1,2024,2.07490000000
-10,2035,R2,gassupply1,2024,2.07490000000
-10,2036,R2,gassupply1,2024,2.07490000000
-10,2040,R2,gassupply1,2024,2.07490000000
-10,2045,R2,gassupply1,2024,2.07490000000
-10,2050,R2,gassupply1,2024,2.07490000000
-10,2056,R2,gassupply1,2024,2.07490000000
-10,2057,R2,gassupply1,2024,2.07490000000
-10,2058,R2,gassupply1,2024,2.07490000000
-10,2059,R2,gassupply1,2024,2.07490000000
-10,2060,R2,gassupply1,2024,2.07490000000
-11,2028,R2,gassupply1,2026,3.55300000000
-11,2030,R2,gassupply1,2026,3.55300000000
-11,2032,R2,gassupply1,2026,3.55300000000
-11,2034,R2,gassupply1,2026,3.55300000000
-11,2035,R2,gassupply1,2026,3.55300000000
-11,2036,R2,gassupply1,2026,3.55300000000
-11,2040,R2,gassupply1,2026,3.55300000000
-11,2045,R2,gassupply1,2026,3.55300000000
-11,2050,R2,gassupply1,2026,3.55300000000
-11,2056,R2,gassupply1,2026,3.55300000000
-11,2057,R2,gassupply1,2026,3.55300000000
-11,2058,R2,gassupply1,2026,3.55300000000
-11,2059,R2,gassupply1,2026,3.55300000000
-11,2060,R2,gassupply1,2026,3.55300000000
-11,2061,R2,gassupply1,2026,3.55300000000
-11,2062,R2,gassupply1,2026,3.55300000000
-12,2030,R2,gassupply1,2028,3.53600000000
-12,2032,R2,gassupply1,2028,3.53600000000
-12,2034,R2,gassupply1,2028,3.53600000000
-12,2035,R2,gassupply1,2028,3.53600000000
-12,2036,R2,gassupply1,2028,3.53600000000
-12,2040,R2,gassupply1,2028,3.53600000000
-12,2045,R2,gassupply1,2028,3.53600000000
-12,2050,R2,gassupply1,2028,3.53600000000
-12,2056,R2,gassupply1,2028,3.53600000000
-12,2057,R2,gassupply1,2028,3.53600000000
-12,2058,R2,gassupply1,2028,3.53600000000
-12,2059,R2,gassupply1,2028,3.53600000000
-12,2060,R2,gassupply1,2028,3.53600000000
-12,2061,R2,gassupply1,2028,3.53600000000
-12,2062,R2,gassupply1,2028,3.53600000000
-12,2063,R2,gassupply1,2028,3.53600000000
-12,2064,R2,gassupply1,2028,3.53600000000
-13,2032,R2,gassupply1,2030,4.66260000000
-13,2034,R2,gassupply1,2030,4.66260000000
-13,2035,R2,gassupply1,2030,4.66260000000
-13,2036,R2,gassupply1,2030,4.66260000000
-13,2040,R2,gassupply1,2030,4.66260000000
-13,2045,R2,gassupply1,2030,4.66260000000
-13,2050,R2,gassupply1,2030,4.66260000000
-13,2056,R2,gassupply1,2030,4.66260000000
-13,2057,R2,gassupply1,2030,4.66260000000
-13,2058,R2,gassupply1,2030,4.66260000000
-13,2059,R2,gassupply1,2030,4.66260000000
-13,2060,R2,gassupply1,2030,4.66260000000
-13,2061,R2,gassupply1,2030,4.66260000000
-13,2062,R2,gassupply1,2030,4.66260000000
-13,2063,R2,gassupply1,2030,4.66260000000
-13,2064,R2,gassupply1,2030,4.66260000000
-13,2065,R2,gassupply1,2030,4.66260000000
-13,2066,R2,gassupply1,2030,4.66260000000
-14,2034,R2,gassupply1,2032,3.62850000000
-14,2035,R2,gassupply1,2032,3.62850000000
-14,2036,R2,gassupply1,2032,3.62850000000
-14,2040,R2,gassupply1,2032,3.62850000000
-14,2045,R2,gassupply1,2032,3.62850000000
-14,2050,R2,gassupply1,2032,3.62850000000
-14,2056,R2,gassupply1,2032,3.62850000000
-14,2057,R2,gassupply1,2032,3.62850000000
-14,2058,R2,gassupply1,2032,3.62850000000
-14,2059,R2,gassupply1,2032,3.62850000000
-14,2060,R2,gassupply1,2032,3.62850000000
-14,2061,R2,gassupply1,2032,3.62850000000
-14,2062,R2,gassupply1,2032,3.62850000000
-14,2063,R2,gassupply1,2032,3.62850000000
-14,2064,R2,gassupply1,2032,3.62850000000
-14,2065,R2,gassupply1,2032,3.62850000000
-14,2066,R2,gassupply1,2032,3.62850000000
-14,2067,R2,gassupply1,2032,3.62850000000
-14,2068,R2,gassupply1,2032,3.62850000000
-15,2036,R2,gassupply1,2034,1.50000000000
-15,2040,R2,gassupply1,2034,1.50000000000
-15,2045,R2,gassupply1,2034,1.50000000000
-15,2050,R2,gassupply1,2034,1.50000000000
-15,2056,R2,gassupply1,2034,1.50000000000
-15,2057,R2,gassupply1,2034,1.50000000000
-15,2058,R2,gassupply1,2034,1.50000000000
-15,2059,R2,gassupply1,2034,1.50000000000
-15,2060,R2,gassupply1,2034,1.50000000000
-15,2061,R2,gassupply1,2034,1.50000000000
-15,2062,R2,gassupply1,2034,1.50000000000
-15,2063,R2,gassupply1,2034,1.50000000000
-15,2064,R2,gassupply1,2034,1.50000000000
-15,2065,R2,gassupply1,2034,1.50000000000
-15,2066,R2,gassupply1,2034,1.50000000000
-15,2067,R2,gassupply1,2034,1.50000000000
-15,2068,R2,gassupply1,2034,1.50000000000
-15,2069,R2,gassupply1,2034,1.50000000000
-15,2070,R2,gassupply1,2034,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
deleted file mode 100644
index 37ffe197a..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
+++ /dev/null
@@ -1,269 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2032,R1,gassupply1,2020,4.84280000000
-0,2034,R1,gassupply1,2020,1.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2036,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2032,R1,gassupply1,2022,0.60380000000
-1,2034,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2036,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2032,R1,gassupply1,2024,2.07490000000
-2,2034,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2036,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2032,R1,gassupply1,2026,3.55300000000
-3,2034,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2036,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2032,R1,gassupply1,2028,3.53600000000
-4,2034,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2036,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2032,R1,gassupply1,2030,4.66260000000
-5,2034,R1,gassupply1,2030,4.66260000000
-5,2035,R1,gassupply1,2030,4.66260000000
-5,2036,R1,gassupply1,2030,4.66260000000
-5,2040,R1,gassupply1,2030,4.66260000000
-5,2045,R1,gassupply1,2030,4.66260000000
-5,2050,R1,gassupply1,2030,4.66260000000
-5,2056,R1,gassupply1,2030,4.66260000000
-5,2057,R1,gassupply1,2030,4.66260000000
-5,2058,R1,gassupply1,2030,4.66260000000
-5,2059,R1,gassupply1,2030,4.66260000000
-5,2060,R1,gassupply1,2030,4.66260000000
-5,2061,R1,gassupply1,2030,4.66260000000
-5,2062,R1,gassupply1,2030,4.66260000000
-5,2063,R1,gassupply1,2030,4.66260000000
-5,2064,R1,gassupply1,2030,4.66260000000
-5,2065,R1,gassupply1,2030,4.66260000000
-5,2066,R1,gassupply1,2030,4.66260000000
-6,2034,R1,gassupply1,2032,3.62850000000
-6,2035,R1,gassupply1,2032,3.62850000000
-6,2036,R1,gassupply1,2032,3.62850000000
-6,2040,R1,gassupply1,2032,3.62850000000
-6,2045,R1,gassupply1,2032,3.62850000000
-6,2050,R1,gassupply1,2032,3.62850000000
-6,2056,R1,gassupply1,2032,3.62850000000
-6,2057,R1,gassupply1,2032,3.62850000000
-6,2058,R1,gassupply1,2032,3.62850000000
-6,2059,R1,gassupply1,2032,3.62850000000
-6,2060,R1,gassupply1,2032,3.62850000000
-6,2061,R1,gassupply1,2032,3.62850000000
-6,2062,R1,gassupply1,2032,3.62850000000
-6,2063,R1,gassupply1,2032,3.62850000000
-6,2064,R1,gassupply1,2032,3.62850000000
-6,2065,R1,gassupply1,2032,3.62850000000
-6,2066,R1,gassupply1,2032,3.62850000000
-6,2067,R1,gassupply1,2032,3.62850000000
-6,2068,R1,gassupply1,2032,3.62850000000
-7,2036,R1,gassupply1,2034,1.50000000000
-7,2040,R1,gassupply1,2034,1.50000000000
-7,2045,R1,gassupply1,2034,1.50000000000
-7,2050,R1,gassupply1,2034,1.50000000000
-7,2056,R1,gassupply1,2034,1.50000000000
-7,2057,R1,gassupply1,2034,1.50000000000
-7,2058,R1,gassupply1,2034,1.50000000000
-7,2059,R1,gassupply1,2034,1.50000000000
-7,2060,R1,gassupply1,2034,1.50000000000
-7,2061,R1,gassupply1,2034,1.50000000000
-7,2062,R1,gassupply1,2034,1.50000000000
-7,2063,R1,gassupply1,2034,1.50000000000
-7,2064,R1,gassupply1,2034,1.50000000000
-7,2065,R1,gassupply1,2034,1.50000000000
-7,2066,R1,gassupply1,2034,1.50000000000
-7,2067,R1,gassupply1,2034,1.50000000000
-7,2068,R1,gassupply1,2034,1.50000000000
-7,2069,R1,gassupply1,2034,1.50000000000
-7,2070,R1,gassupply1,2034,1.50000000000
-8,2020,R2,gassupply1,2020,15.00000000000
-8,2022,R2,gassupply1,2020,15.34280000000
-8,2024,R2,gassupply1,2020,15.34280000000
-8,2025,R2,gassupply1,2020,15.34280000000
-8,2026,R2,gassupply1,2020,13.84280000000
-8,2028,R2,gassupply1,2020,10.84280000000
-8,2030,R2,gassupply1,2020,7.84280000000
-8,2032,R2,gassupply1,2020,4.84280000000
-8,2034,R2,gassupply1,2020,1.84280000000
-8,2035,R2,gassupply1,2020,0.34280000000
-8,2036,R2,gassupply1,2020,0.34280000000
-8,2040,R2,gassupply1,2020,0.34280000000
-8,2045,R2,gassupply1,2020,0.34280000000
-8,2050,R2,gassupply1,2020,0.34280000000
-8,2056,R2,gassupply1,2020,0.34280000000
-9,2024,R2,gassupply1,2022,0.60380000000
-9,2025,R2,gassupply1,2022,0.60380000000
-9,2026,R2,gassupply1,2022,0.60380000000
-9,2028,R2,gassupply1,2022,0.60380000000
-9,2030,R2,gassupply1,2022,0.60380000000
-9,2032,R2,gassupply1,2022,0.60380000000
-9,2034,R2,gassupply1,2022,0.60380000000
-9,2035,R2,gassupply1,2022,0.60380000000
-9,2036,R2,gassupply1,2022,0.60380000000
-9,2040,R2,gassupply1,2022,0.60380000000
-9,2045,R2,gassupply1,2022,0.60380000000
-9,2050,R2,gassupply1,2022,0.60380000000
-9,2056,R2,gassupply1,2022,0.60380000000
-9,2057,R2,gassupply1,2022,0.60380000000
-9,2058,R2,gassupply1,2022,0.60380000000
-10,2026,R2,gassupply1,2024,2.07490000000
-10,2028,R2,gassupply1,2024,2.07490000000
-10,2030,R2,gassupply1,2024,2.07490000000
-10,2032,R2,gassupply1,2024,2.07490000000
-10,2034,R2,gassupply1,2024,2.07490000000
-10,2035,R2,gassupply1,2024,2.07490000000
-10,2036,R2,gassupply1,2024,2.07490000000
-10,2040,R2,gassupply1,2024,2.07490000000
-10,2045,R2,gassupply1,2024,2.07490000000
-10,2050,R2,gassupply1,2024,2.07490000000
-10,2056,R2,gassupply1,2024,2.07490000000
-10,2057,R2,gassupply1,2024,2.07490000000
-10,2058,R2,gassupply1,2024,2.07490000000
-10,2059,R2,gassupply1,2024,2.07490000000
-10,2060,R2,gassupply1,2024,2.07490000000
-11,2028,R2,gassupply1,2026,3.55300000000
-11,2030,R2,gassupply1,2026,3.55300000000
-11,2032,R2,gassupply1,2026,3.55300000000
-11,2034,R2,gassupply1,2026,3.55300000000
-11,2035,R2,gassupply1,2026,3.55300000000
-11,2036,R2,gassupply1,2026,3.55300000000
-11,2040,R2,gassupply1,2026,3.55300000000
-11,2045,R2,gassupply1,2026,3.55300000000
-11,2050,R2,gassupply1,2026,3.55300000000
-11,2056,R2,gassupply1,2026,3.55300000000
-11,2057,R2,gassupply1,2026,3.55300000000
-11,2058,R2,gassupply1,2026,3.55300000000
-11,2059,R2,gassupply1,2026,3.55300000000
-11,2060,R2,gassupply1,2026,3.55300000000
-11,2061,R2,gassupply1,2026,3.55300000000
-11,2062,R2,gassupply1,2026,3.55300000000
-12,2030,R2,gassupply1,2028,3.53600000000
-12,2032,R2,gassupply1,2028,3.53600000000
-12,2034,R2,gassupply1,2028,3.53600000000
-12,2035,R2,gassupply1,2028,3.53600000000
-12,2036,R2,gassupply1,2028,3.53600000000
-12,2040,R2,gassupply1,2028,3.53600000000
-12,2045,R2,gassupply1,2028,3.53600000000
-12,2050,R2,gassupply1,2028,3.53600000000
-12,2056,R2,gassupply1,2028,3.53600000000
-12,2057,R2,gassupply1,2028,3.53600000000
-12,2058,R2,gassupply1,2028,3.53600000000
-12,2059,R2,gassupply1,2028,3.53600000000
-12,2060,R2,gassupply1,2028,3.53600000000
-12,2061,R2,gassupply1,2028,3.53600000000
-12,2062,R2,gassupply1,2028,3.53600000000
-12,2063,R2,gassupply1,2028,3.53600000000
-12,2064,R2,gassupply1,2028,3.53600000000
-13,2032,R2,gassupply1,2030,4.66260000000
-13,2034,R2,gassupply1,2030,4.66260000000
-13,2035,R2,gassupply1,2030,4.66260000000
-13,2036,R2,gassupply1,2030,4.66260000000
-13,2040,R2,gassupply1,2030,4.66260000000
-13,2045,R2,gassupply1,2030,4.66260000000
-13,2050,R2,gassupply1,2030,4.66260000000
-13,2056,R2,gassupply1,2030,4.66260000000
-13,2057,R2,gassupply1,2030,4.66260000000
-13,2058,R2,gassupply1,2030,4.66260000000
-13,2059,R2,gassupply1,2030,4.66260000000
-13,2060,R2,gassupply1,2030,4.66260000000
-13,2061,R2,gassupply1,2030,4.66260000000
-13,2062,R2,gassupply1,2030,4.66260000000
-13,2063,R2,gassupply1,2030,4.66260000000
-13,2064,R2,gassupply1,2030,4.66260000000
-13,2065,R2,gassupply1,2030,4.66260000000
-13,2066,R2,gassupply1,2030,4.66260000000
-14,2034,R2,gassupply1,2032,3.62850000000
-14,2035,R2,gassupply1,2032,3.62850000000
-14,2036,R2,gassupply1,2032,3.62850000000
-14,2040,R2,gassupply1,2032,3.62850000000
-14,2045,R2,gassupply1,2032,3.62850000000
-14,2050,R2,gassupply1,2032,3.62850000000
-14,2056,R2,gassupply1,2032,3.62850000000
-14,2057,R2,gassupply1,2032,3.62850000000
-14,2058,R2,gassupply1,2032,3.62850000000
-14,2059,R2,gassupply1,2032,3.62850000000
-14,2060,R2,gassupply1,2032,3.62850000000
-14,2061,R2,gassupply1,2032,3.62850000000
-14,2062,R2,gassupply1,2032,3.62850000000
-14,2063,R2,gassupply1,2032,3.62850000000
-14,2064,R2,gassupply1,2032,3.62850000000
-14,2065,R2,gassupply1,2032,3.62850000000
-14,2066,R2,gassupply1,2032,3.62850000000
-14,2067,R2,gassupply1,2032,3.62850000000
-14,2068,R2,gassupply1,2032,3.62850000000
-15,2036,R2,gassupply1,2034,1.50000000000
-15,2040,R2,gassupply1,2034,1.50000000000
-15,2045,R2,gassupply1,2034,1.50000000000
-15,2050,R2,gassupply1,2034,1.50000000000
-15,2056,R2,gassupply1,2034,1.50000000000
-15,2057,R2,gassupply1,2034,1.50000000000
-15,2058,R2,gassupply1,2034,1.50000000000
-15,2059,R2,gassupply1,2034,1.50000000000
-15,2060,R2,gassupply1,2034,1.50000000000
-15,2061,R2,gassupply1,2034,1.50000000000
-15,2062,R2,gassupply1,2034,1.50000000000
-15,2063,R2,gassupply1,2034,1.50000000000
-15,2064,R2,gassupply1,2034,1.50000000000
-15,2065,R2,gassupply1,2034,1.50000000000
-15,2066,R2,gassupply1,2034,1.50000000000
-15,2067,R2,gassupply1,2034,1.50000000000
-15,2068,R2,gassupply1,2034,1.50000000000
-15,2069,R2,gassupply1,2034,1.50000000000
-15,2070,R2,gassupply1,2034,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
deleted file mode 100644
index 37ffe197a..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
+++ /dev/null
@@ -1,269 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2032,R1,gassupply1,2020,4.84280000000
-0,2034,R1,gassupply1,2020,1.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2036,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2032,R1,gassupply1,2022,0.60380000000
-1,2034,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2036,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2032,R1,gassupply1,2024,2.07490000000
-2,2034,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2036,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2032,R1,gassupply1,2026,3.55300000000
-3,2034,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2036,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2032,R1,gassupply1,2028,3.53600000000
-4,2034,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2036,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2032,R1,gassupply1,2030,4.66260000000
-5,2034,R1,gassupply1,2030,4.66260000000
-5,2035,R1,gassupply1,2030,4.66260000000
-5,2036,R1,gassupply1,2030,4.66260000000
-5,2040,R1,gassupply1,2030,4.66260000000
-5,2045,R1,gassupply1,2030,4.66260000000
-5,2050,R1,gassupply1,2030,4.66260000000
-5,2056,R1,gassupply1,2030,4.66260000000
-5,2057,R1,gassupply1,2030,4.66260000000
-5,2058,R1,gassupply1,2030,4.66260000000
-5,2059,R1,gassupply1,2030,4.66260000000
-5,2060,R1,gassupply1,2030,4.66260000000
-5,2061,R1,gassupply1,2030,4.66260000000
-5,2062,R1,gassupply1,2030,4.66260000000
-5,2063,R1,gassupply1,2030,4.66260000000
-5,2064,R1,gassupply1,2030,4.66260000000
-5,2065,R1,gassupply1,2030,4.66260000000
-5,2066,R1,gassupply1,2030,4.66260000000
-6,2034,R1,gassupply1,2032,3.62850000000
-6,2035,R1,gassupply1,2032,3.62850000000
-6,2036,R1,gassupply1,2032,3.62850000000
-6,2040,R1,gassupply1,2032,3.62850000000
-6,2045,R1,gassupply1,2032,3.62850000000
-6,2050,R1,gassupply1,2032,3.62850000000
-6,2056,R1,gassupply1,2032,3.62850000000
-6,2057,R1,gassupply1,2032,3.62850000000
-6,2058,R1,gassupply1,2032,3.62850000000
-6,2059,R1,gassupply1,2032,3.62850000000
-6,2060,R1,gassupply1,2032,3.62850000000
-6,2061,R1,gassupply1,2032,3.62850000000
-6,2062,R1,gassupply1,2032,3.62850000000
-6,2063,R1,gassupply1,2032,3.62850000000
-6,2064,R1,gassupply1,2032,3.62850000000
-6,2065,R1,gassupply1,2032,3.62850000000
-6,2066,R1,gassupply1,2032,3.62850000000
-6,2067,R1,gassupply1,2032,3.62850000000
-6,2068,R1,gassupply1,2032,3.62850000000
-7,2036,R1,gassupply1,2034,1.50000000000
-7,2040,R1,gassupply1,2034,1.50000000000
-7,2045,R1,gassupply1,2034,1.50000000000
-7,2050,R1,gassupply1,2034,1.50000000000
-7,2056,R1,gassupply1,2034,1.50000000000
-7,2057,R1,gassupply1,2034,1.50000000000
-7,2058,R1,gassupply1,2034,1.50000000000
-7,2059,R1,gassupply1,2034,1.50000000000
-7,2060,R1,gassupply1,2034,1.50000000000
-7,2061,R1,gassupply1,2034,1.50000000000
-7,2062,R1,gassupply1,2034,1.50000000000
-7,2063,R1,gassupply1,2034,1.50000000000
-7,2064,R1,gassupply1,2034,1.50000000000
-7,2065,R1,gassupply1,2034,1.50000000000
-7,2066,R1,gassupply1,2034,1.50000000000
-7,2067,R1,gassupply1,2034,1.50000000000
-7,2068,R1,gassupply1,2034,1.50000000000
-7,2069,R1,gassupply1,2034,1.50000000000
-7,2070,R1,gassupply1,2034,1.50000000000
-8,2020,R2,gassupply1,2020,15.00000000000
-8,2022,R2,gassupply1,2020,15.34280000000
-8,2024,R2,gassupply1,2020,15.34280000000
-8,2025,R2,gassupply1,2020,15.34280000000
-8,2026,R2,gassupply1,2020,13.84280000000
-8,2028,R2,gassupply1,2020,10.84280000000
-8,2030,R2,gassupply1,2020,7.84280000000
-8,2032,R2,gassupply1,2020,4.84280000000
-8,2034,R2,gassupply1,2020,1.84280000000
-8,2035,R2,gassupply1,2020,0.34280000000
-8,2036,R2,gassupply1,2020,0.34280000000
-8,2040,R2,gassupply1,2020,0.34280000000
-8,2045,R2,gassupply1,2020,0.34280000000
-8,2050,R2,gassupply1,2020,0.34280000000
-8,2056,R2,gassupply1,2020,0.34280000000
-9,2024,R2,gassupply1,2022,0.60380000000
-9,2025,R2,gassupply1,2022,0.60380000000
-9,2026,R2,gassupply1,2022,0.60380000000
-9,2028,R2,gassupply1,2022,0.60380000000
-9,2030,R2,gassupply1,2022,0.60380000000
-9,2032,R2,gassupply1,2022,0.60380000000
-9,2034,R2,gassupply1,2022,0.60380000000
-9,2035,R2,gassupply1,2022,0.60380000000
-9,2036,R2,gassupply1,2022,0.60380000000
-9,2040,R2,gassupply1,2022,0.60380000000
-9,2045,R2,gassupply1,2022,0.60380000000
-9,2050,R2,gassupply1,2022,0.60380000000
-9,2056,R2,gassupply1,2022,0.60380000000
-9,2057,R2,gassupply1,2022,0.60380000000
-9,2058,R2,gassupply1,2022,0.60380000000
-10,2026,R2,gassupply1,2024,2.07490000000
-10,2028,R2,gassupply1,2024,2.07490000000
-10,2030,R2,gassupply1,2024,2.07490000000
-10,2032,R2,gassupply1,2024,2.07490000000
-10,2034,R2,gassupply1,2024,2.07490000000
-10,2035,R2,gassupply1,2024,2.07490000000
-10,2036,R2,gassupply1,2024,2.07490000000
-10,2040,R2,gassupply1,2024,2.07490000000
-10,2045,R2,gassupply1,2024,2.07490000000
-10,2050,R2,gassupply1,2024,2.07490000000
-10,2056,R2,gassupply1,2024,2.07490000000
-10,2057,R2,gassupply1,2024,2.07490000000
-10,2058,R2,gassupply1,2024,2.07490000000
-10,2059,R2,gassupply1,2024,2.07490000000
-10,2060,R2,gassupply1,2024,2.07490000000
-11,2028,R2,gassupply1,2026,3.55300000000
-11,2030,R2,gassupply1,2026,3.55300000000
-11,2032,R2,gassupply1,2026,3.55300000000
-11,2034,R2,gassupply1,2026,3.55300000000
-11,2035,R2,gassupply1,2026,3.55300000000
-11,2036,R2,gassupply1,2026,3.55300000000
-11,2040,R2,gassupply1,2026,3.55300000000
-11,2045,R2,gassupply1,2026,3.55300000000
-11,2050,R2,gassupply1,2026,3.55300000000
-11,2056,R2,gassupply1,2026,3.55300000000
-11,2057,R2,gassupply1,2026,3.55300000000
-11,2058,R2,gassupply1,2026,3.55300000000
-11,2059,R2,gassupply1,2026,3.55300000000
-11,2060,R2,gassupply1,2026,3.55300000000
-11,2061,R2,gassupply1,2026,3.55300000000
-11,2062,R2,gassupply1,2026,3.55300000000
-12,2030,R2,gassupply1,2028,3.53600000000
-12,2032,R2,gassupply1,2028,3.53600000000
-12,2034,R2,gassupply1,2028,3.53600000000
-12,2035,R2,gassupply1,2028,3.53600000000
-12,2036,R2,gassupply1,2028,3.53600000000
-12,2040,R2,gassupply1,2028,3.53600000000
-12,2045,R2,gassupply1,2028,3.53600000000
-12,2050,R2,gassupply1,2028,3.53600000000
-12,2056,R2,gassupply1,2028,3.53600000000
-12,2057,R2,gassupply1,2028,3.53600000000
-12,2058,R2,gassupply1,2028,3.53600000000
-12,2059,R2,gassupply1,2028,3.53600000000
-12,2060,R2,gassupply1,2028,3.53600000000
-12,2061,R2,gassupply1,2028,3.53600000000
-12,2062,R2,gassupply1,2028,3.53600000000
-12,2063,R2,gassupply1,2028,3.53600000000
-12,2064,R2,gassupply1,2028,3.53600000000
-13,2032,R2,gassupply1,2030,4.66260000000
-13,2034,R2,gassupply1,2030,4.66260000000
-13,2035,R2,gassupply1,2030,4.66260000000
-13,2036,R2,gassupply1,2030,4.66260000000
-13,2040,R2,gassupply1,2030,4.66260000000
-13,2045,R2,gassupply1,2030,4.66260000000
-13,2050,R2,gassupply1,2030,4.66260000000
-13,2056,R2,gassupply1,2030,4.66260000000
-13,2057,R2,gassupply1,2030,4.66260000000
-13,2058,R2,gassupply1,2030,4.66260000000
-13,2059,R2,gassupply1,2030,4.66260000000
-13,2060,R2,gassupply1,2030,4.66260000000
-13,2061,R2,gassupply1,2030,4.66260000000
-13,2062,R2,gassupply1,2030,4.66260000000
-13,2063,R2,gassupply1,2030,4.66260000000
-13,2064,R2,gassupply1,2030,4.66260000000
-13,2065,R2,gassupply1,2030,4.66260000000
-13,2066,R2,gassupply1,2030,4.66260000000
-14,2034,R2,gassupply1,2032,3.62850000000
-14,2035,R2,gassupply1,2032,3.62850000000
-14,2036,R2,gassupply1,2032,3.62850000000
-14,2040,R2,gassupply1,2032,3.62850000000
-14,2045,R2,gassupply1,2032,3.62850000000
-14,2050,R2,gassupply1,2032,3.62850000000
-14,2056,R2,gassupply1,2032,3.62850000000
-14,2057,R2,gassupply1,2032,3.62850000000
-14,2058,R2,gassupply1,2032,3.62850000000
-14,2059,R2,gassupply1,2032,3.62850000000
-14,2060,R2,gassupply1,2032,3.62850000000
-14,2061,R2,gassupply1,2032,3.62850000000
-14,2062,R2,gassupply1,2032,3.62850000000
-14,2063,R2,gassupply1,2032,3.62850000000
-14,2064,R2,gassupply1,2032,3.62850000000
-14,2065,R2,gassupply1,2032,3.62850000000
-14,2066,R2,gassupply1,2032,3.62850000000
-14,2067,R2,gassupply1,2032,3.62850000000
-14,2068,R2,gassupply1,2032,3.62850000000
-15,2036,R2,gassupply1,2034,1.50000000000
-15,2040,R2,gassupply1,2034,1.50000000000
-15,2045,R2,gassupply1,2034,1.50000000000
-15,2050,R2,gassupply1,2034,1.50000000000
-15,2056,R2,gassupply1,2034,1.50000000000
-15,2057,R2,gassupply1,2034,1.50000000000
-15,2058,R2,gassupply1,2034,1.50000000000
-15,2059,R2,gassupply1,2034,1.50000000000
-15,2060,R2,gassupply1,2034,1.50000000000
-15,2061,R2,gassupply1,2034,1.50000000000
-15,2062,R2,gassupply1,2034,1.50000000000
-15,2063,R2,gassupply1,2034,1.50000000000
-15,2064,R2,gassupply1,2034,1.50000000000
-15,2065,R2,gassupply1,2034,1.50000000000
-15,2066,R2,gassupply1,2034,1.50000000000
-15,2067,R2,gassupply1,2034,1.50000000000
-15,2068,R2,gassupply1,2034,1.50000000000
-15,2069,R2,gassupply1,2034,1.50000000000
-15,2070,R2,gassupply1,2034,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 37ffe197a..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,269 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2022,R1,gassupply1,2020,15.34280000000
-0,2024,R1,gassupply1,2020,15.34280000000
-0,2025,R1,gassupply1,2020,15.34280000000
-0,2026,R1,gassupply1,2020,13.84280000000
-0,2028,R1,gassupply1,2020,10.84280000000
-0,2030,R1,gassupply1,2020,7.84280000000
-0,2032,R1,gassupply1,2020,4.84280000000
-0,2034,R1,gassupply1,2020,1.84280000000
-0,2035,R1,gassupply1,2020,0.34280000000
-0,2036,R1,gassupply1,2020,0.34280000000
-0,2040,R1,gassupply1,2020,0.34280000000
-0,2045,R1,gassupply1,2020,0.34280000000
-0,2050,R1,gassupply1,2020,0.34280000000
-0,2056,R1,gassupply1,2020,0.34280000000
-1,2024,R1,gassupply1,2022,0.60380000000
-1,2025,R1,gassupply1,2022,0.60380000000
-1,2026,R1,gassupply1,2022,0.60380000000
-1,2028,R1,gassupply1,2022,0.60380000000
-1,2030,R1,gassupply1,2022,0.60380000000
-1,2032,R1,gassupply1,2022,0.60380000000
-1,2034,R1,gassupply1,2022,0.60380000000
-1,2035,R1,gassupply1,2022,0.60380000000
-1,2036,R1,gassupply1,2022,0.60380000000
-1,2040,R1,gassupply1,2022,0.60380000000
-1,2045,R1,gassupply1,2022,0.60380000000
-1,2050,R1,gassupply1,2022,0.60380000000
-1,2056,R1,gassupply1,2022,0.60380000000
-1,2057,R1,gassupply1,2022,0.60380000000
-1,2058,R1,gassupply1,2022,0.60380000000
-2,2026,R1,gassupply1,2024,2.07490000000
-2,2028,R1,gassupply1,2024,2.07490000000
-2,2030,R1,gassupply1,2024,2.07490000000
-2,2032,R1,gassupply1,2024,2.07490000000
-2,2034,R1,gassupply1,2024,2.07490000000
-2,2035,R1,gassupply1,2024,2.07490000000
-2,2036,R1,gassupply1,2024,2.07490000000
-2,2040,R1,gassupply1,2024,2.07490000000
-2,2045,R1,gassupply1,2024,2.07490000000
-2,2050,R1,gassupply1,2024,2.07490000000
-2,2056,R1,gassupply1,2024,2.07490000000
-2,2057,R1,gassupply1,2024,2.07490000000
-2,2058,R1,gassupply1,2024,2.07490000000
-2,2059,R1,gassupply1,2024,2.07490000000
-2,2060,R1,gassupply1,2024,2.07490000000
-3,2028,R1,gassupply1,2026,3.55300000000
-3,2030,R1,gassupply1,2026,3.55300000000
-3,2032,R1,gassupply1,2026,3.55300000000
-3,2034,R1,gassupply1,2026,3.55300000000
-3,2035,R1,gassupply1,2026,3.55300000000
-3,2036,R1,gassupply1,2026,3.55300000000
-3,2040,R1,gassupply1,2026,3.55300000000
-3,2045,R1,gassupply1,2026,3.55300000000
-3,2050,R1,gassupply1,2026,3.55300000000
-3,2056,R1,gassupply1,2026,3.55300000000
-3,2057,R1,gassupply1,2026,3.55300000000
-3,2058,R1,gassupply1,2026,3.55300000000
-3,2059,R1,gassupply1,2026,3.55300000000
-3,2060,R1,gassupply1,2026,3.55300000000
-3,2061,R1,gassupply1,2026,3.55300000000
-3,2062,R1,gassupply1,2026,3.55300000000
-4,2030,R1,gassupply1,2028,3.53600000000
-4,2032,R1,gassupply1,2028,3.53600000000
-4,2034,R1,gassupply1,2028,3.53600000000
-4,2035,R1,gassupply1,2028,3.53600000000
-4,2036,R1,gassupply1,2028,3.53600000000
-4,2040,R1,gassupply1,2028,3.53600000000
-4,2045,R1,gassupply1,2028,3.53600000000
-4,2050,R1,gassupply1,2028,3.53600000000
-4,2056,R1,gassupply1,2028,3.53600000000
-4,2057,R1,gassupply1,2028,3.53600000000
-4,2058,R1,gassupply1,2028,3.53600000000
-4,2059,R1,gassupply1,2028,3.53600000000
-4,2060,R1,gassupply1,2028,3.53600000000
-4,2061,R1,gassupply1,2028,3.53600000000
-4,2062,R1,gassupply1,2028,3.53600000000
-4,2063,R1,gassupply1,2028,3.53600000000
-4,2064,R1,gassupply1,2028,3.53600000000
-5,2032,R1,gassupply1,2030,4.66260000000
-5,2034,R1,gassupply1,2030,4.66260000000
-5,2035,R1,gassupply1,2030,4.66260000000
-5,2036,R1,gassupply1,2030,4.66260000000
-5,2040,R1,gassupply1,2030,4.66260000000
-5,2045,R1,gassupply1,2030,4.66260000000
-5,2050,R1,gassupply1,2030,4.66260000000
-5,2056,R1,gassupply1,2030,4.66260000000
-5,2057,R1,gassupply1,2030,4.66260000000
-5,2058,R1,gassupply1,2030,4.66260000000
-5,2059,R1,gassupply1,2030,4.66260000000
-5,2060,R1,gassupply1,2030,4.66260000000
-5,2061,R1,gassupply1,2030,4.66260000000
-5,2062,R1,gassupply1,2030,4.66260000000
-5,2063,R1,gassupply1,2030,4.66260000000
-5,2064,R1,gassupply1,2030,4.66260000000
-5,2065,R1,gassupply1,2030,4.66260000000
-5,2066,R1,gassupply1,2030,4.66260000000
-6,2034,R1,gassupply1,2032,3.62850000000
-6,2035,R1,gassupply1,2032,3.62850000000
-6,2036,R1,gassupply1,2032,3.62850000000
-6,2040,R1,gassupply1,2032,3.62850000000
-6,2045,R1,gassupply1,2032,3.62850000000
-6,2050,R1,gassupply1,2032,3.62850000000
-6,2056,R1,gassupply1,2032,3.62850000000
-6,2057,R1,gassupply1,2032,3.62850000000
-6,2058,R1,gassupply1,2032,3.62850000000
-6,2059,R1,gassupply1,2032,3.62850000000
-6,2060,R1,gassupply1,2032,3.62850000000
-6,2061,R1,gassupply1,2032,3.62850000000
-6,2062,R1,gassupply1,2032,3.62850000000
-6,2063,R1,gassupply1,2032,3.62850000000
-6,2064,R1,gassupply1,2032,3.62850000000
-6,2065,R1,gassupply1,2032,3.62850000000
-6,2066,R1,gassupply1,2032,3.62850000000
-6,2067,R1,gassupply1,2032,3.62850000000
-6,2068,R1,gassupply1,2032,3.62850000000
-7,2036,R1,gassupply1,2034,1.50000000000
-7,2040,R1,gassupply1,2034,1.50000000000
-7,2045,R1,gassupply1,2034,1.50000000000
-7,2050,R1,gassupply1,2034,1.50000000000
-7,2056,R1,gassupply1,2034,1.50000000000
-7,2057,R1,gassupply1,2034,1.50000000000
-7,2058,R1,gassupply1,2034,1.50000000000
-7,2059,R1,gassupply1,2034,1.50000000000
-7,2060,R1,gassupply1,2034,1.50000000000
-7,2061,R1,gassupply1,2034,1.50000000000
-7,2062,R1,gassupply1,2034,1.50000000000
-7,2063,R1,gassupply1,2034,1.50000000000
-7,2064,R1,gassupply1,2034,1.50000000000
-7,2065,R1,gassupply1,2034,1.50000000000
-7,2066,R1,gassupply1,2034,1.50000000000
-7,2067,R1,gassupply1,2034,1.50000000000
-7,2068,R1,gassupply1,2034,1.50000000000
-7,2069,R1,gassupply1,2034,1.50000000000
-7,2070,R1,gassupply1,2034,1.50000000000
-8,2020,R2,gassupply1,2020,15.00000000000
-8,2022,R2,gassupply1,2020,15.34280000000
-8,2024,R2,gassupply1,2020,15.34280000000
-8,2025,R2,gassupply1,2020,15.34280000000
-8,2026,R2,gassupply1,2020,13.84280000000
-8,2028,R2,gassupply1,2020,10.84280000000
-8,2030,R2,gassupply1,2020,7.84280000000
-8,2032,R2,gassupply1,2020,4.84280000000
-8,2034,R2,gassupply1,2020,1.84280000000
-8,2035,R2,gassupply1,2020,0.34280000000
-8,2036,R2,gassupply1,2020,0.34280000000
-8,2040,R2,gassupply1,2020,0.34280000000
-8,2045,R2,gassupply1,2020,0.34280000000
-8,2050,R2,gassupply1,2020,0.34280000000
-8,2056,R2,gassupply1,2020,0.34280000000
-9,2024,R2,gassupply1,2022,0.60380000000
-9,2025,R2,gassupply1,2022,0.60380000000
-9,2026,R2,gassupply1,2022,0.60380000000
-9,2028,R2,gassupply1,2022,0.60380000000
-9,2030,R2,gassupply1,2022,0.60380000000
-9,2032,R2,gassupply1,2022,0.60380000000
-9,2034,R2,gassupply1,2022,0.60380000000
-9,2035,R2,gassupply1,2022,0.60380000000
-9,2036,R2,gassupply1,2022,0.60380000000
-9,2040,R2,gassupply1,2022,0.60380000000
-9,2045,R2,gassupply1,2022,0.60380000000
-9,2050,R2,gassupply1,2022,0.60380000000
-9,2056,R2,gassupply1,2022,0.60380000000
-9,2057,R2,gassupply1,2022,0.60380000000
-9,2058,R2,gassupply1,2022,0.60380000000
-10,2026,R2,gassupply1,2024,2.07490000000
-10,2028,R2,gassupply1,2024,2.07490000000
-10,2030,R2,gassupply1,2024,2.07490000000
-10,2032,R2,gassupply1,2024,2.07490000000
-10,2034,R2,gassupply1,2024,2.07490000000
-10,2035,R2,gassupply1,2024,2.07490000000
-10,2036,R2,gassupply1,2024,2.07490000000
-10,2040,R2,gassupply1,2024,2.07490000000
-10,2045,R2,gassupply1,2024,2.07490000000
-10,2050,R2,gassupply1,2024,2.07490000000
-10,2056,R2,gassupply1,2024,2.07490000000
-10,2057,R2,gassupply1,2024,2.07490000000
-10,2058,R2,gassupply1,2024,2.07490000000
-10,2059,R2,gassupply1,2024,2.07490000000
-10,2060,R2,gassupply1,2024,2.07490000000
-11,2028,R2,gassupply1,2026,3.55300000000
-11,2030,R2,gassupply1,2026,3.55300000000
-11,2032,R2,gassupply1,2026,3.55300000000
-11,2034,R2,gassupply1,2026,3.55300000000
-11,2035,R2,gassupply1,2026,3.55300000000
-11,2036,R2,gassupply1,2026,3.55300000000
-11,2040,R2,gassupply1,2026,3.55300000000
-11,2045,R2,gassupply1,2026,3.55300000000
-11,2050,R2,gassupply1,2026,3.55300000000
-11,2056,R2,gassupply1,2026,3.55300000000
-11,2057,R2,gassupply1,2026,3.55300000000
-11,2058,R2,gassupply1,2026,3.55300000000
-11,2059,R2,gassupply1,2026,3.55300000000
-11,2060,R2,gassupply1,2026,3.55300000000
-11,2061,R2,gassupply1,2026,3.55300000000
-11,2062,R2,gassupply1,2026,3.55300000000
-12,2030,R2,gassupply1,2028,3.53600000000
-12,2032,R2,gassupply1,2028,3.53600000000
-12,2034,R2,gassupply1,2028,3.53600000000
-12,2035,R2,gassupply1,2028,3.53600000000
-12,2036,R2,gassupply1,2028,3.53600000000
-12,2040,R2,gassupply1,2028,3.53600000000
-12,2045,R2,gassupply1,2028,3.53600000000
-12,2050,R2,gassupply1,2028,3.53600000000
-12,2056,R2,gassupply1,2028,3.53600000000
-12,2057,R2,gassupply1,2028,3.53600000000
-12,2058,R2,gassupply1,2028,3.53600000000
-12,2059,R2,gassupply1,2028,3.53600000000
-12,2060,R2,gassupply1,2028,3.53600000000
-12,2061,R2,gassupply1,2028,3.53600000000
-12,2062,R2,gassupply1,2028,3.53600000000
-12,2063,R2,gassupply1,2028,3.53600000000
-12,2064,R2,gassupply1,2028,3.53600000000
-13,2032,R2,gassupply1,2030,4.66260000000
-13,2034,R2,gassupply1,2030,4.66260000000
-13,2035,R2,gassupply1,2030,4.66260000000
-13,2036,R2,gassupply1,2030,4.66260000000
-13,2040,R2,gassupply1,2030,4.66260000000
-13,2045,R2,gassupply1,2030,4.66260000000
-13,2050,R2,gassupply1,2030,4.66260000000
-13,2056,R2,gassupply1,2030,4.66260000000
-13,2057,R2,gassupply1,2030,4.66260000000
-13,2058,R2,gassupply1,2030,4.66260000000
-13,2059,R2,gassupply1,2030,4.66260000000
-13,2060,R2,gassupply1,2030,4.66260000000
-13,2061,R2,gassupply1,2030,4.66260000000
-13,2062,R2,gassupply1,2030,4.66260000000
-13,2063,R2,gassupply1,2030,4.66260000000
-13,2064,R2,gassupply1,2030,4.66260000000
-13,2065,R2,gassupply1,2030,4.66260000000
-13,2066,R2,gassupply1,2030,4.66260000000
-14,2034,R2,gassupply1,2032,3.62850000000
-14,2035,R2,gassupply1,2032,3.62850000000
-14,2036,R2,gassupply1,2032,3.62850000000
-14,2040,R2,gassupply1,2032,3.62850000000
-14,2045,R2,gassupply1,2032,3.62850000000
-14,2050,R2,gassupply1,2032,3.62850000000
-14,2056,R2,gassupply1,2032,3.62850000000
-14,2057,R2,gassupply1,2032,3.62850000000
-14,2058,R2,gassupply1,2032,3.62850000000
-14,2059,R2,gassupply1,2032,3.62850000000
-14,2060,R2,gassupply1,2032,3.62850000000
-14,2061,R2,gassupply1,2032,3.62850000000
-14,2062,R2,gassupply1,2032,3.62850000000
-14,2063,R2,gassupply1,2032,3.62850000000
-14,2064,R2,gassupply1,2032,3.62850000000
-14,2065,R2,gassupply1,2032,3.62850000000
-14,2066,R2,gassupply1,2032,3.62850000000
-14,2067,R2,gassupply1,2032,3.62850000000
-14,2068,R2,gassupply1,2032,3.62850000000
-15,2036,R2,gassupply1,2034,1.50000000000
-15,2040,R2,gassupply1,2034,1.50000000000
-15,2045,R2,gassupply1,2034,1.50000000000
-15,2050,R2,gassupply1,2034,1.50000000000
-15,2056,R2,gassupply1,2034,1.50000000000
-15,2057,R2,gassupply1,2034,1.50000000000
-15,2058,R2,gassupply1,2034,1.50000000000
-15,2059,R2,gassupply1,2034,1.50000000000
-15,2060,R2,gassupply1,2034,1.50000000000
-15,2061,R2,gassupply1,2034,1.50000000000
-15,2062,R2,gassupply1,2034,1.50000000000
-15,2063,R2,gassupply1,2034,1.50000000000
-15,2064,R2,gassupply1,2034,1.50000000000
-15,2065,R2,gassupply1,2034,1.50000000000
-15,2066,R2,gassupply1,2034,1.50000000000
-15,2067,R2,gassupply1,2034,1.50000000000
-15,2068,R2,gassupply1,2034,1.50000000000
-15,2069,R2,gassupply1,2034,1.50000000000
-15,2070,R2,gassupply1,2034,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity.csv
new file mode 100644
index 000000000..fbce294fc
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity.csv
@@ -0,0 +1,150 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+3,1.00000000000,2020,R2,gasCCGT,2020
+0,3.00000000000,2020,R1,gasCCGT,2022
+2,0.27320000000,2020,R1,solarPV,2022
+3,4.00000000000,2020,R1,windturbine,2022
+4,3.00000000000,2020,R2,gasCCGT,2022
+6,4.27320000000,2020,R2,windturbine,2022
+0,3.00000000000,2020,R1,gasCCGT,2024
+1,1.85640000000,2022,R1,gasCCGT,2024
+3,0.27320000000,2020,R1,solarPV,2024
+4,4.00000000000,2020,R1,windturbine,2024
+5,3.00000000000,2020,R2,gasCCGT,2024
+6,1.85640000000,2022,R2,gasCCGT,2024
+8,4.27320000000,2020,R2,windturbine,2024
+0,2.80000000000,2020,R1,gasCCGT,2026
+1,1.85640000000,2022,R1,gasCCGT,2026
+2,2.07980000000,2024,R1,gasCCGT,2026
+4,0.27320000000,2020,R1,solarPV,2026
+5,4.00000000000,2020,R1,windturbine,2026
+6,2.80000000000,2020,R2,gasCCGT,2026
+7,1.85640000000,2022,R2,gasCCGT,2026
+8,2.07980000000,2024,R2,gasCCGT,2026
+10,4.27320000000,2020,R2,windturbine,2026
+0,2.40000000000,2020,R1,gasCCGT,2028
+1,1.85640000000,2022,R1,gasCCGT,2028
+2,2.07980000000,2024,R1,gasCCGT,2028
+3,2.29760000000,2026,R1,gasCCGT,2028
+5,0.27320000000,2020,R1,solarPV,2028
+6,4.00000000000,2020,R1,windturbine,2028
+7,2.40000000000,2020,R2,gasCCGT,2028
+8,1.85640000000,2022,R2,gasCCGT,2028
+9,2.07980000000,2024,R2,gasCCGT,2028
+10,2.29760000000,2026,R2,gasCCGT,2028
+12,4.27320000000,2020,R2,windturbine,2028
+0,2.00000000000,2020,R1,gasCCGT,2030
+1,1.85640000000,2022,R1,gasCCGT,2030
+2,2.07980000000,2024,R1,gasCCGT,2030
+3,2.29760000000,2026,R1,gasCCGT,2030
+4,2.31150000000,2028,R1,gasCCGT,2030
+6,0.27320000000,2020,R1,solarPV,2030
+7,4.00000000000,2020,R1,windturbine,2030
+8,2.00000000000,2020,R2,gasCCGT,2030
+9,1.85640000000,2022,R2,gasCCGT,2030
+10,2.07980000000,2024,R2,gasCCGT,2030
+11,2.29760000000,2026,R2,gasCCGT,2030
+12,2.31150000000,2028,R2,gasCCGT,2030
+14,4.27320000000,2020,R2,windturbine,2030
+0,2.00000000000,2020,R1,gasCCGT,2032
+1,1.85640000000,2022,R1,gasCCGT,2032
+2,2.07980000000,2024,R1,gasCCGT,2032
+3,2.29760000000,2026,R1,gasCCGT,2032
+4,2.31150000000,2028,R1,gasCCGT,2032
+5,0.99560000000,2030,R1,gasCCGT,2032
+7,0.27320000000,2020,R1,solarPV,2032
+9,4.00000000000,2020,R1,windturbine,2032
+10,2.00000000000,2020,R2,gasCCGT,2032
+11,1.85640000000,2022,R2,gasCCGT,2032
+12,2.07980000000,2024,R2,gasCCGT,2032
+13,2.29760000000,2026,R2,gasCCGT,2032
+14,2.31150000000,2028,R2,gasCCGT,2032
+15,0.99560000000,2030,R2,gasCCGT,2032
+17,4.27320000000,2020,R2,windturbine,2032
+0,2.00000000000,2020,R1,gasCCGT,2034
+1,1.85640000000,2022,R1,gasCCGT,2034
+2,2.07980000000,2024,R1,gasCCGT,2034
+3,2.29760000000,2026,R1,gasCCGT,2034
+4,2.31150000000,2028,R1,gasCCGT,2034
+5,0.99560000000,2030,R1,gasCCGT,2034
+6,0.75270000000,2032,R1,gasCCGT,2034
+7,0.27320000000,2020,R1,solarPV,2034
+8,0.54630000000,2032,R1,solarPV,2034
+10,4.00000000000,2020,R1,windturbine,2034
+12,2.00000000000,2020,R2,gasCCGT,2034
+13,1.85640000000,2022,R2,gasCCGT,2034
+14,2.07980000000,2024,R2,gasCCGT,2034
+15,2.29760000000,2026,R2,gasCCGT,2034
+16,2.31150000000,2028,R2,gasCCGT,2034
+17,0.99560000000,2030,R2,gasCCGT,2034
+18,2.24000000000,2032,R2,solarPV,2034
+20,4.27320000000,2020,R2,windturbine,2034
+0,2.00000000000,2020,R1,gasCCGT,2036
+1,1.85640000000,2022,R1,gasCCGT,2036
+2,2.07980000000,2024,R1,gasCCGT,2036
+3,2.29760000000,2026,R1,gasCCGT,2036
+4,2.31150000000,2028,R1,gasCCGT,2036
+5,0.99560000000,2030,R1,gasCCGT,2036
+6,0.75270000000,2032,R1,gasCCGT,2036
+7,0.27320000000,2020,R1,solarPV,2036
+8,0.54630000000,2032,R1,solarPV,2036
+9,1.63890000000,2034,R1,solarPV,2036
+11,4.00000000000,2020,R1,windturbine,2036
+12,0.60110000000,2034,R1,windturbine,2036
+13,2.00000000000,2020,R2,gasCCGT,2036
+14,1.85640000000,2022,R2,gasCCGT,2036
+15,2.07980000000,2024,R2,gasCCGT,2036
+16,2.29760000000,2026,R2,gasCCGT,2036
+17,2.31150000000,2028,R2,gasCCGT,2036
+18,0.99560000000,2030,R2,gasCCGT,2036
+19,2.24000000000,2032,R2,solarPV,2036
+20,2.24000000000,2034,R2,solarPV,2036
+22,4.27320000000,2020,R2,windturbine,2036
+0,2.00000000000,2020,R1,gasCCGT,2038
+1,1.85640000000,2022,R1,gasCCGT,2038
+2,2.07980000000,2024,R1,gasCCGT,2038
+3,2.29760000000,2026,R1,gasCCGT,2038
+4,2.31150000000,2028,R1,gasCCGT,2038
+5,0.99560000000,2030,R1,gasCCGT,2038
+6,0.75270000000,2032,R1,gasCCGT,2038
+7,0.27320000000,2020,R1,solarPV,2038
+8,0.54630000000,2032,R1,solarPV,2038
+9,1.63890000000,2034,R1,solarPV,2038
+10,2.24000000000,2036,R1,solarPV,2038
+12,4.00000000000,2020,R1,windturbine,2038
+13,0.60110000000,2034,R1,windturbine,2038
+14,2.00000000000,2020,R2,gasCCGT,2038
+15,1.85640000000,2022,R2,gasCCGT,2038
+16,2.07980000000,2024,R2,gasCCGT,2038
+17,2.29760000000,2026,R2,gasCCGT,2038
+18,2.31150000000,2028,R2,gasCCGT,2038
+19,0.99560000000,2030,R2,gasCCGT,2038
+20,2.24000000000,2032,R2,solarPV,2038
+21,2.24000000000,2034,R2,solarPV,2038
+22,2.24000000000,2036,R2,solarPV,2038
+24,4.27320000000,2020,R2,windturbine,2038
+0,2.00000000000,2020,R1,gasCCGT,2040
+1,1.85640000000,2022,R1,gasCCGT,2040
+2,2.07980000000,2024,R1,gasCCGT,2040
+3,2.29760000000,2026,R1,gasCCGT,2040
+4,2.31150000000,2028,R1,gasCCGT,2040
+5,0.99560000000,2030,R1,gasCCGT,2040
+6,0.75270000000,2032,R1,gasCCGT,2040
+7,0.27320000000,2020,R1,solarPV,2040
+8,0.54630000000,2032,R1,solarPV,2040
+9,1.63890000000,2034,R1,solarPV,2040
+10,2.24000000000,2036,R1,solarPV,2040
+11,2.24000000000,2038,R1,solarPV,2040
+13,4.00000000000,2020,R1,windturbine,2040
+14,0.60110000000,2034,R1,windturbine,2040
+15,2.00000000000,2020,R2,gasCCGT,2040
+16,1.85640000000,2022,R2,gasCCGT,2040
+17,2.07980000000,2024,R2,gasCCGT,2040
+18,2.29760000000,2026,R2,gasCCGT,2040
+19,2.31150000000,2028,R2,gasCCGT,2040
+20,0.99560000000,2030,R2,gasCCGT,2040
+21,2.24000000000,2032,R2,solarPV,2040
+22,2.24000000000,2034,R2,solarPV,2040
+23,2.24000000000,2036,R2,solarPV,2040
+24,2.24000000000,2038,R2,solarPV,2040
+26,4.27320000000,2020,R2,windturbine,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 8c8851c4c..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2022,R1,solarPV,2020,0.27320000000
-1,2025,R1,solarPV,2020,0.27320000000
-1,2030,R1,solarPV,2020,0.27320000000
-1,2035,R1,solarPV,2020,0.27320000000
-1,2040,R1,solarPV,2020,0.27320000000
-1,2045,R1,solarPV,2020,0.27320000000
-1,2046,R1,solarPV,2020,0.27320000000
-2,2022,R1,windturbine,2020,4.00000000000
-2,2025,R1,windturbine,2020,4.00000000000
-2,2030,R1,windturbine,2020,4.00000000000
-2,2035,R1,windturbine,2020,4.00000000000
-2,2040,R1,windturbine,2020,4.00000000000
-2,2045,R1,windturbine,2020,4.00000000000
-2,2046,R1,windturbine,2020,4.00000000000
-3,2020,R2,gasCCGT,2020,1.00000000000
-3,2022,R2,gasCCGT,2020,3.00000000000
-3,2025,R2,gasCCGT,2020,3.00000000000
-3,2030,R2,gasCCGT,2020,2.00000000000
-3,2035,R2,gasCCGT,2020,2.00000000000
-3,2040,R2,gasCCGT,2020,2.00000000000
-3,2045,R2,gasCCGT,2020,2.00000000000
-3,2046,R2,gasCCGT,2020,2.00000000000
-3,2047,R2,gasCCGT,2020,2.00000000000
-3,2050,R2,gasCCGT,2020,2.00000000000
-3,2056,R2,gasCCGT,2020,2.00000000000
-4,2022,R2,windturbine,2020,4.27320000000
-4,2025,R2,windturbine,2020,4.27320000000
-4,2030,R2,windturbine,2020,4.27320000000
-4,2035,R2,windturbine,2020,4.27320000000
-4,2040,R2,windturbine,2020,4.27320000000
-4,2045,R2,windturbine,2020,4.27320000000
-4,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
deleted file mode 100644
index b46df9029..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2022,R1,solarPV,2020,0.27320000000
-2,2024,R1,solarPV,2020,0.27320000000
-2,2025,R1,solarPV,2020,0.27320000000
-2,2030,R1,solarPV,2020,0.27320000000
-2,2035,R1,solarPV,2020,0.27320000000
-2,2040,R1,solarPV,2020,0.27320000000
-2,2045,R1,solarPV,2020,0.27320000000
-2,2046,R1,solarPV,2020,0.27320000000
-3,2022,R1,windturbine,2020,4.00000000000
-3,2024,R1,windturbine,2020,4.00000000000
-3,2025,R1,windturbine,2020,4.00000000000
-3,2030,R1,windturbine,2020,4.00000000000
-3,2035,R1,windturbine,2020,4.00000000000
-3,2040,R1,windturbine,2020,4.00000000000
-3,2045,R1,windturbine,2020,4.00000000000
-3,2046,R1,windturbine,2020,4.00000000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2022,R2,gasCCGT,2020,3.00000000000
-4,2024,R2,gasCCGT,2020,3.00000000000
-4,2025,R2,gasCCGT,2020,3.00000000000
-4,2030,R2,gasCCGT,2020,2.00000000000
-4,2035,R2,gasCCGT,2020,2.00000000000
-4,2040,R2,gasCCGT,2020,2.00000000000
-4,2045,R2,gasCCGT,2020,2.00000000000
-4,2046,R2,gasCCGT,2020,2.00000000000
-4,2047,R2,gasCCGT,2020,2.00000000000
-4,2050,R2,gasCCGT,2020,2.00000000000
-4,2056,R2,gasCCGT,2020,2.00000000000
-5,2024,R2,gasCCGT,2022,1.85640000000
-5,2025,R2,gasCCGT,2022,1.85640000000
-5,2030,R2,gasCCGT,2022,1.85640000000
-5,2035,R2,gasCCGT,2022,1.85640000000
-5,2040,R2,gasCCGT,2022,1.85640000000
-5,2045,R2,gasCCGT,2022,1.85640000000
-5,2046,R2,gasCCGT,2022,1.85640000000
-5,2047,R2,gasCCGT,2022,1.85640000000
-5,2050,R2,gasCCGT,2022,1.85640000000
-5,2056,R2,gasCCGT,2022,1.85640000000
-5,2057,R2,gasCCGT,2022,1.85640000000
-5,2058,R2,gasCCGT,2022,1.85640000000
-6,2022,R2,windturbine,2020,4.27320000000
-6,2024,R2,windturbine,2020,4.27320000000
-6,2025,R2,windturbine,2020,4.27320000000
-6,2030,R2,windturbine,2020,4.27320000000
-6,2035,R2,windturbine,2020,4.27320000000
-6,2040,R2,windturbine,2020,4.27320000000
-6,2045,R2,windturbine,2020,4.27320000000
-6,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
deleted file mode 100644
index 87e3adb13..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ /dev/null
@@ -1,106 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2022,R1,solarPV,2020,0.27320000000
-3,2024,R1,solarPV,2020,0.27320000000
-3,2025,R1,solarPV,2020,0.27320000000
-3,2026,R1,solarPV,2020,0.27320000000
-3,2030,R1,solarPV,2020,0.27320000000
-3,2035,R1,solarPV,2020,0.27320000000
-3,2040,R1,solarPV,2020,0.27320000000
-3,2045,R1,solarPV,2020,0.27320000000
-3,2046,R1,solarPV,2020,0.27320000000
-4,2022,R1,windturbine,2020,4.00000000000
-4,2024,R1,windturbine,2020,4.00000000000
-4,2025,R1,windturbine,2020,4.00000000000
-4,2026,R1,windturbine,2020,4.00000000000
-4,2030,R1,windturbine,2020,4.00000000000
-4,2035,R1,windturbine,2020,4.00000000000
-4,2040,R1,windturbine,2020,4.00000000000
-4,2045,R1,windturbine,2020,4.00000000000
-4,2046,R1,windturbine,2020,4.00000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2022,R2,gasCCGT,2020,3.00000000000
-5,2024,R2,gasCCGT,2020,3.00000000000
-5,2025,R2,gasCCGT,2020,3.00000000000
-5,2026,R2,gasCCGT,2020,2.80000000000
-5,2030,R2,gasCCGT,2020,2.00000000000
-5,2035,R2,gasCCGT,2020,2.00000000000
-5,2040,R2,gasCCGT,2020,2.00000000000
-5,2045,R2,gasCCGT,2020,2.00000000000
-5,2046,R2,gasCCGT,2020,2.00000000000
-5,2047,R2,gasCCGT,2020,2.00000000000
-5,2050,R2,gasCCGT,2020,2.00000000000
-5,2056,R2,gasCCGT,2020,2.00000000000
-6,2024,R2,gasCCGT,2022,1.85640000000
-6,2025,R2,gasCCGT,2022,1.85640000000
-6,2026,R2,gasCCGT,2022,1.85640000000
-6,2030,R2,gasCCGT,2022,1.85640000000
-6,2035,R2,gasCCGT,2022,1.85640000000
-6,2040,R2,gasCCGT,2022,1.85640000000
-6,2045,R2,gasCCGT,2022,1.85640000000
-6,2046,R2,gasCCGT,2022,1.85640000000
-6,2047,R2,gasCCGT,2022,1.85640000000
-6,2050,R2,gasCCGT,2022,1.85640000000
-6,2056,R2,gasCCGT,2022,1.85640000000
-6,2057,R2,gasCCGT,2022,1.85640000000
-6,2058,R2,gasCCGT,2022,1.85640000000
-7,2026,R2,gasCCGT,2024,2.07980000000
-7,2030,R2,gasCCGT,2024,2.07980000000
-7,2035,R2,gasCCGT,2024,2.07980000000
-7,2040,R2,gasCCGT,2024,2.07980000000
-7,2045,R2,gasCCGT,2024,2.07980000000
-7,2046,R2,gasCCGT,2024,2.07980000000
-7,2047,R2,gasCCGT,2024,2.07980000000
-7,2050,R2,gasCCGT,2024,2.07980000000
-7,2056,R2,gasCCGT,2024,2.07980000000
-7,2057,R2,gasCCGT,2024,2.07980000000
-7,2058,R2,gasCCGT,2024,2.07980000000
-7,2059,R2,gasCCGT,2024,2.07980000000
-7,2060,R2,gasCCGT,2024,2.07980000000
-8,2022,R2,windturbine,2020,4.27320000000
-8,2024,R2,windturbine,2020,4.27320000000
-8,2025,R2,windturbine,2020,4.27320000000
-8,2026,R2,windturbine,2020,4.27320000000
-8,2030,R2,windturbine,2020,4.27320000000
-8,2035,R2,windturbine,2020,4.27320000000
-8,2040,R2,windturbine,2020,4.27320000000
-8,2045,R2,windturbine,2020,4.27320000000
-8,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
deleted file mode 100644
index 3670ced14..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
+++ /dev/null
@@ -1,145 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2022,R1,solarPV,2020,0.27320000000
-4,2024,R1,solarPV,2020,0.27320000000
-4,2025,R1,solarPV,2020,0.27320000000
-4,2026,R1,solarPV,2020,0.27320000000
-4,2028,R1,solarPV,2020,0.27320000000
-4,2030,R1,solarPV,2020,0.27320000000
-4,2035,R1,solarPV,2020,0.27320000000
-4,2040,R1,solarPV,2020,0.27320000000
-4,2045,R1,solarPV,2020,0.27320000000
-4,2046,R1,solarPV,2020,0.27320000000
-5,2022,R1,windturbine,2020,4.00000000000
-5,2024,R1,windturbine,2020,4.00000000000
-5,2025,R1,windturbine,2020,4.00000000000
-5,2026,R1,windturbine,2020,4.00000000000
-5,2028,R1,windturbine,2020,4.00000000000
-5,2030,R1,windturbine,2020,4.00000000000
-5,2035,R1,windturbine,2020,4.00000000000
-5,2040,R1,windturbine,2020,4.00000000000
-5,2045,R1,windturbine,2020,4.00000000000
-5,2046,R1,windturbine,2020,4.00000000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2022,R2,gasCCGT,2020,3.00000000000
-6,2024,R2,gasCCGT,2020,3.00000000000
-6,2025,R2,gasCCGT,2020,3.00000000000
-6,2026,R2,gasCCGT,2020,2.80000000000
-6,2028,R2,gasCCGT,2020,2.40000000000
-6,2030,R2,gasCCGT,2020,2.00000000000
-6,2035,R2,gasCCGT,2020,2.00000000000
-6,2040,R2,gasCCGT,2020,2.00000000000
-6,2045,R2,gasCCGT,2020,2.00000000000
-6,2046,R2,gasCCGT,2020,2.00000000000
-6,2047,R2,gasCCGT,2020,2.00000000000
-6,2050,R2,gasCCGT,2020,2.00000000000
-6,2056,R2,gasCCGT,2020,2.00000000000
-7,2024,R2,gasCCGT,2022,1.85640000000
-7,2025,R2,gasCCGT,2022,1.85640000000
-7,2026,R2,gasCCGT,2022,1.85640000000
-7,2028,R2,gasCCGT,2022,1.85640000000
-7,2030,R2,gasCCGT,2022,1.85640000000
-7,2035,R2,gasCCGT,2022,1.85640000000
-7,2040,R2,gasCCGT,2022,1.85640000000
-7,2045,R2,gasCCGT,2022,1.85640000000
-7,2046,R2,gasCCGT,2022,1.85640000000
-7,2047,R2,gasCCGT,2022,1.85640000000
-7,2050,R2,gasCCGT,2022,1.85640000000
-7,2056,R2,gasCCGT,2022,1.85640000000
-7,2057,R2,gasCCGT,2022,1.85640000000
-7,2058,R2,gasCCGT,2022,1.85640000000
-8,2026,R2,gasCCGT,2024,2.07980000000
-8,2028,R2,gasCCGT,2024,2.07980000000
-8,2030,R2,gasCCGT,2024,2.07980000000
-8,2035,R2,gasCCGT,2024,2.07980000000
-8,2040,R2,gasCCGT,2024,2.07980000000
-8,2045,R2,gasCCGT,2024,2.07980000000
-8,2046,R2,gasCCGT,2024,2.07980000000
-8,2047,R2,gasCCGT,2024,2.07980000000
-8,2050,R2,gasCCGT,2024,2.07980000000
-8,2056,R2,gasCCGT,2024,2.07980000000
-8,2057,R2,gasCCGT,2024,2.07980000000
-8,2058,R2,gasCCGT,2024,2.07980000000
-8,2059,R2,gasCCGT,2024,2.07980000000
-8,2060,R2,gasCCGT,2024,2.07980000000
-9,2028,R2,gasCCGT,2026,2.29760000000
-9,2030,R2,gasCCGT,2026,2.29760000000
-9,2035,R2,gasCCGT,2026,2.29760000000
-9,2040,R2,gasCCGT,2026,2.29760000000
-9,2045,R2,gasCCGT,2026,2.29760000000
-9,2046,R2,gasCCGT,2026,2.29760000000
-9,2047,R2,gasCCGT,2026,2.29760000000
-9,2050,R2,gasCCGT,2026,2.29760000000
-9,2056,R2,gasCCGT,2026,2.29760000000
-9,2057,R2,gasCCGT,2026,2.29760000000
-9,2058,R2,gasCCGT,2026,2.29760000000
-9,2059,R2,gasCCGT,2026,2.29760000000
-9,2060,R2,gasCCGT,2026,2.29760000000
-9,2061,R2,gasCCGT,2026,2.29760000000
-9,2062,R2,gasCCGT,2026,2.29760000000
-10,2022,R2,windturbine,2020,4.27320000000
-10,2024,R2,windturbine,2020,4.27320000000
-10,2025,R2,windturbine,2020,4.27320000000
-10,2026,R2,windturbine,2020,4.27320000000
-10,2028,R2,windturbine,2020,4.27320000000
-10,2030,R2,windturbine,2020,4.27320000000
-10,2035,R2,windturbine,2020,4.27320000000
-10,2040,R2,windturbine,2020,4.27320000000
-10,2045,R2,windturbine,2020,4.27320000000
-10,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
deleted file mode 100644
index 08327c28b..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
+++ /dev/null
@@ -1,177 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2022,R1,solarPV,2020,0.27320000000
-5,2024,R1,solarPV,2020,0.27320000000
-5,2025,R1,solarPV,2020,0.27320000000
-5,2026,R1,solarPV,2020,0.27320000000
-5,2028,R1,solarPV,2020,0.27320000000
-5,2030,R1,solarPV,2020,0.27320000000
-5,2035,R1,solarPV,2020,0.27320000000
-5,2040,R1,solarPV,2020,0.27320000000
-5,2045,R1,solarPV,2020,0.27320000000
-5,2046,R1,solarPV,2020,0.27320000000
-6,2022,R1,windturbine,2020,4.00000000000
-6,2024,R1,windturbine,2020,4.00000000000
-6,2025,R1,windturbine,2020,4.00000000000
-6,2026,R1,windturbine,2020,4.00000000000
-6,2028,R1,windturbine,2020,4.00000000000
-6,2030,R1,windturbine,2020,4.00000000000
-6,2035,R1,windturbine,2020,4.00000000000
-6,2040,R1,windturbine,2020,4.00000000000
-6,2045,R1,windturbine,2020,4.00000000000
-6,2046,R1,windturbine,2020,4.00000000000
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2022,R2,gasCCGT,2020,3.00000000000
-7,2024,R2,gasCCGT,2020,3.00000000000
-7,2025,R2,gasCCGT,2020,3.00000000000
-7,2026,R2,gasCCGT,2020,2.80000000000
-7,2028,R2,gasCCGT,2020,2.40000000000
-7,2030,R2,gasCCGT,2020,2.00000000000
-7,2035,R2,gasCCGT,2020,2.00000000000
-7,2040,R2,gasCCGT,2020,2.00000000000
-7,2045,R2,gasCCGT,2020,2.00000000000
-7,2046,R2,gasCCGT,2020,2.00000000000
-7,2047,R2,gasCCGT,2020,2.00000000000
-7,2050,R2,gasCCGT,2020,2.00000000000
-7,2056,R2,gasCCGT,2020,2.00000000000
-8,2024,R2,gasCCGT,2022,1.85640000000
-8,2025,R2,gasCCGT,2022,1.85640000000
-8,2026,R2,gasCCGT,2022,1.85640000000
-8,2028,R2,gasCCGT,2022,1.85640000000
-8,2030,R2,gasCCGT,2022,1.85640000000
-8,2035,R2,gasCCGT,2022,1.85640000000
-8,2040,R2,gasCCGT,2022,1.85640000000
-8,2045,R2,gasCCGT,2022,1.85640000000
-8,2046,R2,gasCCGT,2022,1.85640000000
-8,2047,R2,gasCCGT,2022,1.85640000000
-8,2050,R2,gasCCGT,2022,1.85640000000
-8,2056,R2,gasCCGT,2022,1.85640000000
-8,2057,R2,gasCCGT,2022,1.85640000000
-8,2058,R2,gasCCGT,2022,1.85640000000
-9,2026,R2,gasCCGT,2024,2.07980000000
-9,2028,R2,gasCCGT,2024,2.07980000000
-9,2030,R2,gasCCGT,2024,2.07980000000
-9,2035,R2,gasCCGT,2024,2.07980000000
-9,2040,R2,gasCCGT,2024,2.07980000000
-9,2045,R2,gasCCGT,2024,2.07980000000
-9,2046,R2,gasCCGT,2024,2.07980000000
-9,2047,R2,gasCCGT,2024,2.07980000000
-9,2050,R2,gasCCGT,2024,2.07980000000
-9,2056,R2,gasCCGT,2024,2.07980000000
-9,2057,R2,gasCCGT,2024,2.07980000000
-9,2058,R2,gasCCGT,2024,2.07980000000
-9,2059,R2,gasCCGT,2024,2.07980000000
-9,2060,R2,gasCCGT,2024,2.07980000000
-10,2028,R2,gasCCGT,2026,2.29760000000
-10,2030,R2,gasCCGT,2026,2.29760000000
-10,2035,R2,gasCCGT,2026,2.29760000000
-10,2040,R2,gasCCGT,2026,2.29760000000
-10,2045,R2,gasCCGT,2026,2.29760000000
-10,2046,R2,gasCCGT,2026,2.29760000000
-10,2047,R2,gasCCGT,2026,2.29760000000
-10,2050,R2,gasCCGT,2026,2.29760000000
-10,2056,R2,gasCCGT,2026,2.29760000000
-10,2057,R2,gasCCGT,2026,2.29760000000
-10,2058,R2,gasCCGT,2026,2.29760000000
-10,2059,R2,gasCCGT,2026,2.29760000000
-10,2060,R2,gasCCGT,2026,2.29760000000
-10,2061,R2,gasCCGT,2026,2.29760000000
-10,2062,R2,gasCCGT,2026,2.29760000000
-11,2030,R2,gasCCGT,2028,2.31150000000
-11,2035,R2,gasCCGT,2028,2.31150000000
-11,2040,R2,gasCCGT,2028,2.31150000000
-11,2045,R2,gasCCGT,2028,2.31150000000
-11,2046,R2,gasCCGT,2028,2.31150000000
-11,2047,R2,gasCCGT,2028,2.31150000000
-11,2050,R2,gasCCGT,2028,2.31150000000
-11,2056,R2,gasCCGT,2028,2.31150000000
-11,2057,R2,gasCCGT,2028,2.31150000000
-11,2058,R2,gasCCGT,2028,2.31150000000
-11,2059,R2,gasCCGT,2028,2.31150000000
-11,2060,R2,gasCCGT,2028,2.31150000000
-11,2061,R2,gasCCGT,2028,2.31150000000
-11,2062,R2,gasCCGT,2028,2.31150000000
-11,2063,R2,gasCCGT,2028,2.31150000000
-11,2064,R2,gasCCGT,2028,2.31150000000
-12,2022,R2,windturbine,2020,4.27320000000
-12,2024,R2,windturbine,2020,4.27320000000
-12,2025,R2,windturbine,2020,4.27320000000
-12,2026,R2,windturbine,2020,4.27320000000
-12,2028,R2,windturbine,2020,4.27320000000
-12,2030,R2,windturbine,2020,4.27320000000
-12,2035,R2,windturbine,2020,4.27320000000
-12,2040,R2,windturbine,2020,4.27320000000
-12,2045,R2,windturbine,2020,4.27320000000
-12,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 4c131c372..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,226 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2032,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2032,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2032,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2032,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2032,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2032,R1,gasCCGT,2030,0.99560000000
-5,2035,R1,gasCCGT,2030,0.99560000000
-5,2040,R1,gasCCGT,2030,0.99560000000
-5,2045,R1,gasCCGT,2030,0.99560000000
-5,2046,R1,gasCCGT,2030,0.99560000000
-5,2047,R1,gasCCGT,2030,0.99560000000
-5,2050,R1,gasCCGT,2030,0.99560000000
-5,2056,R1,gasCCGT,2030,0.99560000000
-5,2057,R1,gasCCGT,2030,0.99560000000
-5,2058,R1,gasCCGT,2030,0.99560000000
-5,2059,R1,gasCCGT,2030,0.99560000000
-5,2060,R1,gasCCGT,2030,0.99560000000
-5,2061,R1,gasCCGT,2030,0.99560000000
-5,2062,R1,gasCCGT,2030,0.99560000000
-5,2063,R1,gasCCGT,2030,0.99560000000
-5,2064,R1,gasCCGT,2030,0.99560000000
-5,2065,R1,gasCCGT,2030,0.99560000000
-5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,0.27320000000
-6,2024,R1,solarPV,2020,0.27320000000
-6,2025,R1,solarPV,2020,0.27320000000
-6,2026,R1,solarPV,2020,0.27320000000
-6,2028,R1,solarPV,2020,0.27320000000
-6,2030,R1,solarPV,2020,0.27320000000
-6,2032,R1,solarPV,2020,0.27320000000
-6,2035,R1,solarPV,2020,0.27320000000
-6,2040,R1,solarPV,2020,0.27320000000
-6,2045,R1,solarPV,2020,0.27320000000
-6,2046,R1,solarPV,2020,0.27320000000
-7,2022,R1,windturbine,2020,4.00000000000
-7,2024,R1,windturbine,2020,4.00000000000
-7,2025,R1,windturbine,2020,4.00000000000
-7,2026,R1,windturbine,2020,4.00000000000
-7,2028,R1,windturbine,2020,4.00000000000
-7,2030,R1,windturbine,2020,4.00000000000
-7,2032,R1,windturbine,2020,4.00000000000
-7,2035,R1,windturbine,2020,4.00000000000
-7,2040,R1,windturbine,2020,4.00000000000
-7,2045,R1,windturbine,2020,4.00000000000
-7,2046,R1,windturbine,2020,4.00000000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2022,R2,gasCCGT,2020,3.00000000000
-8,2024,R2,gasCCGT,2020,3.00000000000
-8,2025,R2,gasCCGT,2020,3.00000000000
-8,2026,R2,gasCCGT,2020,2.80000000000
-8,2028,R2,gasCCGT,2020,2.40000000000
-8,2030,R2,gasCCGT,2020,2.00000000000
-8,2032,R2,gasCCGT,2020,2.00000000000
-8,2035,R2,gasCCGT,2020,2.00000000000
-8,2040,R2,gasCCGT,2020,2.00000000000
-8,2045,R2,gasCCGT,2020,2.00000000000
-8,2046,R2,gasCCGT,2020,2.00000000000
-8,2047,R2,gasCCGT,2020,2.00000000000
-8,2050,R2,gasCCGT,2020,2.00000000000
-8,2056,R2,gasCCGT,2020,2.00000000000
-9,2024,R2,gasCCGT,2022,1.85640000000
-9,2025,R2,gasCCGT,2022,1.85640000000
-9,2026,R2,gasCCGT,2022,1.85640000000
-9,2028,R2,gasCCGT,2022,1.85640000000
-9,2030,R2,gasCCGT,2022,1.85640000000
-9,2032,R2,gasCCGT,2022,1.85640000000
-9,2035,R2,gasCCGT,2022,1.85640000000
-9,2040,R2,gasCCGT,2022,1.85640000000
-9,2045,R2,gasCCGT,2022,1.85640000000
-9,2046,R2,gasCCGT,2022,1.85640000000
-9,2047,R2,gasCCGT,2022,1.85640000000
-9,2050,R2,gasCCGT,2022,1.85640000000
-9,2056,R2,gasCCGT,2022,1.85640000000
-9,2057,R2,gasCCGT,2022,1.85640000000
-9,2058,R2,gasCCGT,2022,1.85640000000
-10,2026,R2,gasCCGT,2024,2.07980000000
-10,2028,R2,gasCCGT,2024,2.07980000000
-10,2030,R2,gasCCGT,2024,2.07980000000
-10,2032,R2,gasCCGT,2024,2.07980000000
-10,2035,R2,gasCCGT,2024,2.07980000000
-10,2040,R2,gasCCGT,2024,2.07980000000
-10,2045,R2,gasCCGT,2024,2.07980000000
-10,2046,R2,gasCCGT,2024,2.07980000000
-10,2047,R2,gasCCGT,2024,2.07980000000
-10,2050,R2,gasCCGT,2024,2.07980000000
-10,2056,R2,gasCCGT,2024,2.07980000000
-10,2057,R2,gasCCGT,2024,2.07980000000
-10,2058,R2,gasCCGT,2024,2.07980000000
-10,2059,R2,gasCCGT,2024,2.07980000000
-10,2060,R2,gasCCGT,2024,2.07980000000
-11,2028,R2,gasCCGT,2026,2.29760000000
-11,2030,R2,gasCCGT,2026,2.29760000000
-11,2032,R2,gasCCGT,2026,2.29760000000
-11,2035,R2,gasCCGT,2026,2.29760000000
-11,2040,R2,gasCCGT,2026,2.29760000000
-11,2045,R2,gasCCGT,2026,2.29760000000
-11,2046,R2,gasCCGT,2026,2.29760000000
-11,2047,R2,gasCCGT,2026,2.29760000000
-11,2050,R2,gasCCGT,2026,2.29760000000
-11,2056,R2,gasCCGT,2026,2.29760000000
-11,2057,R2,gasCCGT,2026,2.29760000000
-11,2058,R2,gasCCGT,2026,2.29760000000
-11,2059,R2,gasCCGT,2026,2.29760000000
-11,2060,R2,gasCCGT,2026,2.29760000000
-11,2061,R2,gasCCGT,2026,2.29760000000
-11,2062,R2,gasCCGT,2026,2.29760000000
-12,2030,R2,gasCCGT,2028,2.31150000000
-12,2032,R2,gasCCGT,2028,2.31150000000
-12,2035,R2,gasCCGT,2028,2.31150000000
-12,2040,R2,gasCCGT,2028,2.31150000000
-12,2045,R2,gasCCGT,2028,2.31150000000
-12,2046,R2,gasCCGT,2028,2.31150000000
-12,2047,R2,gasCCGT,2028,2.31150000000
-12,2050,R2,gasCCGT,2028,2.31150000000
-12,2056,R2,gasCCGT,2028,2.31150000000
-12,2057,R2,gasCCGT,2028,2.31150000000
-12,2058,R2,gasCCGT,2028,2.31150000000
-12,2059,R2,gasCCGT,2028,2.31150000000
-12,2060,R2,gasCCGT,2028,2.31150000000
-12,2061,R2,gasCCGT,2028,2.31150000000
-12,2062,R2,gasCCGT,2028,2.31150000000
-12,2063,R2,gasCCGT,2028,2.31150000000
-12,2064,R2,gasCCGT,2028,2.31150000000
-13,2032,R2,gasCCGT,2030,0.99560000000
-13,2035,R2,gasCCGT,2030,0.99560000000
-13,2040,R2,gasCCGT,2030,0.99560000000
-13,2045,R2,gasCCGT,2030,0.99560000000
-13,2046,R2,gasCCGT,2030,0.99560000000
-13,2047,R2,gasCCGT,2030,0.99560000000
-13,2050,R2,gasCCGT,2030,0.99560000000
-13,2056,R2,gasCCGT,2030,0.99560000000
-13,2057,R2,gasCCGT,2030,0.99560000000
-13,2058,R2,gasCCGT,2030,0.99560000000
-13,2059,R2,gasCCGT,2030,0.99560000000
-13,2060,R2,gasCCGT,2030,0.99560000000
-13,2061,R2,gasCCGT,2030,0.99560000000
-13,2062,R2,gasCCGT,2030,0.99560000000
-13,2063,R2,gasCCGT,2030,0.99560000000
-13,2064,R2,gasCCGT,2030,0.99560000000
-13,2065,R2,gasCCGT,2030,0.99560000000
-13,2066,R2,gasCCGT,2030,0.99560000000
-14,2022,R2,windturbine,2020,4.27320000000
-14,2024,R2,windturbine,2020,4.27320000000
-14,2025,R2,windturbine,2020,4.27320000000
-14,2026,R2,windturbine,2020,4.27320000000
-14,2028,R2,windturbine,2020,4.27320000000
-14,2030,R2,windturbine,2020,4.27320000000
-14,2032,R2,windturbine,2020,4.27320000000
-14,2035,R2,windturbine,2020,4.27320000000
-14,2040,R2,windturbine,2020,4.27320000000
-14,2045,R2,windturbine,2020,4.27320000000
-14,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
deleted file mode 100644
index 69f30791d..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
+++ /dev/null
@@ -1,281 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2032,R1,gasCCGT,2020,2.00000000000
-0,2034,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2032,R1,gasCCGT,2022,1.85640000000
-1,2034,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2032,R1,gasCCGT,2024,2.07980000000
-2,2034,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2032,R1,gasCCGT,2026,2.29760000000
-3,2034,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2032,R1,gasCCGT,2028,2.31150000000
-4,2034,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2032,R1,gasCCGT,2030,0.99560000000
-5,2034,R1,gasCCGT,2030,0.99560000000
-5,2035,R1,gasCCGT,2030,0.99560000000
-5,2040,R1,gasCCGT,2030,0.99560000000
-5,2045,R1,gasCCGT,2030,0.99560000000
-5,2046,R1,gasCCGT,2030,0.99560000000
-5,2047,R1,gasCCGT,2030,0.99560000000
-5,2050,R1,gasCCGT,2030,0.99560000000
-5,2056,R1,gasCCGT,2030,0.99560000000
-5,2057,R1,gasCCGT,2030,0.99560000000
-5,2058,R1,gasCCGT,2030,0.99560000000
-5,2059,R1,gasCCGT,2030,0.99560000000
-5,2060,R1,gasCCGT,2030,0.99560000000
-5,2061,R1,gasCCGT,2030,0.99560000000
-5,2062,R1,gasCCGT,2030,0.99560000000
-5,2063,R1,gasCCGT,2030,0.99560000000
-5,2064,R1,gasCCGT,2030,0.99560000000
-5,2065,R1,gasCCGT,2030,0.99560000000
-5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,gasCCGT,2032,0.75270000000
-6,2035,R1,gasCCGT,2032,0.75270000000
-6,2040,R1,gasCCGT,2032,0.75270000000
-6,2045,R1,gasCCGT,2032,0.75270000000
-6,2046,R1,gasCCGT,2032,0.75270000000
-6,2047,R1,gasCCGT,2032,0.75270000000
-6,2050,R1,gasCCGT,2032,0.75270000000
-6,2056,R1,gasCCGT,2032,0.75270000000
-6,2057,R1,gasCCGT,2032,0.75270000000
-6,2058,R1,gasCCGT,2032,0.75270000000
-6,2059,R1,gasCCGT,2032,0.75270000000
-6,2060,R1,gasCCGT,2032,0.75270000000
-6,2061,R1,gasCCGT,2032,0.75270000000
-6,2062,R1,gasCCGT,2032,0.75270000000
-6,2063,R1,gasCCGT,2032,0.75270000000
-6,2064,R1,gasCCGT,2032,0.75270000000
-6,2065,R1,gasCCGT,2032,0.75270000000
-6,2066,R1,gasCCGT,2032,0.75270000000
-6,2067,R1,gasCCGT,2032,0.75270000000
-6,2068,R1,gasCCGT,2032,0.75270000000
-7,2022,R1,solarPV,2020,0.27320000000
-7,2024,R1,solarPV,2020,0.27320000000
-7,2025,R1,solarPV,2020,0.27320000000
-7,2026,R1,solarPV,2020,0.27320000000
-7,2028,R1,solarPV,2020,0.27320000000
-7,2030,R1,solarPV,2020,0.27320000000
-7,2032,R1,solarPV,2020,0.27320000000
-7,2034,R1,solarPV,2020,0.27320000000
-7,2035,R1,solarPV,2020,0.27320000000
-7,2040,R1,solarPV,2020,0.27320000000
-7,2045,R1,solarPV,2020,0.27320000000
-7,2046,R1,solarPV,2020,0.27320000000
-8,2034,R1,solarPV,2032,0.54630000000
-8,2035,R1,solarPV,2032,0.54630000000
-8,2040,R1,solarPV,2032,0.54630000000
-8,2045,R1,solarPV,2032,0.54630000000
-8,2046,R1,solarPV,2032,0.54630000000
-8,2047,R1,solarPV,2032,0.54630000000
-8,2050,R1,solarPV,2032,0.54630000000
-8,2056,R1,solarPV,2032,0.54630000000
-8,2057,R1,solarPV,2032,0.54630000000
-8,2058,R1,solarPV,2032,0.54630000000
-9,2022,R1,windturbine,2020,4.00000000000
-9,2024,R1,windturbine,2020,4.00000000000
-9,2025,R1,windturbine,2020,4.00000000000
-9,2026,R1,windturbine,2020,4.00000000000
-9,2028,R1,windturbine,2020,4.00000000000
-9,2030,R1,windturbine,2020,4.00000000000
-9,2032,R1,windturbine,2020,4.00000000000
-9,2034,R1,windturbine,2020,4.00000000000
-9,2035,R1,windturbine,2020,4.00000000000
-9,2040,R1,windturbine,2020,4.00000000000
-9,2045,R1,windturbine,2020,4.00000000000
-9,2046,R1,windturbine,2020,4.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2022,R2,gasCCGT,2020,3.00000000000
-10,2024,R2,gasCCGT,2020,3.00000000000
-10,2025,R2,gasCCGT,2020,3.00000000000
-10,2026,R2,gasCCGT,2020,2.80000000000
-10,2028,R2,gasCCGT,2020,2.40000000000
-10,2030,R2,gasCCGT,2020,2.00000000000
-10,2032,R2,gasCCGT,2020,2.00000000000
-10,2034,R2,gasCCGT,2020,2.00000000000
-10,2035,R2,gasCCGT,2020,2.00000000000
-10,2040,R2,gasCCGT,2020,2.00000000000
-10,2045,R2,gasCCGT,2020,2.00000000000
-10,2046,R2,gasCCGT,2020,2.00000000000
-10,2047,R2,gasCCGT,2020,2.00000000000
-10,2050,R2,gasCCGT,2020,2.00000000000
-10,2056,R2,gasCCGT,2020,2.00000000000
-11,2024,R2,gasCCGT,2022,1.85640000000
-11,2025,R2,gasCCGT,2022,1.85640000000
-11,2026,R2,gasCCGT,2022,1.85640000000
-11,2028,R2,gasCCGT,2022,1.85640000000
-11,2030,R2,gasCCGT,2022,1.85640000000
-11,2032,R2,gasCCGT,2022,1.85640000000
-11,2034,R2,gasCCGT,2022,1.85640000000
-11,2035,R2,gasCCGT,2022,1.85640000000
-11,2040,R2,gasCCGT,2022,1.85640000000
-11,2045,R2,gasCCGT,2022,1.85640000000
-11,2046,R2,gasCCGT,2022,1.85640000000
-11,2047,R2,gasCCGT,2022,1.85640000000
-11,2050,R2,gasCCGT,2022,1.85640000000
-11,2056,R2,gasCCGT,2022,1.85640000000
-11,2057,R2,gasCCGT,2022,1.85640000000
-11,2058,R2,gasCCGT,2022,1.85640000000
-12,2026,R2,gasCCGT,2024,2.07980000000
-12,2028,R2,gasCCGT,2024,2.07980000000
-12,2030,R2,gasCCGT,2024,2.07980000000
-12,2032,R2,gasCCGT,2024,2.07980000000
-12,2034,R2,gasCCGT,2024,2.07980000000
-12,2035,R2,gasCCGT,2024,2.07980000000
-12,2040,R2,gasCCGT,2024,2.07980000000
-12,2045,R2,gasCCGT,2024,2.07980000000
-12,2046,R2,gasCCGT,2024,2.07980000000
-12,2047,R2,gasCCGT,2024,2.07980000000
-12,2050,R2,gasCCGT,2024,2.07980000000
-12,2056,R2,gasCCGT,2024,2.07980000000
-12,2057,R2,gasCCGT,2024,2.07980000000
-12,2058,R2,gasCCGT,2024,2.07980000000
-12,2059,R2,gasCCGT,2024,2.07980000000
-12,2060,R2,gasCCGT,2024,2.07980000000
-13,2028,R2,gasCCGT,2026,2.29760000000
-13,2030,R2,gasCCGT,2026,2.29760000000
-13,2032,R2,gasCCGT,2026,2.29760000000
-13,2034,R2,gasCCGT,2026,2.29760000000
-13,2035,R2,gasCCGT,2026,2.29760000000
-13,2040,R2,gasCCGT,2026,2.29760000000
-13,2045,R2,gasCCGT,2026,2.29760000000
-13,2046,R2,gasCCGT,2026,2.29760000000
-13,2047,R2,gasCCGT,2026,2.29760000000
-13,2050,R2,gasCCGT,2026,2.29760000000
-13,2056,R2,gasCCGT,2026,2.29760000000
-13,2057,R2,gasCCGT,2026,2.29760000000
-13,2058,R2,gasCCGT,2026,2.29760000000
-13,2059,R2,gasCCGT,2026,2.29760000000
-13,2060,R2,gasCCGT,2026,2.29760000000
-13,2061,R2,gasCCGT,2026,2.29760000000
-13,2062,R2,gasCCGT,2026,2.29760000000
-14,2030,R2,gasCCGT,2028,2.31150000000
-14,2032,R2,gasCCGT,2028,2.31150000000
-14,2034,R2,gasCCGT,2028,2.31150000000
-14,2035,R2,gasCCGT,2028,2.31150000000
-14,2040,R2,gasCCGT,2028,2.31150000000
-14,2045,R2,gasCCGT,2028,2.31150000000
-14,2046,R2,gasCCGT,2028,2.31150000000
-14,2047,R2,gasCCGT,2028,2.31150000000
-14,2050,R2,gasCCGT,2028,2.31150000000
-14,2056,R2,gasCCGT,2028,2.31150000000
-14,2057,R2,gasCCGT,2028,2.31150000000
-14,2058,R2,gasCCGT,2028,2.31150000000
-14,2059,R2,gasCCGT,2028,2.31150000000
-14,2060,R2,gasCCGT,2028,2.31150000000
-14,2061,R2,gasCCGT,2028,2.31150000000
-14,2062,R2,gasCCGT,2028,2.31150000000
-14,2063,R2,gasCCGT,2028,2.31150000000
-14,2064,R2,gasCCGT,2028,2.31150000000
-15,2032,R2,gasCCGT,2030,0.99560000000
-15,2034,R2,gasCCGT,2030,0.99560000000
-15,2035,R2,gasCCGT,2030,0.99560000000
-15,2040,R2,gasCCGT,2030,0.99560000000
-15,2045,R2,gasCCGT,2030,0.99560000000
-15,2046,R2,gasCCGT,2030,0.99560000000
-15,2047,R2,gasCCGT,2030,0.99560000000
-15,2050,R2,gasCCGT,2030,0.99560000000
-15,2056,R2,gasCCGT,2030,0.99560000000
-15,2057,R2,gasCCGT,2030,0.99560000000
-15,2058,R2,gasCCGT,2030,0.99560000000
-15,2059,R2,gasCCGT,2030,0.99560000000
-15,2060,R2,gasCCGT,2030,0.99560000000
-15,2061,R2,gasCCGT,2030,0.99560000000
-15,2062,R2,gasCCGT,2030,0.99560000000
-15,2063,R2,gasCCGT,2030,0.99560000000
-15,2064,R2,gasCCGT,2030,0.99560000000
-15,2065,R2,gasCCGT,2030,0.99560000000
-15,2066,R2,gasCCGT,2030,0.99560000000
-16,2034,R2,solarPV,2032,2.24000000000
-16,2035,R2,solarPV,2032,2.24000000000
-16,2040,R2,solarPV,2032,2.24000000000
-16,2045,R2,solarPV,2032,2.24000000000
-16,2046,R2,solarPV,2032,2.24000000000
-16,2047,R2,solarPV,2032,2.24000000000
-16,2050,R2,solarPV,2032,2.24000000000
-16,2056,R2,solarPV,2032,2.24000000000
-16,2057,R2,solarPV,2032,2.24000000000
-16,2058,R2,solarPV,2032,2.24000000000
-17,2022,R2,windturbine,2020,4.27320000000
-17,2024,R2,windturbine,2020,4.27320000000
-17,2025,R2,windturbine,2020,4.27320000000
-17,2026,R2,windturbine,2020,4.27320000000
-17,2028,R2,windturbine,2020,4.27320000000
-17,2030,R2,windturbine,2020,4.27320000000
-17,2032,R2,windturbine,2020,4.27320000000
-17,2034,R2,windturbine,2020,4.27320000000
-17,2035,R2,windturbine,2020,4.27320000000
-17,2040,R2,windturbine,2020,4.27320000000
-17,2045,R2,windturbine,2020,4.27320000000
-17,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
deleted file mode 100644
index 08c696ee6..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
+++ /dev/null
@@ -1,332 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2032,R1,gasCCGT,2020,2.00000000000
-0,2034,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2036,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2032,R1,gasCCGT,2022,1.85640000000
-1,2034,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2036,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2032,R1,gasCCGT,2024,2.07980000000
-2,2034,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2036,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2032,R1,gasCCGT,2026,2.29760000000
-3,2034,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2036,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2032,R1,gasCCGT,2028,2.31150000000
-4,2034,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2036,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2032,R1,gasCCGT,2030,0.99560000000
-5,2034,R1,gasCCGT,2030,0.99560000000
-5,2035,R1,gasCCGT,2030,0.99560000000
-5,2036,R1,gasCCGT,2030,0.99560000000
-5,2040,R1,gasCCGT,2030,0.99560000000
-5,2045,R1,gasCCGT,2030,0.99560000000
-5,2046,R1,gasCCGT,2030,0.99560000000
-5,2047,R1,gasCCGT,2030,0.99560000000
-5,2050,R1,gasCCGT,2030,0.99560000000
-5,2056,R1,gasCCGT,2030,0.99560000000
-5,2057,R1,gasCCGT,2030,0.99560000000
-5,2058,R1,gasCCGT,2030,0.99560000000
-5,2059,R1,gasCCGT,2030,0.99560000000
-5,2060,R1,gasCCGT,2030,0.99560000000
-5,2061,R1,gasCCGT,2030,0.99560000000
-5,2062,R1,gasCCGT,2030,0.99560000000
-5,2063,R1,gasCCGT,2030,0.99560000000
-5,2064,R1,gasCCGT,2030,0.99560000000
-5,2065,R1,gasCCGT,2030,0.99560000000
-5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,gasCCGT,2032,0.75270000000
-6,2035,R1,gasCCGT,2032,0.75270000000
-6,2036,R1,gasCCGT,2032,0.75270000000
-6,2040,R1,gasCCGT,2032,0.75270000000
-6,2045,R1,gasCCGT,2032,0.75270000000
-6,2046,R1,gasCCGT,2032,0.75270000000
-6,2047,R1,gasCCGT,2032,0.75270000000
-6,2050,R1,gasCCGT,2032,0.75270000000
-6,2056,R1,gasCCGT,2032,0.75270000000
-6,2057,R1,gasCCGT,2032,0.75270000000
-6,2058,R1,gasCCGT,2032,0.75270000000
-6,2059,R1,gasCCGT,2032,0.75270000000
-6,2060,R1,gasCCGT,2032,0.75270000000
-6,2061,R1,gasCCGT,2032,0.75270000000
-6,2062,R1,gasCCGT,2032,0.75270000000
-6,2063,R1,gasCCGT,2032,0.75270000000
-6,2064,R1,gasCCGT,2032,0.75270000000
-6,2065,R1,gasCCGT,2032,0.75270000000
-6,2066,R1,gasCCGT,2032,0.75270000000
-6,2067,R1,gasCCGT,2032,0.75270000000
-6,2068,R1,gasCCGT,2032,0.75270000000
-7,2022,R1,solarPV,2020,0.27320000000
-7,2024,R1,solarPV,2020,0.27320000000
-7,2025,R1,solarPV,2020,0.27320000000
-7,2026,R1,solarPV,2020,0.27320000000
-7,2028,R1,solarPV,2020,0.27320000000
-7,2030,R1,solarPV,2020,0.27320000000
-7,2032,R1,solarPV,2020,0.27320000000
-7,2034,R1,solarPV,2020,0.27320000000
-7,2035,R1,solarPV,2020,0.27320000000
-7,2036,R1,solarPV,2020,0.27320000000
-7,2040,R1,solarPV,2020,0.27320000000
-7,2045,R1,solarPV,2020,0.27320000000
-7,2046,R1,solarPV,2020,0.27320000000
-8,2034,R1,solarPV,2032,0.54630000000
-8,2035,R1,solarPV,2032,0.54630000000
-8,2036,R1,solarPV,2032,0.54630000000
-8,2040,R1,solarPV,2032,0.54630000000
-8,2045,R1,solarPV,2032,0.54630000000
-8,2046,R1,solarPV,2032,0.54630000000
-8,2047,R1,solarPV,2032,0.54630000000
-8,2050,R1,solarPV,2032,0.54630000000
-8,2056,R1,solarPV,2032,0.54630000000
-8,2057,R1,solarPV,2032,0.54630000000
-8,2058,R1,solarPV,2032,0.54630000000
-9,2036,R1,solarPV,2034,1.63890000000
-9,2040,R1,solarPV,2034,1.63890000000
-9,2045,R1,solarPV,2034,1.63890000000
-9,2046,R1,solarPV,2034,1.63890000000
-9,2047,R1,solarPV,2034,1.63890000000
-9,2050,R1,solarPV,2034,1.63890000000
-9,2056,R1,solarPV,2034,1.63890000000
-9,2057,R1,solarPV,2034,1.63890000000
-9,2058,R1,solarPV,2034,1.63890000000
-9,2059,R1,solarPV,2034,1.63890000000
-9,2060,R1,solarPV,2034,1.63890000000
-10,2022,R1,windturbine,2020,4.00000000000
-10,2024,R1,windturbine,2020,4.00000000000
-10,2025,R1,windturbine,2020,4.00000000000
-10,2026,R1,windturbine,2020,4.00000000000
-10,2028,R1,windturbine,2020,4.00000000000
-10,2030,R1,windturbine,2020,4.00000000000
-10,2032,R1,windturbine,2020,4.00000000000
-10,2034,R1,windturbine,2020,4.00000000000
-10,2035,R1,windturbine,2020,4.00000000000
-10,2036,R1,windturbine,2020,4.00000000000
-10,2040,R1,windturbine,2020,4.00000000000
-10,2045,R1,windturbine,2020,4.00000000000
-10,2046,R1,windturbine,2020,4.00000000000
-11,2036,R1,windturbine,2034,0.60110000000
-11,2040,R1,windturbine,2034,0.60110000000
-11,2045,R1,windturbine,2034,0.60110000000
-11,2046,R1,windturbine,2034,0.60110000000
-11,2047,R1,windturbine,2034,0.60110000000
-11,2050,R1,windturbine,2034,0.60110000000
-11,2056,R1,windturbine,2034,0.60110000000
-11,2057,R1,windturbine,2034,0.60110000000
-11,2058,R1,windturbine,2034,0.60110000000
-11,2059,R1,windturbine,2034,0.60110000000
-11,2060,R1,windturbine,2034,0.60110000000
-12,2020,R2,gasCCGT,2020,1.00000000000
-12,2022,R2,gasCCGT,2020,3.00000000000
-12,2024,R2,gasCCGT,2020,3.00000000000
-12,2025,R2,gasCCGT,2020,3.00000000000
-12,2026,R2,gasCCGT,2020,2.80000000000
-12,2028,R2,gasCCGT,2020,2.40000000000
-12,2030,R2,gasCCGT,2020,2.00000000000
-12,2032,R2,gasCCGT,2020,2.00000000000
-12,2034,R2,gasCCGT,2020,2.00000000000
-12,2035,R2,gasCCGT,2020,2.00000000000
-12,2036,R2,gasCCGT,2020,2.00000000000
-12,2040,R2,gasCCGT,2020,2.00000000000
-12,2045,R2,gasCCGT,2020,2.00000000000
-12,2046,R2,gasCCGT,2020,2.00000000000
-12,2047,R2,gasCCGT,2020,2.00000000000
-12,2050,R2,gasCCGT,2020,2.00000000000
-12,2056,R2,gasCCGT,2020,2.00000000000
-13,2024,R2,gasCCGT,2022,1.85640000000
-13,2025,R2,gasCCGT,2022,1.85640000000
-13,2026,R2,gasCCGT,2022,1.85640000000
-13,2028,R2,gasCCGT,2022,1.85640000000
-13,2030,R2,gasCCGT,2022,1.85640000000
-13,2032,R2,gasCCGT,2022,1.85640000000
-13,2034,R2,gasCCGT,2022,1.85640000000
-13,2035,R2,gasCCGT,2022,1.85640000000
-13,2036,R2,gasCCGT,2022,1.85640000000
-13,2040,R2,gasCCGT,2022,1.85640000000
-13,2045,R2,gasCCGT,2022,1.85640000000
-13,2046,R2,gasCCGT,2022,1.85640000000
-13,2047,R2,gasCCGT,2022,1.85640000000
-13,2050,R2,gasCCGT,2022,1.85640000000
-13,2056,R2,gasCCGT,2022,1.85640000000
-13,2057,R2,gasCCGT,2022,1.85640000000
-13,2058,R2,gasCCGT,2022,1.85640000000
-14,2026,R2,gasCCGT,2024,2.07980000000
-14,2028,R2,gasCCGT,2024,2.07980000000
-14,2030,R2,gasCCGT,2024,2.07980000000
-14,2032,R2,gasCCGT,2024,2.07980000000
-14,2034,R2,gasCCGT,2024,2.07980000000
-14,2035,R2,gasCCGT,2024,2.07980000000
-14,2036,R2,gasCCGT,2024,2.07980000000
-14,2040,R2,gasCCGT,2024,2.07980000000
-14,2045,R2,gasCCGT,2024,2.07980000000
-14,2046,R2,gasCCGT,2024,2.07980000000
-14,2047,R2,gasCCGT,2024,2.07980000000
-14,2050,R2,gasCCGT,2024,2.07980000000
-14,2056,R2,gasCCGT,2024,2.07980000000
-14,2057,R2,gasCCGT,2024,2.07980000000
-14,2058,R2,gasCCGT,2024,2.07980000000
-14,2059,R2,gasCCGT,2024,2.07980000000
-14,2060,R2,gasCCGT,2024,2.07980000000
-15,2028,R2,gasCCGT,2026,2.29760000000
-15,2030,R2,gasCCGT,2026,2.29760000000
-15,2032,R2,gasCCGT,2026,2.29760000000
-15,2034,R2,gasCCGT,2026,2.29760000000
-15,2035,R2,gasCCGT,2026,2.29760000000
-15,2036,R2,gasCCGT,2026,2.29760000000
-15,2040,R2,gasCCGT,2026,2.29760000000
-15,2045,R2,gasCCGT,2026,2.29760000000
-15,2046,R2,gasCCGT,2026,2.29760000000
-15,2047,R2,gasCCGT,2026,2.29760000000
-15,2050,R2,gasCCGT,2026,2.29760000000
-15,2056,R2,gasCCGT,2026,2.29760000000
-15,2057,R2,gasCCGT,2026,2.29760000000
-15,2058,R2,gasCCGT,2026,2.29760000000
-15,2059,R2,gasCCGT,2026,2.29760000000
-15,2060,R2,gasCCGT,2026,2.29760000000
-15,2061,R2,gasCCGT,2026,2.29760000000
-15,2062,R2,gasCCGT,2026,2.29760000000
-16,2030,R2,gasCCGT,2028,2.31150000000
-16,2032,R2,gasCCGT,2028,2.31150000000
-16,2034,R2,gasCCGT,2028,2.31150000000
-16,2035,R2,gasCCGT,2028,2.31150000000
-16,2036,R2,gasCCGT,2028,2.31150000000
-16,2040,R2,gasCCGT,2028,2.31150000000
-16,2045,R2,gasCCGT,2028,2.31150000000
-16,2046,R2,gasCCGT,2028,2.31150000000
-16,2047,R2,gasCCGT,2028,2.31150000000
-16,2050,R2,gasCCGT,2028,2.31150000000
-16,2056,R2,gasCCGT,2028,2.31150000000
-16,2057,R2,gasCCGT,2028,2.31150000000
-16,2058,R2,gasCCGT,2028,2.31150000000
-16,2059,R2,gasCCGT,2028,2.31150000000
-16,2060,R2,gasCCGT,2028,2.31150000000
-16,2061,R2,gasCCGT,2028,2.31150000000
-16,2062,R2,gasCCGT,2028,2.31150000000
-16,2063,R2,gasCCGT,2028,2.31150000000
-16,2064,R2,gasCCGT,2028,2.31150000000
-17,2032,R2,gasCCGT,2030,0.99560000000
-17,2034,R2,gasCCGT,2030,0.99560000000
-17,2035,R2,gasCCGT,2030,0.99560000000
-17,2036,R2,gasCCGT,2030,0.99560000000
-17,2040,R2,gasCCGT,2030,0.99560000000
-17,2045,R2,gasCCGT,2030,0.99560000000
-17,2046,R2,gasCCGT,2030,0.99560000000
-17,2047,R2,gasCCGT,2030,0.99560000000
-17,2050,R2,gasCCGT,2030,0.99560000000
-17,2056,R2,gasCCGT,2030,0.99560000000
-17,2057,R2,gasCCGT,2030,0.99560000000
-17,2058,R2,gasCCGT,2030,0.99560000000
-17,2059,R2,gasCCGT,2030,0.99560000000
-17,2060,R2,gasCCGT,2030,0.99560000000
-17,2061,R2,gasCCGT,2030,0.99560000000
-17,2062,R2,gasCCGT,2030,0.99560000000
-17,2063,R2,gasCCGT,2030,0.99560000000
-17,2064,R2,gasCCGT,2030,0.99560000000
-17,2065,R2,gasCCGT,2030,0.99560000000
-17,2066,R2,gasCCGT,2030,0.99560000000
-18,2034,R2,solarPV,2032,2.24000000000
-18,2035,R2,solarPV,2032,2.24000000000
-18,2036,R2,solarPV,2032,2.24000000000
-18,2040,R2,solarPV,2032,2.24000000000
-18,2045,R2,solarPV,2032,2.24000000000
-18,2046,R2,solarPV,2032,2.24000000000
-18,2047,R2,solarPV,2032,2.24000000000
-18,2050,R2,solarPV,2032,2.24000000000
-18,2056,R2,solarPV,2032,2.24000000000
-18,2057,R2,solarPV,2032,2.24000000000
-18,2058,R2,solarPV,2032,2.24000000000
-19,2036,R2,solarPV,2034,2.24000000000
-19,2040,R2,solarPV,2034,2.24000000000
-19,2045,R2,solarPV,2034,2.24000000000
-19,2046,R2,solarPV,2034,2.24000000000
-19,2047,R2,solarPV,2034,2.24000000000
-19,2050,R2,solarPV,2034,2.24000000000
-19,2056,R2,solarPV,2034,2.24000000000
-19,2057,R2,solarPV,2034,2.24000000000
-19,2058,R2,solarPV,2034,2.24000000000
-19,2059,R2,solarPV,2034,2.24000000000
-19,2060,R2,solarPV,2034,2.24000000000
-20,2022,R2,windturbine,2020,4.27320000000
-20,2024,R2,windturbine,2020,4.27320000000
-20,2025,R2,windturbine,2020,4.27320000000
-20,2026,R2,windturbine,2020,4.27320000000
-20,2028,R2,windturbine,2020,4.27320000000
-20,2030,R2,windturbine,2020,4.27320000000
-20,2032,R2,windturbine,2020,4.27320000000
-20,2034,R2,windturbine,2020,4.27320000000
-20,2035,R2,windturbine,2020,4.27320000000
-20,2036,R2,windturbine,2020,4.27320000000
-20,2040,R2,windturbine,2020,4.27320000000
-20,2045,R2,windturbine,2020,4.27320000000
-20,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
deleted file mode 100644
index df7cf5aa5..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
+++ /dev/null
@@ -1,379 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2032,R1,gasCCGT,2020,2.00000000000
-0,2034,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2036,R1,gasCCGT,2020,2.00000000000
-0,2038,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2032,R1,gasCCGT,2022,1.85640000000
-1,2034,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2036,R1,gasCCGT,2022,1.85640000000
-1,2038,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2032,R1,gasCCGT,2024,2.07980000000
-2,2034,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2036,R1,gasCCGT,2024,2.07980000000
-2,2038,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2032,R1,gasCCGT,2026,2.29760000000
-3,2034,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2036,R1,gasCCGT,2026,2.29760000000
-3,2038,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2032,R1,gasCCGT,2028,2.31150000000
-4,2034,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2036,R1,gasCCGT,2028,2.31150000000
-4,2038,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2032,R1,gasCCGT,2030,0.99560000000
-5,2034,R1,gasCCGT,2030,0.99560000000
-5,2035,R1,gasCCGT,2030,0.99560000000
-5,2036,R1,gasCCGT,2030,0.99560000000
-5,2038,R1,gasCCGT,2030,0.99560000000
-5,2040,R1,gasCCGT,2030,0.99560000000
-5,2045,R1,gasCCGT,2030,0.99560000000
-5,2046,R1,gasCCGT,2030,0.99560000000
-5,2047,R1,gasCCGT,2030,0.99560000000
-5,2050,R1,gasCCGT,2030,0.99560000000
-5,2056,R1,gasCCGT,2030,0.99560000000
-5,2057,R1,gasCCGT,2030,0.99560000000
-5,2058,R1,gasCCGT,2030,0.99560000000
-5,2059,R1,gasCCGT,2030,0.99560000000
-5,2060,R1,gasCCGT,2030,0.99560000000
-5,2061,R1,gasCCGT,2030,0.99560000000
-5,2062,R1,gasCCGT,2030,0.99560000000
-5,2063,R1,gasCCGT,2030,0.99560000000
-5,2064,R1,gasCCGT,2030,0.99560000000
-5,2065,R1,gasCCGT,2030,0.99560000000
-5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,gasCCGT,2032,0.75270000000
-6,2035,R1,gasCCGT,2032,0.75270000000
-6,2036,R1,gasCCGT,2032,0.75270000000
-6,2038,R1,gasCCGT,2032,0.75270000000
-6,2040,R1,gasCCGT,2032,0.75270000000
-6,2045,R1,gasCCGT,2032,0.75270000000
-6,2046,R1,gasCCGT,2032,0.75270000000
-6,2047,R1,gasCCGT,2032,0.75270000000
-6,2050,R1,gasCCGT,2032,0.75270000000
-6,2056,R1,gasCCGT,2032,0.75270000000
-6,2057,R1,gasCCGT,2032,0.75270000000
-6,2058,R1,gasCCGT,2032,0.75270000000
-6,2059,R1,gasCCGT,2032,0.75270000000
-6,2060,R1,gasCCGT,2032,0.75270000000
-6,2061,R1,gasCCGT,2032,0.75270000000
-6,2062,R1,gasCCGT,2032,0.75270000000
-6,2063,R1,gasCCGT,2032,0.75270000000
-6,2064,R1,gasCCGT,2032,0.75270000000
-6,2065,R1,gasCCGT,2032,0.75270000000
-6,2066,R1,gasCCGT,2032,0.75270000000
-6,2067,R1,gasCCGT,2032,0.75270000000
-6,2068,R1,gasCCGT,2032,0.75270000000
-7,2022,R1,solarPV,2020,0.27320000000
-7,2024,R1,solarPV,2020,0.27320000000
-7,2025,R1,solarPV,2020,0.27320000000
-7,2026,R1,solarPV,2020,0.27320000000
-7,2028,R1,solarPV,2020,0.27320000000
-7,2030,R1,solarPV,2020,0.27320000000
-7,2032,R1,solarPV,2020,0.27320000000
-7,2034,R1,solarPV,2020,0.27320000000
-7,2035,R1,solarPV,2020,0.27320000000
-7,2036,R1,solarPV,2020,0.27320000000
-7,2038,R1,solarPV,2020,0.27320000000
-7,2040,R1,solarPV,2020,0.27320000000
-7,2045,R1,solarPV,2020,0.27320000000
-7,2046,R1,solarPV,2020,0.27320000000
-8,2034,R1,solarPV,2032,0.54630000000
-8,2035,R1,solarPV,2032,0.54630000000
-8,2036,R1,solarPV,2032,0.54630000000
-8,2038,R1,solarPV,2032,0.54630000000
-8,2040,R1,solarPV,2032,0.54630000000
-8,2045,R1,solarPV,2032,0.54630000000
-8,2046,R1,solarPV,2032,0.54630000000
-8,2047,R1,solarPV,2032,0.54630000000
-8,2050,R1,solarPV,2032,0.54630000000
-8,2056,R1,solarPV,2032,0.54630000000
-8,2057,R1,solarPV,2032,0.54630000000
-8,2058,R1,solarPV,2032,0.54630000000
-9,2036,R1,solarPV,2034,1.63890000000
-9,2038,R1,solarPV,2034,1.63890000000
-9,2040,R1,solarPV,2034,1.63890000000
-9,2045,R1,solarPV,2034,1.63890000000
-9,2046,R1,solarPV,2034,1.63890000000
-9,2047,R1,solarPV,2034,1.63890000000
-9,2050,R1,solarPV,2034,1.63890000000
-9,2056,R1,solarPV,2034,1.63890000000
-9,2057,R1,solarPV,2034,1.63890000000
-9,2058,R1,solarPV,2034,1.63890000000
-9,2059,R1,solarPV,2034,1.63890000000
-9,2060,R1,solarPV,2034,1.63890000000
-10,2038,R1,solarPV,2036,2.24000000000
-10,2040,R1,solarPV,2036,2.24000000000
-10,2045,R1,solarPV,2036,2.24000000000
-10,2046,R1,solarPV,2036,2.24000000000
-10,2047,R1,solarPV,2036,2.24000000000
-10,2050,R1,solarPV,2036,2.24000000000
-10,2056,R1,solarPV,2036,2.24000000000
-10,2057,R1,solarPV,2036,2.24000000000
-10,2058,R1,solarPV,2036,2.24000000000
-10,2059,R1,solarPV,2036,2.24000000000
-10,2060,R1,solarPV,2036,2.24000000000
-10,2061,R1,solarPV,2036,2.24000000000
-10,2062,R1,solarPV,2036,2.24000000000
-11,2022,R1,windturbine,2020,4.00000000000
-11,2024,R1,windturbine,2020,4.00000000000
-11,2025,R1,windturbine,2020,4.00000000000
-11,2026,R1,windturbine,2020,4.00000000000
-11,2028,R1,windturbine,2020,4.00000000000
-11,2030,R1,windturbine,2020,4.00000000000
-11,2032,R1,windturbine,2020,4.00000000000
-11,2034,R1,windturbine,2020,4.00000000000
-11,2035,R1,windturbine,2020,4.00000000000
-11,2036,R1,windturbine,2020,4.00000000000
-11,2038,R1,windturbine,2020,4.00000000000
-11,2040,R1,windturbine,2020,4.00000000000
-11,2045,R1,windturbine,2020,4.00000000000
-11,2046,R1,windturbine,2020,4.00000000000
-12,2036,R1,windturbine,2034,0.60110000000
-12,2038,R1,windturbine,2034,0.60110000000
-12,2040,R1,windturbine,2034,0.60110000000
-12,2045,R1,windturbine,2034,0.60110000000
-12,2046,R1,windturbine,2034,0.60110000000
-12,2047,R1,windturbine,2034,0.60110000000
-12,2050,R1,windturbine,2034,0.60110000000
-12,2056,R1,windturbine,2034,0.60110000000
-12,2057,R1,windturbine,2034,0.60110000000
-12,2058,R1,windturbine,2034,0.60110000000
-12,2059,R1,windturbine,2034,0.60110000000
-12,2060,R1,windturbine,2034,0.60110000000
-13,2020,R2,gasCCGT,2020,1.00000000000
-13,2022,R2,gasCCGT,2020,3.00000000000
-13,2024,R2,gasCCGT,2020,3.00000000000
-13,2025,R2,gasCCGT,2020,3.00000000000
-13,2026,R2,gasCCGT,2020,2.80000000000
-13,2028,R2,gasCCGT,2020,2.40000000000
-13,2030,R2,gasCCGT,2020,2.00000000000
-13,2032,R2,gasCCGT,2020,2.00000000000
-13,2034,R2,gasCCGT,2020,2.00000000000
-13,2035,R2,gasCCGT,2020,2.00000000000
-13,2036,R2,gasCCGT,2020,2.00000000000
-13,2038,R2,gasCCGT,2020,2.00000000000
-13,2040,R2,gasCCGT,2020,2.00000000000
-13,2045,R2,gasCCGT,2020,2.00000000000
-13,2046,R2,gasCCGT,2020,2.00000000000
-13,2047,R2,gasCCGT,2020,2.00000000000
-13,2050,R2,gasCCGT,2020,2.00000000000
-13,2056,R2,gasCCGT,2020,2.00000000000
-14,2024,R2,gasCCGT,2022,1.85640000000
-14,2025,R2,gasCCGT,2022,1.85640000000
-14,2026,R2,gasCCGT,2022,1.85640000000
-14,2028,R2,gasCCGT,2022,1.85640000000
-14,2030,R2,gasCCGT,2022,1.85640000000
-14,2032,R2,gasCCGT,2022,1.85640000000
-14,2034,R2,gasCCGT,2022,1.85640000000
-14,2035,R2,gasCCGT,2022,1.85640000000
-14,2036,R2,gasCCGT,2022,1.85640000000
-14,2038,R2,gasCCGT,2022,1.85640000000
-14,2040,R2,gasCCGT,2022,1.85640000000
-14,2045,R2,gasCCGT,2022,1.85640000000
-14,2046,R2,gasCCGT,2022,1.85640000000
-14,2047,R2,gasCCGT,2022,1.85640000000
-14,2050,R2,gasCCGT,2022,1.85640000000
-14,2056,R2,gasCCGT,2022,1.85640000000
-14,2057,R2,gasCCGT,2022,1.85640000000
-14,2058,R2,gasCCGT,2022,1.85640000000
-15,2026,R2,gasCCGT,2024,2.07980000000
-15,2028,R2,gasCCGT,2024,2.07980000000
-15,2030,R2,gasCCGT,2024,2.07980000000
-15,2032,R2,gasCCGT,2024,2.07980000000
-15,2034,R2,gasCCGT,2024,2.07980000000
-15,2035,R2,gasCCGT,2024,2.07980000000
-15,2036,R2,gasCCGT,2024,2.07980000000
-15,2038,R2,gasCCGT,2024,2.07980000000
-15,2040,R2,gasCCGT,2024,2.07980000000
-15,2045,R2,gasCCGT,2024,2.07980000000
-15,2046,R2,gasCCGT,2024,2.07980000000
-15,2047,R2,gasCCGT,2024,2.07980000000
-15,2050,R2,gasCCGT,2024,2.07980000000
-15,2056,R2,gasCCGT,2024,2.07980000000
-15,2057,R2,gasCCGT,2024,2.07980000000
-15,2058,R2,gasCCGT,2024,2.07980000000
-15,2059,R2,gasCCGT,2024,2.07980000000
-15,2060,R2,gasCCGT,2024,2.07980000000
-16,2028,R2,gasCCGT,2026,2.29760000000
-16,2030,R2,gasCCGT,2026,2.29760000000
-16,2032,R2,gasCCGT,2026,2.29760000000
-16,2034,R2,gasCCGT,2026,2.29760000000
-16,2035,R2,gasCCGT,2026,2.29760000000
-16,2036,R2,gasCCGT,2026,2.29760000000
-16,2038,R2,gasCCGT,2026,2.29760000000
-16,2040,R2,gasCCGT,2026,2.29760000000
-16,2045,R2,gasCCGT,2026,2.29760000000
-16,2046,R2,gasCCGT,2026,2.29760000000
-16,2047,R2,gasCCGT,2026,2.29760000000
-16,2050,R2,gasCCGT,2026,2.29760000000
-16,2056,R2,gasCCGT,2026,2.29760000000
-16,2057,R2,gasCCGT,2026,2.29760000000
-16,2058,R2,gasCCGT,2026,2.29760000000
-16,2059,R2,gasCCGT,2026,2.29760000000
-16,2060,R2,gasCCGT,2026,2.29760000000
-16,2061,R2,gasCCGT,2026,2.29760000000
-16,2062,R2,gasCCGT,2026,2.29760000000
-17,2030,R2,gasCCGT,2028,2.31150000000
-17,2032,R2,gasCCGT,2028,2.31150000000
-17,2034,R2,gasCCGT,2028,2.31150000000
-17,2035,R2,gasCCGT,2028,2.31150000000
-17,2036,R2,gasCCGT,2028,2.31150000000
-17,2038,R2,gasCCGT,2028,2.31150000000
-17,2040,R2,gasCCGT,2028,2.31150000000
-17,2045,R2,gasCCGT,2028,2.31150000000
-17,2046,R2,gasCCGT,2028,2.31150000000
-17,2047,R2,gasCCGT,2028,2.31150000000
-17,2050,R2,gasCCGT,2028,2.31150000000
-17,2056,R2,gasCCGT,2028,2.31150000000
-17,2057,R2,gasCCGT,2028,2.31150000000
-17,2058,R2,gasCCGT,2028,2.31150000000
-17,2059,R2,gasCCGT,2028,2.31150000000
-17,2060,R2,gasCCGT,2028,2.31150000000
-17,2061,R2,gasCCGT,2028,2.31150000000
-17,2062,R2,gasCCGT,2028,2.31150000000
-17,2063,R2,gasCCGT,2028,2.31150000000
-17,2064,R2,gasCCGT,2028,2.31150000000
-18,2032,R2,gasCCGT,2030,0.99560000000
-18,2034,R2,gasCCGT,2030,0.99560000000
-18,2035,R2,gasCCGT,2030,0.99560000000
-18,2036,R2,gasCCGT,2030,0.99560000000
-18,2038,R2,gasCCGT,2030,0.99560000000
-18,2040,R2,gasCCGT,2030,0.99560000000
-18,2045,R2,gasCCGT,2030,0.99560000000
-18,2046,R2,gasCCGT,2030,0.99560000000
-18,2047,R2,gasCCGT,2030,0.99560000000
-18,2050,R2,gasCCGT,2030,0.99560000000
-18,2056,R2,gasCCGT,2030,0.99560000000
-18,2057,R2,gasCCGT,2030,0.99560000000
-18,2058,R2,gasCCGT,2030,0.99560000000
-18,2059,R2,gasCCGT,2030,0.99560000000
-18,2060,R2,gasCCGT,2030,0.99560000000
-18,2061,R2,gasCCGT,2030,0.99560000000
-18,2062,R2,gasCCGT,2030,0.99560000000
-18,2063,R2,gasCCGT,2030,0.99560000000
-18,2064,R2,gasCCGT,2030,0.99560000000
-18,2065,R2,gasCCGT,2030,0.99560000000
-18,2066,R2,gasCCGT,2030,0.99560000000
-19,2034,R2,solarPV,2032,2.24000000000
-19,2035,R2,solarPV,2032,2.24000000000
-19,2036,R2,solarPV,2032,2.24000000000
-19,2038,R2,solarPV,2032,2.24000000000
-19,2040,R2,solarPV,2032,2.24000000000
-19,2045,R2,solarPV,2032,2.24000000000
-19,2046,R2,solarPV,2032,2.24000000000
-19,2047,R2,solarPV,2032,2.24000000000
-19,2050,R2,solarPV,2032,2.24000000000
-19,2056,R2,solarPV,2032,2.24000000000
-19,2057,R2,solarPV,2032,2.24000000000
-19,2058,R2,solarPV,2032,2.24000000000
-20,2036,R2,solarPV,2034,2.24000000000
-20,2038,R2,solarPV,2034,2.24000000000
-20,2040,R2,solarPV,2034,2.24000000000
-20,2045,R2,solarPV,2034,2.24000000000
-20,2046,R2,solarPV,2034,2.24000000000
-20,2047,R2,solarPV,2034,2.24000000000
-20,2050,R2,solarPV,2034,2.24000000000
-20,2056,R2,solarPV,2034,2.24000000000
-20,2057,R2,solarPV,2034,2.24000000000
-20,2058,R2,solarPV,2034,2.24000000000
-20,2059,R2,solarPV,2034,2.24000000000
-20,2060,R2,solarPV,2034,2.24000000000
-21,2038,R2,solarPV,2036,2.24000000000
-21,2040,R2,solarPV,2036,2.24000000000
-21,2045,R2,solarPV,2036,2.24000000000
-21,2046,R2,solarPV,2036,2.24000000000
-21,2047,R2,solarPV,2036,2.24000000000
-21,2050,R2,solarPV,2036,2.24000000000
-21,2056,R2,solarPV,2036,2.24000000000
-21,2057,R2,solarPV,2036,2.24000000000
-21,2058,R2,solarPV,2036,2.24000000000
-21,2059,R2,solarPV,2036,2.24000000000
-21,2060,R2,solarPV,2036,2.24000000000
-21,2061,R2,solarPV,2036,2.24000000000
-21,2062,R2,solarPV,2036,2.24000000000
-22,2022,R2,windturbine,2020,4.27320000000
-22,2024,R2,windturbine,2020,4.27320000000
-22,2025,R2,windturbine,2020,4.27320000000
-22,2026,R2,windturbine,2020,4.27320000000
-22,2028,R2,windturbine,2020,4.27320000000
-22,2030,R2,windturbine,2020,4.27320000000
-22,2032,R2,windturbine,2020,4.27320000000
-22,2034,R2,windturbine,2020,4.27320000000
-22,2035,R2,windturbine,2020,4.27320000000
-22,2036,R2,windturbine,2020,4.27320000000
-22,2038,R2,windturbine,2020,4.27320000000
-22,2040,R2,windturbine,2020,4.27320000000
-22,2045,R2,windturbine,2020,4.27320000000
-22,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
deleted file mode 100644
index a19608237..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
+++ /dev/null
@@ -1,407 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2032,R1,gasCCGT,2020,2.00000000000
-0,2034,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2036,R1,gasCCGT,2020,2.00000000000
-0,2038,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2032,R1,gasCCGT,2022,1.85640000000
-1,2034,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2036,R1,gasCCGT,2022,1.85640000000
-1,2038,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2032,R1,gasCCGT,2024,2.07980000000
-2,2034,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2036,R1,gasCCGT,2024,2.07980000000
-2,2038,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2032,R1,gasCCGT,2026,2.29760000000
-3,2034,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2036,R1,gasCCGT,2026,2.29760000000
-3,2038,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2032,R1,gasCCGT,2028,2.31150000000
-4,2034,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2036,R1,gasCCGT,2028,2.31150000000
-4,2038,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2032,R1,gasCCGT,2030,0.99560000000
-5,2034,R1,gasCCGT,2030,0.99560000000
-5,2035,R1,gasCCGT,2030,0.99560000000
-5,2036,R1,gasCCGT,2030,0.99560000000
-5,2038,R1,gasCCGT,2030,0.99560000000
-5,2040,R1,gasCCGT,2030,0.99560000000
-5,2045,R1,gasCCGT,2030,0.99560000000
-5,2046,R1,gasCCGT,2030,0.99560000000
-5,2047,R1,gasCCGT,2030,0.99560000000
-5,2050,R1,gasCCGT,2030,0.99560000000
-5,2056,R1,gasCCGT,2030,0.99560000000
-5,2057,R1,gasCCGT,2030,0.99560000000
-5,2058,R1,gasCCGT,2030,0.99560000000
-5,2059,R1,gasCCGT,2030,0.99560000000
-5,2060,R1,gasCCGT,2030,0.99560000000
-5,2061,R1,gasCCGT,2030,0.99560000000
-5,2062,R1,gasCCGT,2030,0.99560000000
-5,2063,R1,gasCCGT,2030,0.99560000000
-5,2064,R1,gasCCGT,2030,0.99560000000
-5,2065,R1,gasCCGT,2030,0.99560000000
-5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,gasCCGT,2032,0.75270000000
-6,2035,R1,gasCCGT,2032,0.75270000000
-6,2036,R1,gasCCGT,2032,0.75270000000
-6,2038,R1,gasCCGT,2032,0.75270000000
-6,2040,R1,gasCCGT,2032,0.75270000000
-6,2045,R1,gasCCGT,2032,0.75270000000
-6,2046,R1,gasCCGT,2032,0.75270000000
-6,2047,R1,gasCCGT,2032,0.75270000000
-6,2050,R1,gasCCGT,2032,0.75270000000
-6,2056,R1,gasCCGT,2032,0.75270000000
-6,2057,R1,gasCCGT,2032,0.75270000000
-6,2058,R1,gasCCGT,2032,0.75270000000
-6,2059,R1,gasCCGT,2032,0.75270000000
-6,2060,R1,gasCCGT,2032,0.75270000000
-6,2061,R1,gasCCGT,2032,0.75270000000
-6,2062,R1,gasCCGT,2032,0.75270000000
-6,2063,R1,gasCCGT,2032,0.75270000000
-6,2064,R1,gasCCGT,2032,0.75270000000
-6,2065,R1,gasCCGT,2032,0.75270000000
-6,2066,R1,gasCCGT,2032,0.75270000000
-6,2067,R1,gasCCGT,2032,0.75270000000
-6,2068,R1,gasCCGT,2032,0.75270000000
-7,2022,R1,solarPV,2020,0.27320000000
-7,2024,R1,solarPV,2020,0.27320000000
-7,2025,R1,solarPV,2020,0.27320000000
-7,2026,R1,solarPV,2020,0.27320000000
-7,2028,R1,solarPV,2020,0.27320000000
-7,2030,R1,solarPV,2020,0.27320000000
-7,2032,R1,solarPV,2020,0.27320000000
-7,2034,R1,solarPV,2020,0.27320000000
-7,2035,R1,solarPV,2020,0.27320000000
-7,2036,R1,solarPV,2020,0.27320000000
-7,2038,R1,solarPV,2020,0.27320000000
-7,2040,R1,solarPV,2020,0.27320000000
-7,2045,R1,solarPV,2020,0.27320000000
-7,2046,R1,solarPV,2020,0.27320000000
-8,2034,R1,solarPV,2032,0.54630000000
-8,2035,R1,solarPV,2032,0.54630000000
-8,2036,R1,solarPV,2032,0.54630000000
-8,2038,R1,solarPV,2032,0.54630000000
-8,2040,R1,solarPV,2032,0.54630000000
-8,2045,R1,solarPV,2032,0.54630000000
-8,2046,R1,solarPV,2032,0.54630000000
-8,2047,R1,solarPV,2032,0.54630000000
-8,2050,R1,solarPV,2032,0.54630000000
-8,2056,R1,solarPV,2032,0.54630000000
-8,2057,R1,solarPV,2032,0.54630000000
-8,2058,R1,solarPV,2032,0.54630000000
-9,2036,R1,solarPV,2034,1.63890000000
-9,2038,R1,solarPV,2034,1.63890000000
-9,2040,R1,solarPV,2034,1.63890000000
-9,2045,R1,solarPV,2034,1.63890000000
-9,2046,R1,solarPV,2034,1.63890000000
-9,2047,R1,solarPV,2034,1.63890000000
-9,2050,R1,solarPV,2034,1.63890000000
-9,2056,R1,solarPV,2034,1.63890000000
-9,2057,R1,solarPV,2034,1.63890000000
-9,2058,R1,solarPV,2034,1.63890000000
-9,2059,R1,solarPV,2034,1.63890000000
-9,2060,R1,solarPV,2034,1.63890000000
-10,2038,R1,solarPV,2036,2.24000000000
-10,2040,R1,solarPV,2036,2.24000000000
-10,2045,R1,solarPV,2036,2.24000000000
-10,2046,R1,solarPV,2036,2.24000000000
-10,2047,R1,solarPV,2036,2.24000000000
-10,2050,R1,solarPV,2036,2.24000000000
-10,2056,R1,solarPV,2036,2.24000000000
-10,2057,R1,solarPV,2036,2.24000000000
-10,2058,R1,solarPV,2036,2.24000000000
-10,2059,R1,solarPV,2036,2.24000000000
-10,2060,R1,solarPV,2036,2.24000000000
-10,2061,R1,solarPV,2036,2.24000000000
-10,2062,R1,solarPV,2036,2.24000000000
-11,2040,R1,solarPV,2038,2.24000000000
-11,2045,R1,solarPV,2038,2.24000000000
-11,2046,R1,solarPV,2038,2.24000000000
-11,2047,R1,solarPV,2038,2.24000000000
-11,2050,R1,solarPV,2038,2.24000000000
-11,2056,R1,solarPV,2038,2.24000000000
-11,2057,R1,solarPV,2038,2.24000000000
-11,2058,R1,solarPV,2038,2.24000000000
-11,2059,R1,solarPV,2038,2.24000000000
-11,2060,R1,solarPV,2038,2.24000000000
-11,2061,R1,solarPV,2038,2.24000000000
-11,2062,R1,solarPV,2038,2.24000000000
-11,2063,R1,solarPV,2038,2.24000000000
-11,2064,R1,solarPV,2038,2.24000000000
-12,2022,R1,windturbine,2020,4.00000000000
-12,2024,R1,windturbine,2020,4.00000000000
-12,2025,R1,windturbine,2020,4.00000000000
-12,2026,R1,windturbine,2020,4.00000000000
-12,2028,R1,windturbine,2020,4.00000000000
-12,2030,R1,windturbine,2020,4.00000000000
-12,2032,R1,windturbine,2020,4.00000000000
-12,2034,R1,windturbine,2020,4.00000000000
-12,2035,R1,windturbine,2020,4.00000000000
-12,2036,R1,windturbine,2020,4.00000000000
-12,2038,R1,windturbine,2020,4.00000000000
-12,2040,R1,windturbine,2020,4.00000000000
-12,2045,R1,windturbine,2020,4.00000000000
-12,2046,R1,windturbine,2020,4.00000000000
-13,2036,R1,windturbine,2034,0.60110000000
-13,2038,R1,windturbine,2034,0.60110000000
-13,2040,R1,windturbine,2034,0.60110000000
-13,2045,R1,windturbine,2034,0.60110000000
-13,2046,R1,windturbine,2034,0.60110000000
-13,2047,R1,windturbine,2034,0.60110000000
-13,2050,R1,windturbine,2034,0.60110000000
-13,2056,R1,windturbine,2034,0.60110000000
-13,2057,R1,windturbine,2034,0.60110000000
-13,2058,R1,windturbine,2034,0.60110000000
-13,2059,R1,windturbine,2034,0.60110000000
-13,2060,R1,windturbine,2034,0.60110000000
-14,2020,R2,gasCCGT,2020,1.00000000000
-14,2022,R2,gasCCGT,2020,3.00000000000
-14,2024,R2,gasCCGT,2020,3.00000000000
-14,2025,R2,gasCCGT,2020,3.00000000000
-14,2026,R2,gasCCGT,2020,2.80000000000
-14,2028,R2,gasCCGT,2020,2.40000000000
-14,2030,R2,gasCCGT,2020,2.00000000000
-14,2032,R2,gasCCGT,2020,2.00000000000
-14,2034,R2,gasCCGT,2020,2.00000000000
-14,2035,R2,gasCCGT,2020,2.00000000000
-14,2036,R2,gasCCGT,2020,2.00000000000
-14,2038,R2,gasCCGT,2020,2.00000000000
-14,2040,R2,gasCCGT,2020,2.00000000000
-14,2045,R2,gasCCGT,2020,2.00000000000
-14,2046,R2,gasCCGT,2020,2.00000000000
-14,2047,R2,gasCCGT,2020,2.00000000000
-14,2050,R2,gasCCGT,2020,2.00000000000
-14,2056,R2,gasCCGT,2020,2.00000000000
-15,2024,R2,gasCCGT,2022,1.85640000000
-15,2025,R2,gasCCGT,2022,1.85640000000
-15,2026,R2,gasCCGT,2022,1.85640000000
-15,2028,R2,gasCCGT,2022,1.85640000000
-15,2030,R2,gasCCGT,2022,1.85640000000
-15,2032,R2,gasCCGT,2022,1.85640000000
-15,2034,R2,gasCCGT,2022,1.85640000000
-15,2035,R2,gasCCGT,2022,1.85640000000
-15,2036,R2,gasCCGT,2022,1.85640000000
-15,2038,R2,gasCCGT,2022,1.85640000000
-15,2040,R2,gasCCGT,2022,1.85640000000
-15,2045,R2,gasCCGT,2022,1.85640000000
-15,2046,R2,gasCCGT,2022,1.85640000000
-15,2047,R2,gasCCGT,2022,1.85640000000
-15,2050,R2,gasCCGT,2022,1.85640000000
-15,2056,R2,gasCCGT,2022,1.85640000000
-15,2057,R2,gasCCGT,2022,1.85640000000
-15,2058,R2,gasCCGT,2022,1.85640000000
-16,2026,R2,gasCCGT,2024,2.07980000000
-16,2028,R2,gasCCGT,2024,2.07980000000
-16,2030,R2,gasCCGT,2024,2.07980000000
-16,2032,R2,gasCCGT,2024,2.07980000000
-16,2034,R2,gasCCGT,2024,2.07980000000
-16,2035,R2,gasCCGT,2024,2.07980000000
-16,2036,R2,gasCCGT,2024,2.07980000000
-16,2038,R2,gasCCGT,2024,2.07980000000
-16,2040,R2,gasCCGT,2024,2.07980000000
-16,2045,R2,gasCCGT,2024,2.07980000000
-16,2046,R2,gasCCGT,2024,2.07980000000
-16,2047,R2,gasCCGT,2024,2.07980000000
-16,2050,R2,gasCCGT,2024,2.07980000000
-16,2056,R2,gasCCGT,2024,2.07980000000
-16,2057,R2,gasCCGT,2024,2.07980000000
-16,2058,R2,gasCCGT,2024,2.07980000000
-16,2059,R2,gasCCGT,2024,2.07980000000
-16,2060,R2,gasCCGT,2024,2.07980000000
-17,2028,R2,gasCCGT,2026,2.29760000000
-17,2030,R2,gasCCGT,2026,2.29760000000
-17,2032,R2,gasCCGT,2026,2.29760000000
-17,2034,R2,gasCCGT,2026,2.29760000000
-17,2035,R2,gasCCGT,2026,2.29760000000
-17,2036,R2,gasCCGT,2026,2.29760000000
-17,2038,R2,gasCCGT,2026,2.29760000000
-17,2040,R2,gasCCGT,2026,2.29760000000
-17,2045,R2,gasCCGT,2026,2.29760000000
-17,2046,R2,gasCCGT,2026,2.29760000000
-17,2047,R2,gasCCGT,2026,2.29760000000
-17,2050,R2,gasCCGT,2026,2.29760000000
-17,2056,R2,gasCCGT,2026,2.29760000000
-17,2057,R2,gasCCGT,2026,2.29760000000
-17,2058,R2,gasCCGT,2026,2.29760000000
-17,2059,R2,gasCCGT,2026,2.29760000000
-17,2060,R2,gasCCGT,2026,2.29760000000
-17,2061,R2,gasCCGT,2026,2.29760000000
-17,2062,R2,gasCCGT,2026,2.29760000000
-18,2030,R2,gasCCGT,2028,2.31150000000
-18,2032,R2,gasCCGT,2028,2.31150000000
-18,2034,R2,gasCCGT,2028,2.31150000000
-18,2035,R2,gasCCGT,2028,2.31150000000
-18,2036,R2,gasCCGT,2028,2.31150000000
-18,2038,R2,gasCCGT,2028,2.31150000000
-18,2040,R2,gasCCGT,2028,2.31150000000
-18,2045,R2,gasCCGT,2028,2.31150000000
-18,2046,R2,gasCCGT,2028,2.31150000000
-18,2047,R2,gasCCGT,2028,2.31150000000
-18,2050,R2,gasCCGT,2028,2.31150000000
-18,2056,R2,gasCCGT,2028,2.31150000000
-18,2057,R2,gasCCGT,2028,2.31150000000
-18,2058,R2,gasCCGT,2028,2.31150000000
-18,2059,R2,gasCCGT,2028,2.31150000000
-18,2060,R2,gasCCGT,2028,2.31150000000
-18,2061,R2,gasCCGT,2028,2.31150000000
-18,2062,R2,gasCCGT,2028,2.31150000000
-18,2063,R2,gasCCGT,2028,2.31150000000
-18,2064,R2,gasCCGT,2028,2.31150000000
-19,2032,R2,gasCCGT,2030,0.99560000000
-19,2034,R2,gasCCGT,2030,0.99560000000
-19,2035,R2,gasCCGT,2030,0.99560000000
-19,2036,R2,gasCCGT,2030,0.99560000000
-19,2038,R2,gasCCGT,2030,0.99560000000
-19,2040,R2,gasCCGT,2030,0.99560000000
-19,2045,R2,gasCCGT,2030,0.99560000000
-19,2046,R2,gasCCGT,2030,0.99560000000
-19,2047,R2,gasCCGT,2030,0.99560000000
-19,2050,R2,gasCCGT,2030,0.99560000000
-19,2056,R2,gasCCGT,2030,0.99560000000
-19,2057,R2,gasCCGT,2030,0.99560000000
-19,2058,R2,gasCCGT,2030,0.99560000000
-19,2059,R2,gasCCGT,2030,0.99560000000
-19,2060,R2,gasCCGT,2030,0.99560000000
-19,2061,R2,gasCCGT,2030,0.99560000000
-19,2062,R2,gasCCGT,2030,0.99560000000
-19,2063,R2,gasCCGT,2030,0.99560000000
-19,2064,R2,gasCCGT,2030,0.99560000000
-19,2065,R2,gasCCGT,2030,0.99560000000
-19,2066,R2,gasCCGT,2030,0.99560000000
-20,2034,R2,solarPV,2032,2.24000000000
-20,2035,R2,solarPV,2032,2.24000000000
-20,2036,R2,solarPV,2032,2.24000000000
-20,2038,R2,solarPV,2032,2.24000000000
-20,2040,R2,solarPV,2032,2.24000000000
-20,2045,R2,solarPV,2032,2.24000000000
-20,2046,R2,solarPV,2032,2.24000000000
-20,2047,R2,solarPV,2032,2.24000000000
-20,2050,R2,solarPV,2032,2.24000000000
-20,2056,R2,solarPV,2032,2.24000000000
-20,2057,R2,solarPV,2032,2.24000000000
-20,2058,R2,solarPV,2032,2.24000000000
-21,2036,R2,solarPV,2034,2.24000000000
-21,2038,R2,solarPV,2034,2.24000000000
-21,2040,R2,solarPV,2034,2.24000000000
-21,2045,R2,solarPV,2034,2.24000000000
-21,2046,R2,solarPV,2034,2.24000000000
-21,2047,R2,solarPV,2034,2.24000000000
-21,2050,R2,solarPV,2034,2.24000000000
-21,2056,R2,solarPV,2034,2.24000000000
-21,2057,R2,solarPV,2034,2.24000000000
-21,2058,R2,solarPV,2034,2.24000000000
-21,2059,R2,solarPV,2034,2.24000000000
-21,2060,R2,solarPV,2034,2.24000000000
-22,2038,R2,solarPV,2036,2.24000000000
-22,2040,R2,solarPV,2036,2.24000000000
-22,2045,R2,solarPV,2036,2.24000000000
-22,2046,R2,solarPV,2036,2.24000000000
-22,2047,R2,solarPV,2036,2.24000000000
-22,2050,R2,solarPV,2036,2.24000000000
-22,2056,R2,solarPV,2036,2.24000000000
-22,2057,R2,solarPV,2036,2.24000000000
-22,2058,R2,solarPV,2036,2.24000000000
-22,2059,R2,solarPV,2036,2.24000000000
-22,2060,R2,solarPV,2036,2.24000000000
-22,2061,R2,solarPV,2036,2.24000000000
-22,2062,R2,solarPV,2036,2.24000000000
-23,2040,R2,solarPV,2038,2.24000000000
-23,2045,R2,solarPV,2038,2.24000000000
-23,2046,R2,solarPV,2038,2.24000000000
-23,2047,R2,solarPV,2038,2.24000000000
-23,2050,R2,solarPV,2038,2.24000000000
-23,2056,R2,solarPV,2038,2.24000000000
-23,2057,R2,solarPV,2038,2.24000000000
-23,2058,R2,solarPV,2038,2.24000000000
-23,2059,R2,solarPV,2038,2.24000000000
-23,2060,R2,solarPV,2038,2.24000000000
-23,2061,R2,solarPV,2038,2.24000000000
-23,2062,R2,solarPV,2038,2.24000000000
-23,2063,R2,solarPV,2038,2.24000000000
-23,2064,R2,solarPV,2038,2.24000000000
-24,2022,R2,windturbine,2020,4.27320000000
-24,2024,R2,windturbine,2020,4.27320000000
-24,2025,R2,windturbine,2020,4.27320000000
-24,2026,R2,windturbine,2020,4.27320000000
-24,2028,R2,windturbine,2020,4.27320000000
-24,2030,R2,windturbine,2020,4.27320000000
-24,2032,R2,windturbine,2020,4.27320000000
-24,2034,R2,windturbine,2020,4.27320000000
-24,2035,R2,windturbine,2020,4.27320000000
-24,2036,R2,windturbine,2020,4.27320000000
-24,2038,R2,windturbine,2020,4.27320000000
-24,2040,R2,windturbine,2020,4.27320000000
-24,2045,R2,windturbine,2020,4.27320000000
-24,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
deleted file mode 100644
index e41711ae4..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,464 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,3.00000000000
-0,2024,R1,gasCCGT,2020,3.00000000000
-0,2025,R1,gasCCGT,2020,3.00000000000
-0,2026,R1,gasCCGT,2020,2.80000000000
-0,2028,R1,gasCCGT,2020,2.40000000000
-0,2030,R1,gasCCGT,2020,2.00000000000
-0,2032,R1,gasCCGT,2020,2.00000000000
-0,2034,R1,gasCCGT,2020,2.00000000000
-0,2035,R1,gasCCGT,2020,2.00000000000
-0,2036,R1,gasCCGT,2020,2.00000000000
-0,2038,R1,gasCCGT,2020,2.00000000000
-0,2040,R1,gasCCGT,2020,2.00000000000
-0,2042,R1,gasCCGT,2020,2.00000000000
-0,2045,R1,gasCCGT,2020,2.00000000000
-0,2046,R1,gasCCGT,2020,2.00000000000
-0,2047,R1,gasCCGT,2020,2.00000000000
-0,2050,R1,gasCCGT,2020,2.00000000000
-0,2056,R1,gasCCGT,2020,2.00000000000
-1,2024,R1,gasCCGT,2022,1.85640000000
-1,2025,R1,gasCCGT,2022,1.85640000000
-1,2026,R1,gasCCGT,2022,1.85640000000
-1,2028,R1,gasCCGT,2022,1.85640000000
-1,2030,R1,gasCCGT,2022,1.85640000000
-1,2032,R1,gasCCGT,2022,1.85640000000
-1,2034,R1,gasCCGT,2022,1.85640000000
-1,2035,R1,gasCCGT,2022,1.85640000000
-1,2036,R1,gasCCGT,2022,1.85640000000
-1,2038,R1,gasCCGT,2022,1.85640000000
-1,2040,R1,gasCCGT,2022,1.85640000000
-1,2042,R1,gasCCGT,2022,1.85640000000
-1,2045,R1,gasCCGT,2022,1.85640000000
-1,2046,R1,gasCCGT,2022,1.85640000000
-1,2047,R1,gasCCGT,2022,1.85640000000
-1,2050,R1,gasCCGT,2022,1.85640000000
-1,2056,R1,gasCCGT,2022,1.85640000000
-1,2057,R1,gasCCGT,2022,1.85640000000
-1,2058,R1,gasCCGT,2022,1.85640000000
-2,2026,R1,gasCCGT,2024,2.07980000000
-2,2028,R1,gasCCGT,2024,2.07980000000
-2,2030,R1,gasCCGT,2024,2.07980000000
-2,2032,R1,gasCCGT,2024,2.07980000000
-2,2034,R1,gasCCGT,2024,2.07980000000
-2,2035,R1,gasCCGT,2024,2.07980000000
-2,2036,R1,gasCCGT,2024,2.07980000000
-2,2038,R1,gasCCGT,2024,2.07980000000
-2,2040,R1,gasCCGT,2024,2.07980000000
-2,2042,R1,gasCCGT,2024,2.07980000000
-2,2045,R1,gasCCGT,2024,2.07980000000
-2,2046,R1,gasCCGT,2024,2.07980000000
-2,2047,R1,gasCCGT,2024,2.07980000000
-2,2050,R1,gasCCGT,2024,2.07980000000
-2,2056,R1,gasCCGT,2024,2.07980000000
-2,2057,R1,gasCCGT,2024,2.07980000000
-2,2058,R1,gasCCGT,2024,2.07980000000
-2,2059,R1,gasCCGT,2024,2.07980000000
-2,2060,R1,gasCCGT,2024,2.07980000000
-3,2028,R1,gasCCGT,2026,2.29760000000
-3,2030,R1,gasCCGT,2026,2.29760000000
-3,2032,R1,gasCCGT,2026,2.29760000000
-3,2034,R1,gasCCGT,2026,2.29760000000
-3,2035,R1,gasCCGT,2026,2.29760000000
-3,2036,R1,gasCCGT,2026,2.29760000000
-3,2038,R1,gasCCGT,2026,2.29760000000
-3,2040,R1,gasCCGT,2026,2.29760000000
-3,2042,R1,gasCCGT,2026,2.29760000000
-3,2045,R1,gasCCGT,2026,2.29760000000
-3,2046,R1,gasCCGT,2026,2.29760000000
-3,2047,R1,gasCCGT,2026,2.29760000000
-3,2050,R1,gasCCGT,2026,2.29760000000
-3,2056,R1,gasCCGT,2026,2.29760000000
-3,2057,R1,gasCCGT,2026,2.29760000000
-3,2058,R1,gasCCGT,2026,2.29760000000
-3,2059,R1,gasCCGT,2026,2.29760000000
-3,2060,R1,gasCCGT,2026,2.29760000000
-3,2061,R1,gasCCGT,2026,2.29760000000
-3,2062,R1,gasCCGT,2026,2.29760000000
-4,2030,R1,gasCCGT,2028,2.31150000000
-4,2032,R1,gasCCGT,2028,2.31150000000
-4,2034,R1,gasCCGT,2028,2.31150000000
-4,2035,R1,gasCCGT,2028,2.31150000000
-4,2036,R1,gasCCGT,2028,2.31150000000
-4,2038,R1,gasCCGT,2028,2.31150000000
-4,2040,R1,gasCCGT,2028,2.31150000000
-4,2042,R1,gasCCGT,2028,2.31150000000
-4,2045,R1,gasCCGT,2028,2.31150000000
-4,2046,R1,gasCCGT,2028,2.31150000000
-4,2047,R1,gasCCGT,2028,2.31150000000
-4,2050,R1,gasCCGT,2028,2.31150000000
-4,2056,R1,gasCCGT,2028,2.31150000000
-4,2057,R1,gasCCGT,2028,2.31150000000
-4,2058,R1,gasCCGT,2028,2.31150000000
-4,2059,R1,gasCCGT,2028,2.31150000000
-4,2060,R1,gasCCGT,2028,2.31150000000
-4,2061,R1,gasCCGT,2028,2.31150000000
-4,2062,R1,gasCCGT,2028,2.31150000000
-4,2063,R1,gasCCGT,2028,2.31150000000
-4,2064,R1,gasCCGT,2028,2.31150000000
-5,2032,R1,gasCCGT,2030,0.99560000000
-5,2034,R1,gasCCGT,2030,0.99560000000
-5,2035,R1,gasCCGT,2030,0.99560000000
-5,2036,R1,gasCCGT,2030,0.99560000000
-5,2038,R1,gasCCGT,2030,0.99560000000
-5,2040,R1,gasCCGT,2030,0.99560000000
-5,2042,R1,gasCCGT,2030,0.99560000000
-5,2045,R1,gasCCGT,2030,0.99560000000
-5,2046,R1,gasCCGT,2030,0.99560000000
-5,2047,R1,gasCCGT,2030,0.99560000000
-5,2050,R1,gasCCGT,2030,0.99560000000
-5,2056,R1,gasCCGT,2030,0.99560000000
-5,2057,R1,gasCCGT,2030,0.99560000000
-5,2058,R1,gasCCGT,2030,0.99560000000
-5,2059,R1,gasCCGT,2030,0.99560000000
-5,2060,R1,gasCCGT,2030,0.99560000000
-5,2061,R1,gasCCGT,2030,0.99560000000
-5,2062,R1,gasCCGT,2030,0.99560000000
-5,2063,R1,gasCCGT,2030,0.99560000000
-5,2064,R1,gasCCGT,2030,0.99560000000
-5,2065,R1,gasCCGT,2030,0.99560000000
-5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,gasCCGT,2032,0.75270000000
-6,2035,R1,gasCCGT,2032,0.75270000000
-6,2036,R1,gasCCGT,2032,0.75270000000
-6,2038,R1,gasCCGT,2032,0.75270000000
-6,2040,R1,gasCCGT,2032,0.75270000000
-6,2042,R1,gasCCGT,2032,0.75270000000
-6,2045,R1,gasCCGT,2032,0.75270000000
-6,2046,R1,gasCCGT,2032,0.75270000000
-6,2047,R1,gasCCGT,2032,0.75270000000
-6,2050,R1,gasCCGT,2032,0.75270000000
-6,2056,R1,gasCCGT,2032,0.75270000000
-6,2057,R1,gasCCGT,2032,0.75270000000
-6,2058,R1,gasCCGT,2032,0.75270000000
-6,2059,R1,gasCCGT,2032,0.75270000000
-6,2060,R1,gasCCGT,2032,0.75270000000
-6,2061,R1,gasCCGT,2032,0.75270000000
-6,2062,R1,gasCCGT,2032,0.75270000000
-6,2063,R1,gasCCGT,2032,0.75270000000
-6,2064,R1,gasCCGT,2032,0.75270000000
-6,2065,R1,gasCCGT,2032,0.75270000000
-6,2066,R1,gasCCGT,2032,0.75270000000
-6,2067,R1,gasCCGT,2032,0.75270000000
-6,2068,R1,gasCCGT,2032,0.75270000000
-7,2022,R1,solarPV,2020,0.27320000000
-7,2024,R1,solarPV,2020,0.27320000000
-7,2025,R1,solarPV,2020,0.27320000000
-7,2026,R1,solarPV,2020,0.27320000000
-7,2028,R1,solarPV,2020,0.27320000000
-7,2030,R1,solarPV,2020,0.27320000000
-7,2032,R1,solarPV,2020,0.27320000000
-7,2034,R1,solarPV,2020,0.27320000000
-7,2035,R1,solarPV,2020,0.27320000000
-7,2036,R1,solarPV,2020,0.27320000000
-7,2038,R1,solarPV,2020,0.27320000000
-7,2040,R1,solarPV,2020,0.27320000000
-7,2042,R1,solarPV,2020,0.27320000000
-7,2045,R1,solarPV,2020,0.27320000000
-7,2046,R1,solarPV,2020,0.27320000000
-8,2034,R1,solarPV,2032,0.54630000000
-8,2035,R1,solarPV,2032,0.54630000000
-8,2036,R1,solarPV,2032,0.54630000000
-8,2038,R1,solarPV,2032,0.54630000000
-8,2040,R1,solarPV,2032,0.54630000000
-8,2042,R1,solarPV,2032,0.54630000000
-8,2045,R1,solarPV,2032,0.54630000000
-8,2046,R1,solarPV,2032,0.54630000000
-8,2047,R1,solarPV,2032,0.54630000000
-8,2050,R1,solarPV,2032,0.54630000000
-8,2056,R1,solarPV,2032,0.54630000000
-8,2057,R1,solarPV,2032,0.54630000000
-8,2058,R1,solarPV,2032,0.54630000000
-9,2036,R1,solarPV,2034,1.63890000000
-9,2038,R1,solarPV,2034,1.63890000000
-9,2040,R1,solarPV,2034,1.63890000000
-9,2042,R1,solarPV,2034,1.63890000000
-9,2045,R1,solarPV,2034,1.63890000000
-9,2046,R1,solarPV,2034,1.63890000000
-9,2047,R1,solarPV,2034,1.63890000000
-9,2050,R1,solarPV,2034,1.63890000000
-9,2056,R1,solarPV,2034,1.63890000000
-9,2057,R1,solarPV,2034,1.63890000000
-9,2058,R1,solarPV,2034,1.63890000000
-9,2059,R1,solarPV,2034,1.63890000000
-9,2060,R1,solarPV,2034,1.63890000000
-10,2038,R1,solarPV,2036,2.24000000000
-10,2040,R1,solarPV,2036,2.24000000000
-10,2042,R1,solarPV,2036,2.24000000000
-10,2045,R1,solarPV,2036,2.24000000000
-10,2046,R1,solarPV,2036,2.24000000000
-10,2047,R1,solarPV,2036,2.24000000000
-10,2050,R1,solarPV,2036,2.24000000000
-10,2056,R1,solarPV,2036,2.24000000000
-10,2057,R1,solarPV,2036,2.24000000000
-10,2058,R1,solarPV,2036,2.24000000000
-10,2059,R1,solarPV,2036,2.24000000000
-10,2060,R1,solarPV,2036,2.24000000000
-10,2061,R1,solarPV,2036,2.24000000000
-10,2062,R1,solarPV,2036,2.24000000000
-11,2040,R1,solarPV,2038,2.24000000000
-11,2042,R1,solarPV,2038,2.24000000000
-11,2045,R1,solarPV,2038,2.24000000000
-11,2046,R1,solarPV,2038,2.24000000000
-11,2047,R1,solarPV,2038,2.24000000000
-11,2050,R1,solarPV,2038,2.24000000000
-11,2056,R1,solarPV,2038,2.24000000000
-11,2057,R1,solarPV,2038,2.24000000000
-11,2058,R1,solarPV,2038,2.24000000000
-11,2059,R1,solarPV,2038,2.24000000000
-11,2060,R1,solarPV,2038,2.24000000000
-11,2061,R1,solarPV,2038,2.24000000000
-11,2062,R1,solarPV,2038,2.24000000000
-11,2063,R1,solarPV,2038,2.24000000000
-11,2064,R1,solarPV,2038,2.24000000000
-12,2042,R1,solarPV,2040,2.24000000000
-12,2045,R1,solarPV,2040,2.24000000000
-12,2046,R1,solarPV,2040,2.24000000000
-12,2047,R1,solarPV,2040,2.24000000000
-12,2050,R1,solarPV,2040,2.24000000000
-12,2056,R1,solarPV,2040,2.24000000000
-12,2057,R1,solarPV,2040,2.24000000000
-12,2058,R1,solarPV,2040,2.24000000000
-12,2059,R1,solarPV,2040,2.24000000000
-12,2060,R1,solarPV,2040,2.24000000000
-12,2061,R1,solarPV,2040,2.24000000000
-12,2062,R1,solarPV,2040,2.24000000000
-12,2063,R1,solarPV,2040,2.24000000000
-12,2064,R1,solarPV,2040,2.24000000000
-12,2065,R1,solarPV,2040,2.24000000000
-12,2066,R1,solarPV,2040,2.24000000000
-13,2022,R1,windturbine,2020,4.00000000000
-13,2024,R1,windturbine,2020,4.00000000000
-13,2025,R1,windturbine,2020,4.00000000000
-13,2026,R1,windturbine,2020,4.00000000000
-13,2028,R1,windturbine,2020,4.00000000000
-13,2030,R1,windturbine,2020,4.00000000000
-13,2032,R1,windturbine,2020,4.00000000000
-13,2034,R1,windturbine,2020,4.00000000000
-13,2035,R1,windturbine,2020,4.00000000000
-13,2036,R1,windturbine,2020,4.00000000000
-13,2038,R1,windturbine,2020,4.00000000000
-13,2040,R1,windturbine,2020,4.00000000000
-13,2042,R1,windturbine,2020,4.00000000000
-13,2045,R1,windturbine,2020,4.00000000000
-13,2046,R1,windturbine,2020,4.00000000000
-14,2036,R1,windturbine,2034,0.60110000000
-14,2038,R1,windturbine,2034,0.60110000000
-14,2040,R1,windturbine,2034,0.60110000000
-14,2042,R1,windturbine,2034,0.60110000000
-14,2045,R1,windturbine,2034,0.60110000000
-14,2046,R1,windturbine,2034,0.60110000000
-14,2047,R1,windturbine,2034,0.60110000000
-14,2050,R1,windturbine,2034,0.60110000000
-14,2056,R1,windturbine,2034,0.60110000000
-14,2057,R1,windturbine,2034,0.60110000000
-14,2058,R1,windturbine,2034,0.60110000000
-14,2059,R1,windturbine,2034,0.60110000000
-14,2060,R1,windturbine,2034,0.60110000000
-15,2020,R2,gasCCGT,2020,1.00000000000
-15,2022,R2,gasCCGT,2020,3.00000000000
-15,2024,R2,gasCCGT,2020,3.00000000000
-15,2025,R2,gasCCGT,2020,3.00000000000
-15,2026,R2,gasCCGT,2020,2.80000000000
-15,2028,R2,gasCCGT,2020,2.40000000000
-15,2030,R2,gasCCGT,2020,2.00000000000
-15,2032,R2,gasCCGT,2020,2.00000000000
-15,2034,R2,gasCCGT,2020,2.00000000000
-15,2035,R2,gasCCGT,2020,2.00000000000
-15,2036,R2,gasCCGT,2020,2.00000000000
-15,2038,R2,gasCCGT,2020,2.00000000000
-15,2040,R2,gasCCGT,2020,2.00000000000
-15,2042,R2,gasCCGT,2020,2.00000000000
-15,2045,R2,gasCCGT,2020,2.00000000000
-15,2046,R2,gasCCGT,2020,2.00000000000
-15,2047,R2,gasCCGT,2020,2.00000000000
-15,2050,R2,gasCCGT,2020,2.00000000000
-15,2056,R2,gasCCGT,2020,2.00000000000
-16,2024,R2,gasCCGT,2022,1.85640000000
-16,2025,R2,gasCCGT,2022,1.85640000000
-16,2026,R2,gasCCGT,2022,1.85640000000
-16,2028,R2,gasCCGT,2022,1.85640000000
-16,2030,R2,gasCCGT,2022,1.85640000000
-16,2032,R2,gasCCGT,2022,1.85640000000
-16,2034,R2,gasCCGT,2022,1.85640000000
-16,2035,R2,gasCCGT,2022,1.85640000000
-16,2036,R2,gasCCGT,2022,1.85640000000
-16,2038,R2,gasCCGT,2022,1.85640000000
-16,2040,R2,gasCCGT,2022,1.85640000000
-16,2042,R2,gasCCGT,2022,1.85640000000
-16,2045,R2,gasCCGT,2022,1.85640000000
-16,2046,R2,gasCCGT,2022,1.85640000000
-16,2047,R2,gasCCGT,2022,1.85640000000
-16,2050,R2,gasCCGT,2022,1.85640000000
-16,2056,R2,gasCCGT,2022,1.85640000000
-16,2057,R2,gasCCGT,2022,1.85640000000
-16,2058,R2,gasCCGT,2022,1.85640000000
-17,2026,R2,gasCCGT,2024,2.07980000000
-17,2028,R2,gasCCGT,2024,2.07980000000
-17,2030,R2,gasCCGT,2024,2.07980000000
-17,2032,R2,gasCCGT,2024,2.07980000000
-17,2034,R2,gasCCGT,2024,2.07980000000
-17,2035,R2,gasCCGT,2024,2.07980000000
-17,2036,R2,gasCCGT,2024,2.07980000000
-17,2038,R2,gasCCGT,2024,2.07980000000
-17,2040,R2,gasCCGT,2024,2.07980000000
-17,2042,R2,gasCCGT,2024,2.07980000000
-17,2045,R2,gasCCGT,2024,2.07980000000
-17,2046,R2,gasCCGT,2024,2.07980000000
-17,2047,R2,gasCCGT,2024,2.07980000000
-17,2050,R2,gasCCGT,2024,2.07980000000
-17,2056,R2,gasCCGT,2024,2.07980000000
-17,2057,R2,gasCCGT,2024,2.07980000000
-17,2058,R2,gasCCGT,2024,2.07980000000
-17,2059,R2,gasCCGT,2024,2.07980000000
-17,2060,R2,gasCCGT,2024,2.07980000000
-18,2028,R2,gasCCGT,2026,2.29760000000
-18,2030,R2,gasCCGT,2026,2.29760000000
-18,2032,R2,gasCCGT,2026,2.29760000000
-18,2034,R2,gasCCGT,2026,2.29760000000
-18,2035,R2,gasCCGT,2026,2.29760000000
-18,2036,R2,gasCCGT,2026,2.29760000000
-18,2038,R2,gasCCGT,2026,2.29760000000
-18,2040,R2,gasCCGT,2026,2.29760000000
-18,2042,R2,gasCCGT,2026,2.29760000000
-18,2045,R2,gasCCGT,2026,2.29760000000
-18,2046,R2,gasCCGT,2026,2.29760000000
-18,2047,R2,gasCCGT,2026,2.29760000000
-18,2050,R2,gasCCGT,2026,2.29760000000
-18,2056,R2,gasCCGT,2026,2.29760000000
-18,2057,R2,gasCCGT,2026,2.29760000000
-18,2058,R2,gasCCGT,2026,2.29760000000
-18,2059,R2,gasCCGT,2026,2.29760000000
-18,2060,R2,gasCCGT,2026,2.29760000000
-18,2061,R2,gasCCGT,2026,2.29760000000
-18,2062,R2,gasCCGT,2026,2.29760000000
-19,2030,R2,gasCCGT,2028,2.31150000000
-19,2032,R2,gasCCGT,2028,2.31150000000
-19,2034,R2,gasCCGT,2028,2.31150000000
-19,2035,R2,gasCCGT,2028,2.31150000000
-19,2036,R2,gasCCGT,2028,2.31150000000
-19,2038,R2,gasCCGT,2028,2.31150000000
-19,2040,R2,gasCCGT,2028,2.31150000000
-19,2042,R2,gasCCGT,2028,2.31150000000
-19,2045,R2,gasCCGT,2028,2.31150000000
-19,2046,R2,gasCCGT,2028,2.31150000000
-19,2047,R2,gasCCGT,2028,2.31150000000
-19,2050,R2,gasCCGT,2028,2.31150000000
-19,2056,R2,gasCCGT,2028,2.31150000000
-19,2057,R2,gasCCGT,2028,2.31150000000
-19,2058,R2,gasCCGT,2028,2.31150000000
-19,2059,R2,gasCCGT,2028,2.31150000000
-19,2060,R2,gasCCGT,2028,2.31150000000
-19,2061,R2,gasCCGT,2028,2.31150000000
-19,2062,R2,gasCCGT,2028,2.31150000000
-19,2063,R2,gasCCGT,2028,2.31150000000
-19,2064,R2,gasCCGT,2028,2.31150000000
-20,2032,R2,gasCCGT,2030,0.99560000000
-20,2034,R2,gasCCGT,2030,0.99560000000
-20,2035,R2,gasCCGT,2030,0.99560000000
-20,2036,R2,gasCCGT,2030,0.99560000000
-20,2038,R2,gasCCGT,2030,0.99560000000
-20,2040,R2,gasCCGT,2030,0.99560000000
-20,2042,R2,gasCCGT,2030,0.99560000000
-20,2045,R2,gasCCGT,2030,0.99560000000
-20,2046,R2,gasCCGT,2030,0.99560000000
-20,2047,R2,gasCCGT,2030,0.99560000000
-20,2050,R2,gasCCGT,2030,0.99560000000
-20,2056,R2,gasCCGT,2030,0.99560000000
-20,2057,R2,gasCCGT,2030,0.99560000000
-20,2058,R2,gasCCGT,2030,0.99560000000
-20,2059,R2,gasCCGT,2030,0.99560000000
-20,2060,R2,gasCCGT,2030,0.99560000000
-20,2061,R2,gasCCGT,2030,0.99560000000
-20,2062,R2,gasCCGT,2030,0.99560000000
-20,2063,R2,gasCCGT,2030,0.99560000000
-20,2064,R2,gasCCGT,2030,0.99560000000
-20,2065,R2,gasCCGT,2030,0.99560000000
-20,2066,R2,gasCCGT,2030,0.99560000000
-21,2034,R2,solarPV,2032,2.24000000000
-21,2035,R2,solarPV,2032,2.24000000000
-21,2036,R2,solarPV,2032,2.24000000000
-21,2038,R2,solarPV,2032,2.24000000000
-21,2040,R2,solarPV,2032,2.24000000000
-21,2042,R2,solarPV,2032,2.24000000000
-21,2045,R2,solarPV,2032,2.24000000000
-21,2046,R2,solarPV,2032,2.24000000000
-21,2047,R2,solarPV,2032,2.24000000000
-21,2050,R2,solarPV,2032,2.24000000000
-21,2056,R2,solarPV,2032,2.24000000000
-21,2057,R2,solarPV,2032,2.24000000000
-21,2058,R2,solarPV,2032,2.24000000000
-22,2036,R2,solarPV,2034,2.24000000000
-22,2038,R2,solarPV,2034,2.24000000000
-22,2040,R2,solarPV,2034,2.24000000000
-22,2042,R2,solarPV,2034,2.24000000000
-22,2045,R2,solarPV,2034,2.24000000000
-22,2046,R2,solarPV,2034,2.24000000000
-22,2047,R2,solarPV,2034,2.24000000000
-22,2050,R2,solarPV,2034,2.24000000000
-22,2056,R2,solarPV,2034,2.24000000000
-22,2057,R2,solarPV,2034,2.24000000000
-22,2058,R2,solarPV,2034,2.24000000000
-22,2059,R2,solarPV,2034,2.24000000000
-22,2060,R2,solarPV,2034,2.24000000000
-23,2038,R2,solarPV,2036,2.24000000000
-23,2040,R2,solarPV,2036,2.24000000000
-23,2042,R2,solarPV,2036,2.24000000000
-23,2045,R2,solarPV,2036,2.24000000000
-23,2046,R2,solarPV,2036,2.24000000000
-23,2047,R2,solarPV,2036,2.24000000000
-23,2050,R2,solarPV,2036,2.24000000000
-23,2056,R2,solarPV,2036,2.24000000000
-23,2057,R2,solarPV,2036,2.24000000000
-23,2058,R2,solarPV,2036,2.24000000000
-23,2059,R2,solarPV,2036,2.24000000000
-23,2060,R2,solarPV,2036,2.24000000000
-23,2061,R2,solarPV,2036,2.24000000000
-23,2062,R2,solarPV,2036,2.24000000000
-24,2040,R2,solarPV,2038,2.24000000000
-24,2042,R2,solarPV,2038,2.24000000000
-24,2045,R2,solarPV,2038,2.24000000000
-24,2046,R2,solarPV,2038,2.24000000000
-24,2047,R2,solarPV,2038,2.24000000000
-24,2050,R2,solarPV,2038,2.24000000000
-24,2056,R2,solarPV,2038,2.24000000000
-24,2057,R2,solarPV,2038,2.24000000000
-24,2058,R2,solarPV,2038,2.24000000000
-24,2059,R2,solarPV,2038,2.24000000000
-24,2060,R2,solarPV,2038,2.24000000000
-24,2061,R2,solarPV,2038,2.24000000000
-24,2062,R2,solarPV,2038,2.24000000000
-24,2063,R2,solarPV,2038,2.24000000000
-24,2064,R2,solarPV,2038,2.24000000000
-25,2042,R2,solarPV,2040,2.24000000000
-25,2045,R2,solarPV,2040,2.24000000000
-25,2046,R2,solarPV,2040,2.24000000000
-25,2047,R2,solarPV,2040,2.24000000000
-25,2050,R2,solarPV,2040,2.24000000000
-25,2056,R2,solarPV,2040,2.24000000000
-25,2057,R2,solarPV,2040,2.24000000000
-25,2058,R2,solarPV,2040,2.24000000000
-25,2059,R2,solarPV,2040,2.24000000000
-25,2060,R2,solarPV,2040,2.24000000000
-25,2061,R2,solarPV,2040,2.24000000000
-25,2062,R2,solarPV,2040,2.24000000000
-25,2063,R2,solarPV,2040,2.24000000000
-25,2064,R2,solarPV,2040,2.24000000000
-25,2065,R2,solarPV,2040,2.24000000000
-25,2066,R2,solarPV,2040,2.24000000000
-26,2022,R2,windturbine,2020,4.27320000000
-26,2024,R2,windturbine,2020,4.27320000000
-26,2025,R2,windturbine,2020,4.27320000000
-26,2026,R2,windturbine,2020,4.27320000000
-26,2028,R2,windturbine,2020,4.27320000000
-26,2030,R2,windturbine,2020,4.27320000000
-26,2032,R2,windturbine,2020,4.27320000000
-26,2034,R2,windturbine,2020,4.27320000000
-26,2035,R2,windturbine,2020,4.27320000000
-26,2036,R2,windturbine,2020,4.27320000000
-26,2038,R2,windturbine,2020,4.27320000000
-26,2040,R2,windturbine,2020,4.27320000000
-26,2042,R2,windturbine,2020,4.27320000000
-26,2045,R2,windturbine,2020,4.27320000000
-26,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..f3c678b4c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity.csv
@@ -0,0 +1,91 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+2,10,2020,R2,gasboiler,2020
+0,8,2020,R1,gasboiler,2022
+1,11,2020,R1,heatpump,2022
+3,8,2020,R2,gasboiler,2022
+4,11,2020,R2,heatpump,2022
+0,6,2020,R1,gasboiler,2024
+1,11,2020,R1,heatpump,2024
+2,4,2022,R1,heatpump,2024
+4,6,2020,R2,gasboiler,2024
+5,11,2020,R2,heatpump,2024
+6,4,2022,R2,heatpump,2024
+0,4,2020,R1,gasboiler,2026
+1,11,2020,R1,heatpump,2026
+2,4,2022,R1,heatpump,2026
+3,4,2024,R1,heatpump,2026
+5,4,2020,R2,gasboiler,2026
+6,11,2020,R2,heatpump,2026
+7,4,2022,R2,heatpump,2026
+8,4,2024,R2,heatpump,2026
+0,2,2020,R1,gasboiler,2028
+1,11,2020,R1,heatpump,2028
+2,4,2022,R1,heatpump,2028
+3,4,2024,R1,heatpump,2028
+4,4,2026,R1,heatpump,2028
+6,2,2020,R2,gasboiler,2028
+7,11,2020,R2,heatpump,2028
+8,4,2022,R2,heatpump,2028
+9,4,2024,R2,heatpump,2028
+10,4,2026,R2,heatpump,2028
+1,11,2020,R1,heatpump,2030
+2,4,2022,R1,heatpump,2030
+3,4,2024,R1,heatpump,2030
+4,4,2026,R1,heatpump,2030
+5,5,2028,R1,heatpump,2030
+8,11,2020,R2,heatpump,2030
+9,4,2022,R2,heatpump,2030
+10,4,2024,R2,heatpump,2030
+11,4,2026,R2,heatpump,2030
+12,5,2028,R2,heatpump,2030
+2,4,2022,R1,heatpump,2032
+3,4,2024,R1,heatpump,2032
+4,4,2026,R1,heatpump,2032
+5,5,2028,R1,heatpump,2032
+6,13,2030,R1,heatpump,2032
+10,4,2022,R2,heatpump,2032
+11,4,2024,R2,heatpump,2032
+12,4,2026,R2,heatpump,2032
+13,5,2028,R2,heatpump,2032
+14,13,2030,R2,heatpump,2032
+3,4,2024,R1,heatpump,2034
+4,4,2026,R1,heatpump,2034
+5,5,2028,R1,heatpump,2034
+6,13,2030,R1,heatpump,2034
+7,6,2032,R1,heatpump,2034
+12,4,2024,R2,heatpump,2034
+13,4,2026,R2,heatpump,2034
+14,5,2028,R2,heatpump,2034
+15,13,2030,R2,heatpump,2034
+16,6,2032,R2,heatpump,2034
+4,4,2026,R1,heatpump,2036
+5,5,2028,R1,heatpump,2036
+6,13,2030,R1,heatpump,2036
+7,6,2032,R1,heatpump,2036
+8,6,2034,R1,heatpump,2036
+14,4,2026,R2,heatpump,2036
+15,5,2028,R2,heatpump,2036
+16,13,2030,R2,heatpump,2036
+17,6,2032,R2,heatpump,2036
+18,6,2034,R2,heatpump,2036
+5,5,2028,R1,heatpump,2038
+6,13,2030,R1,heatpump,2038
+7,6,2032,R1,heatpump,2038
+8,6,2034,R1,heatpump,2038
+9,6,2036,R1,heatpump,2038
+16,5,2028,R2,heatpump,2038
+17,13,2030,R2,heatpump,2038
+18,6,2032,R2,heatpump,2038
+19,6,2034,R2,heatpump,2038
+20,6,2036,R2,heatpump,2038
+6,13,2030,R1,heatpump,2040
+7,6,2032,R1,heatpump,2040
+8,6,2034,R1,heatpump,2040
+9,6,2036,R1,heatpump,2040
+10,8,2038,R1,heatpump,2040
+18,13,2030,R2,heatpump,2040
+19,6,2032,R2,heatpump,2040
+20,6,2034,R2,heatpump,2040
+21,6,2036,R2,heatpump,2040
+22,8,2038,R2,heatpump,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 40efdf7b9..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2025,R1,gasboiler,2020,5
-1,2022,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2020,R2,gasboiler,2020,10
-2,2022,R2,gasboiler,2020,8
-2,2025,R2,gasboiler,2020,5
-3,2022,R2,heatpump,2020,11
-3,2025,R2,heatpump,2020,11
-3,2030,R2,heatpump,2020,11
-3,2031,R2,heatpump,2020,11
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
deleted file mode 100644
index 57a5410ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2020,R2,gasboiler,2020,10
-3,2022,R2,gasboiler,2020,8
-3,2024,R2,gasboiler,2020,6
-3,2025,R2,gasboiler,2020,5
-4,2022,R2,heatpump,2020,11
-4,2024,R2,heatpump,2020,11
-4,2025,R2,heatpump,2020,11
-4,2030,R2,heatpump,2020,11
-4,2031,R2,heatpump,2020,11
-5,2024,R2,heatpump,2022,4
-5,2025,R2,heatpump,2022,4
-5,2030,R2,heatpump,2022,4
-5,2031,R2,heatpump,2022,4
-5,2032,R2,heatpump,2022,4
-5,2033,R2,heatpump,2022,4
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
deleted file mode 100644
index f676b68ff..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2020,R2,gasboiler,2020,10
-4,2022,R2,gasboiler,2020,8
-4,2024,R2,gasboiler,2020,6
-4,2025,R2,gasboiler,2020,5
-4,2026,R2,gasboiler,2020,4
-5,2022,R2,heatpump,2020,11
-5,2024,R2,heatpump,2020,11
-5,2025,R2,heatpump,2020,11
-5,2026,R2,heatpump,2020,11
-5,2030,R2,heatpump,2020,11
-5,2031,R2,heatpump,2020,11
-6,2024,R2,heatpump,2022,4
-6,2025,R2,heatpump,2022,4
-6,2026,R2,heatpump,2022,4
-6,2030,R2,heatpump,2022,4
-6,2031,R2,heatpump,2022,4
-6,2032,R2,heatpump,2022,4
-6,2033,R2,heatpump,2022,4
-7,2026,R2,heatpump,2024,4
-7,2030,R2,heatpump,2024,4
-7,2031,R2,heatpump,2024,4
-7,2032,R2,heatpump,2024,4
-7,2033,R2,heatpump,2024,4
-7,2034,R2,heatpump,2024,4
-7,2035,R2,heatpump,2024,4
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
deleted file mode 100644
index e4033d1c6..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
+++ /dev/null
@@ -1,77 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2020,R2,gasboiler,2020,10
-5,2022,R2,gasboiler,2020,8
-5,2024,R2,gasboiler,2020,6
-5,2025,R2,gasboiler,2020,5
-5,2026,R2,gasboiler,2020,4
-5,2028,R2,gasboiler,2020,2
-6,2022,R2,heatpump,2020,11
-6,2024,R2,heatpump,2020,11
-6,2025,R2,heatpump,2020,11
-6,2026,R2,heatpump,2020,11
-6,2028,R2,heatpump,2020,11
-6,2030,R2,heatpump,2020,11
-6,2031,R2,heatpump,2020,11
-7,2024,R2,heatpump,2022,4
-7,2025,R2,heatpump,2022,4
-7,2026,R2,heatpump,2022,4
-7,2028,R2,heatpump,2022,4
-7,2030,R2,heatpump,2022,4
-7,2031,R2,heatpump,2022,4
-7,2032,R2,heatpump,2022,4
-7,2033,R2,heatpump,2022,4
-8,2026,R2,heatpump,2024,4
-8,2028,R2,heatpump,2024,4
-8,2030,R2,heatpump,2024,4
-8,2031,R2,heatpump,2024,4
-8,2032,R2,heatpump,2024,4
-8,2033,R2,heatpump,2024,4
-8,2034,R2,heatpump,2024,4
-8,2035,R2,heatpump,2024,4
-9,2028,R2,heatpump,2026,4
-9,2030,R2,heatpump,2026,4
-9,2031,R2,heatpump,2026,4
-9,2032,R2,heatpump,2026,4
-9,2033,R2,heatpump,2026,4
-9,2034,R2,heatpump,2026,4
-9,2035,R2,heatpump,2026,4
-9,2036,R2,heatpump,2026,4
-9,2037,R2,heatpump,2026,4
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
deleted file mode 100644
index 7327d2198..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2020,R2,gasboiler,2020,10
-6,2022,R2,gasboiler,2020,8
-6,2024,R2,gasboiler,2020,6
-6,2025,R2,gasboiler,2020,5
-6,2026,R2,gasboiler,2020,4
-6,2028,R2,gasboiler,2020,2
-7,2022,R2,heatpump,2020,11
-7,2024,R2,heatpump,2020,11
-7,2025,R2,heatpump,2020,11
-7,2026,R2,heatpump,2020,11
-7,2028,R2,heatpump,2020,11
-7,2030,R2,heatpump,2020,11
-7,2031,R2,heatpump,2020,11
-8,2024,R2,heatpump,2022,4
-8,2025,R2,heatpump,2022,4
-8,2026,R2,heatpump,2022,4
-8,2028,R2,heatpump,2022,4
-8,2030,R2,heatpump,2022,4
-8,2031,R2,heatpump,2022,4
-8,2032,R2,heatpump,2022,4
-8,2033,R2,heatpump,2022,4
-9,2026,R2,heatpump,2024,4
-9,2028,R2,heatpump,2024,4
-9,2030,R2,heatpump,2024,4
-9,2031,R2,heatpump,2024,4
-9,2032,R2,heatpump,2024,4
-9,2033,R2,heatpump,2024,4
-9,2034,R2,heatpump,2024,4
-9,2035,R2,heatpump,2024,4
-10,2028,R2,heatpump,2026,4
-10,2030,R2,heatpump,2026,4
-10,2031,R2,heatpump,2026,4
-10,2032,R2,heatpump,2026,4
-10,2033,R2,heatpump,2026,4
-10,2034,R2,heatpump,2026,4
-10,2035,R2,heatpump,2026,4
-10,2036,R2,heatpump,2026,4
-10,2037,R2,heatpump,2026,4
-11,2030,R2,heatpump,2028,5
-11,2031,R2,heatpump,2028,5
-11,2032,R2,heatpump,2028,5
-11,2033,R2,heatpump,2028,5
-11,2034,R2,heatpump,2028,5
-11,2035,R2,heatpump,2028,5
-11,2036,R2,heatpump,2028,5
-11,2037,R2,heatpump,2028,5
-11,2038,R2,heatpump,2028,5
-11,2039,R2,heatpump,2028,5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 9accbd46c..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,117 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2032,R1,heatpump,2030,13
-6,2033,R1,heatpump,2030,13
-6,2034,R1,heatpump,2030,13
-6,2035,R1,heatpump,2030,13
-6,2036,R1,heatpump,2030,13
-6,2037,R1,heatpump,2030,13
-6,2038,R1,heatpump,2030,13
-6,2039,R1,heatpump,2030,13
-6,2040,R1,heatpump,2030,13
-6,2041,R1,heatpump,2030,13
-7,2020,R2,gasboiler,2020,10
-7,2022,R2,gasboiler,2020,8
-7,2024,R2,gasboiler,2020,6
-7,2025,R2,gasboiler,2020,5
-7,2026,R2,gasboiler,2020,4
-7,2028,R2,gasboiler,2020,2
-8,2022,R2,heatpump,2020,11
-8,2024,R2,heatpump,2020,11
-8,2025,R2,heatpump,2020,11
-8,2026,R2,heatpump,2020,11
-8,2028,R2,heatpump,2020,11
-8,2030,R2,heatpump,2020,11
-8,2031,R2,heatpump,2020,11
-9,2024,R2,heatpump,2022,4
-9,2025,R2,heatpump,2022,4
-9,2026,R2,heatpump,2022,4
-9,2028,R2,heatpump,2022,4
-9,2030,R2,heatpump,2022,4
-9,2031,R2,heatpump,2022,4
-9,2032,R2,heatpump,2022,4
-9,2033,R2,heatpump,2022,4
-10,2026,R2,heatpump,2024,4
-10,2028,R2,heatpump,2024,4
-10,2030,R2,heatpump,2024,4
-10,2031,R2,heatpump,2024,4
-10,2032,R2,heatpump,2024,4
-10,2033,R2,heatpump,2024,4
-10,2034,R2,heatpump,2024,4
-10,2035,R2,heatpump,2024,4
-11,2028,R2,heatpump,2026,4
-11,2030,R2,heatpump,2026,4
-11,2031,R2,heatpump,2026,4
-11,2032,R2,heatpump,2026,4
-11,2033,R2,heatpump,2026,4
-11,2034,R2,heatpump,2026,4
-11,2035,R2,heatpump,2026,4
-11,2036,R2,heatpump,2026,4
-11,2037,R2,heatpump,2026,4
-12,2030,R2,heatpump,2028,5
-12,2031,R2,heatpump,2028,5
-12,2032,R2,heatpump,2028,5
-12,2033,R2,heatpump,2028,5
-12,2034,R2,heatpump,2028,5
-12,2035,R2,heatpump,2028,5
-12,2036,R2,heatpump,2028,5
-12,2037,R2,heatpump,2028,5
-12,2038,R2,heatpump,2028,5
-12,2039,R2,heatpump,2028,5
-13,2032,R2,heatpump,2030,13
-13,2033,R2,heatpump,2030,13
-13,2034,R2,heatpump,2030,13
-13,2035,R2,heatpump,2030,13
-13,2036,R2,heatpump,2030,13
-13,2037,R2,heatpump,2030,13
-13,2038,R2,heatpump,2030,13
-13,2039,R2,heatpump,2030,13
-13,2040,R2,heatpump,2030,13
-13,2041,R2,heatpump,2030,13
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
deleted file mode 100644
index eb37b41d0..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
+++ /dev/null
@@ -1,137 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2032,R1,heatpump,2030,13
-6,2033,R1,heatpump,2030,13
-6,2034,R1,heatpump,2030,13
-6,2035,R1,heatpump,2030,13
-6,2036,R1,heatpump,2030,13
-6,2037,R1,heatpump,2030,13
-6,2038,R1,heatpump,2030,13
-6,2039,R1,heatpump,2030,13
-6,2040,R1,heatpump,2030,13
-6,2041,R1,heatpump,2030,13
-7,2034,R1,heatpump,2032,6
-7,2035,R1,heatpump,2032,6
-7,2036,R1,heatpump,2032,6
-7,2037,R1,heatpump,2032,6
-7,2038,R1,heatpump,2032,6
-7,2039,R1,heatpump,2032,6
-7,2040,R1,heatpump,2032,6
-7,2041,R1,heatpump,2032,6
-7,2042,R1,heatpump,2032,6
-7,2043,R1,heatpump,2032,6
-8,2020,R2,gasboiler,2020,10
-8,2022,R2,gasboiler,2020,8
-8,2024,R2,gasboiler,2020,6
-8,2025,R2,gasboiler,2020,5
-8,2026,R2,gasboiler,2020,4
-8,2028,R2,gasboiler,2020,2
-9,2022,R2,heatpump,2020,11
-9,2024,R2,heatpump,2020,11
-9,2025,R2,heatpump,2020,11
-9,2026,R2,heatpump,2020,11
-9,2028,R2,heatpump,2020,11
-9,2030,R2,heatpump,2020,11
-9,2031,R2,heatpump,2020,11
-10,2024,R2,heatpump,2022,4
-10,2025,R2,heatpump,2022,4
-10,2026,R2,heatpump,2022,4
-10,2028,R2,heatpump,2022,4
-10,2030,R2,heatpump,2022,4
-10,2031,R2,heatpump,2022,4
-10,2032,R2,heatpump,2022,4
-10,2033,R2,heatpump,2022,4
-11,2026,R2,heatpump,2024,4
-11,2028,R2,heatpump,2024,4
-11,2030,R2,heatpump,2024,4
-11,2031,R2,heatpump,2024,4
-11,2032,R2,heatpump,2024,4
-11,2033,R2,heatpump,2024,4
-11,2034,R2,heatpump,2024,4
-11,2035,R2,heatpump,2024,4
-12,2028,R2,heatpump,2026,4
-12,2030,R2,heatpump,2026,4
-12,2031,R2,heatpump,2026,4
-12,2032,R2,heatpump,2026,4
-12,2033,R2,heatpump,2026,4
-12,2034,R2,heatpump,2026,4
-12,2035,R2,heatpump,2026,4
-12,2036,R2,heatpump,2026,4
-12,2037,R2,heatpump,2026,4
-13,2030,R2,heatpump,2028,5
-13,2031,R2,heatpump,2028,5
-13,2032,R2,heatpump,2028,5
-13,2033,R2,heatpump,2028,5
-13,2034,R2,heatpump,2028,5
-13,2035,R2,heatpump,2028,5
-13,2036,R2,heatpump,2028,5
-13,2037,R2,heatpump,2028,5
-13,2038,R2,heatpump,2028,5
-13,2039,R2,heatpump,2028,5
-14,2032,R2,heatpump,2030,13
-14,2033,R2,heatpump,2030,13
-14,2034,R2,heatpump,2030,13
-14,2035,R2,heatpump,2030,13
-14,2036,R2,heatpump,2030,13
-14,2037,R2,heatpump,2030,13
-14,2038,R2,heatpump,2030,13
-14,2039,R2,heatpump,2030,13
-14,2040,R2,heatpump,2030,13
-14,2041,R2,heatpump,2030,13
-15,2034,R2,heatpump,2032,6
-15,2035,R2,heatpump,2032,6
-15,2036,R2,heatpump,2032,6
-15,2037,R2,heatpump,2032,6
-15,2038,R2,heatpump,2032,6
-15,2039,R2,heatpump,2032,6
-15,2040,R2,heatpump,2032,6
-15,2041,R2,heatpump,2032,6
-15,2042,R2,heatpump,2032,6
-15,2043,R2,heatpump,2032,6
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
deleted file mode 100644
index 4254a6b60..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
+++ /dev/null
@@ -1,157 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2032,R1,heatpump,2030,13
-6,2033,R1,heatpump,2030,13
-6,2034,R1,heatpump,2030,13
-6,2035,R1,heatpump,2030,13
-6,2036,R1,heatpump,2030,13
-6,2037,R1,heatpump,2030,13
-6,2038,R1,heatpump,2030,13
-6,2039,R1,heatpump,2030,13
-6,2040,R1,heatpump,2030,13
-6,2041,R1,heatpump,2030,13
-7,2034,R1,heatpump,2032,6
-7,2035,R1,heatpump,2032,6
-7,2036,R1,heatpump,2032,6
-7,2037,R1,heatpump,2032,6
-7,2038,R1,heatpump,2032,6
-7,2039,R1,heatpump,2032,6
-7,2040,R1,heatpump,2032,6
-7,2041,R1,heatpump,2032,6
-7,2042,R1,heatpump,2032,6
-7,2043,R1,heatpump,2032,6
-8,2036,R1,heatpump,2034,6
-8,2037,R1,heatpump,2034,6
-8,2038,R1,heatpump,2034,6
-8,2039,R1,heatpump,2034,6
-8,2040,R1,heatpump,2034,6
-8,2041,R1,heatpump,2034,6
-8,2042,R1,heatpump,2034,6
-8,2043,R1,heatpump,2034,6
-8,2044,R1,heatpump,2034,6
-8,2045,R1,heatpump,2034,6
-9,2020,R2,gasboiler,2020,10
-9,2022,R2,gasboiler,2020,8
-9,2024,R2,gasboiler,2020,6
-9,2025,R2,gasboiler,2020,5
-9,2026,R2,gasboiler,2020,4
-9,2028,R2,gasboiler,2020,2
-10,2022,R2,heatpump,2020,11
-10,2024,R2,heatpump,2020,11
-10,2025,R2,heatpump,2020,11
-10,2026,R2,heatpump,2020,11
-10,2028,R2,heatpump,2020,11
-10,2030,R2,heatpump,2020,11
-10,2031,R2,heatpump,2020,11
-11,2024,R2,heatpump,2022,4
-11,2025,R2,heatpump,2022,4
-11,2026,R2,heatpump,2022,4
-11,2028,R2,heatpump,2022,4
-11,2030,R2,heatpump,2022,4
-11,2031,R2,heatpump,2022,4
-11,2032,R2,heatpump,2022,4
-11,2033,R2,heatpump,2022,4
-12,2026,R2,heatpump,2024,4
-12,2028,R2,heatpump,2024,4
-12,2030,R2,heatpump,2024,4
-12,2031,R2,heatpump,2024,4
-12,2032,R2,heatpump,2024,4
-12,2033,R2,heatpump,2024,4
-12,2034,R2,heatpump,2024,4
-12,2035,R2,heatpump,2024,4
-13,2028,R2,heatpump,2026,4
-13,2030,R2,heatpump,2026,4
-13,2031,R2,heatpump,2026,4
-13,2032,R2,heatpump,2026,4
-13,2033,R2,heatpump,2026,4
-13,2034,R2,heatpump,2026,4
-13,2035,R2,heatpump,2026,4
-13,2036,R2,heatpump,2026,4
-13,2037,R2,heatpump,2026,4
-14,2030,R2,heatpump,2028,5
-14,2031,R2,heatpump,2028,5
-14,2032,R2,heatpump,2028,5
-14,2033,R2,heatpump,2028,5
-14,2034,R2,heatpump,2028,5
-14,2035,R2,heatpump,2028,5
-14,2036,R2,heatpump,2028,5
-14,2037,R2,heatpump,2028,5
-14,2038,R2,heatpump,2028,5
-14,2039,R2,heatpump,2028,5
-15,2032,R2,heatpump,2030,13
-15,2033,R2,heatpump,2030,13
-15,2034,R2,heatpump,2030,13
-15,2035,R2,heatpump,2030,13
-15,2036,R2,heatpump,2030,13
-15,2037,R2,heatpump,2030,13
-15,2038,R2,heatpump,2030,13
-15,2039,R2,heatpump,2030,13
-15,2040,R2,heatpump,2030,13
-15,2041,R2,heatpump,2030,13
-16,2034,R2,heatpump,2032,6
-16,2035,R2,heatpump,2032,6
-16,2036,R2,heatpump,2032,6
-16,2037,R2,heatpump,2032,6
-16,2038,R2,heatpump,2032,6
-16,2039,R2,heatpump,2032,6
-16,2040,R2,heatpump,2032,6
-16,2041,R2,heatpump,2032,6
-16,2042,R2,heatpump,2032,6
-16,2043,R2,heatpump,2032,6
-17,2036,R2,heatpump,2034,6
-17,2037,R2,heatpump,2034,6
-17,2038,R2,heatpump,2034,6
-17,2039,R2,heatpump,2034,6
-17,2040,R2,heatpump,2034,6
-17,2041,R2,heatpump,2034,6
-17,2042,R2,heatpump,2034,6
-17,2043,R2,heatpump,2034,6
-17,2044,R2,heatpump,2034,6
-17,2045,R2,heatpump,2034,6
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
deleted file mode 100644
index 9b139849d..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
+++ /dev/null
@@ -1,177 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2032,R1,heatpump,2030,13
-6,2033,R1,heatpump,2030,13
-6,2034,R1,heatpump,2030,13
-6,2035,R1,heatpump,2030,13
-6,2036,R1,heatpump,2030,13
-6,2037,R1,heatpump,2030,13
-6,2038,R1,heatpump,2030,13
-6,2039,R1,heatpump,2030,13
-6,2040,R1,heatpump,2030,13
-6,2041,R1,heatpump,2030,13
-7,2034,R1,heatpump,2032,6
-7,2035,R1,heatpump,2032,6
-7,2036,R1,heatpump,2032,6
-7,2037,R1,heatpump,2032,6
-7,2038,R1,heatpump,2032,6
-7,2039,R1,heatpump,2032,6
-7,2040,R1,heatpump,2032,6
-7,2041,R1,heatpump,2032,6
-7,2042,R1,heatpump,2032,6
-7,2043,R1,heatpump,2032,6
-8,2036,R1,heatpump,2034,6
-8,2037,R1,heatpump,2034,6
-8,2038,R1,heatpump,2034,6
-8,2039,R1,heatpump,2034,6
-8,2040,R1,heatpump,2034,6
-8,2041,R1,heatpump,2034,6
-8,2042,R1,heatpump,2034,6
-8,2043,R1,heatpump,2034,6
-8,2044,R1,heatpump,2034,6
-8,2045,R1,heatpump,2034,6
-9,2038,R1,heatpump,2036,6
-9,2039,R1,heatpump,2036,6
-9,2040,R1,heatpump,2036,6
-9,2041,R1,heatpump,2036,6
-9,2042,R1,heatpump,2036,6
-9,2043,R1,heatpump,2036,6
-9,2044,R1,heatpump,2036,6
-9,2045,R1,heatpump,2036,6
-9,2046,R1,heatpump,2036,6
-9,2047,R1,heatpump,2036,6
-10,2020,R2,gasboiler,2020,10
-10,2022,R2,gasboiler,2020,8
-10,2024,R2,gasboiler,2020,6
-10,2025,R2,gasboiler,2020,5
-10,2026,R2,gasboiler,2020,4
-10,2028,R2,gasboiler,2020,2
-11,2022,R2,heatpump,2020,11
-11,2024,R2,heatpump,2020,11
-11,2025,R2,heatpump,2020,11
-11,2026,R2,heatpump,2020,11
-11,2028,R2,heatpump,2020,11
-11,2030,R2,heatpump,2020,11
-11,2031,R2,heatpump,2020,11
-12,2024,R2,heatpump,2022,4
-12,2025,R2,heatpump,2022,4
-12,2026,R2,heatpump,2022,4
-12,2028,R2,heatpump,2022,4
-12,2030,R2,heatpump,2022,4
-12,2031,R2,heatpump,2022,4
-12,2032,R2,heatpump,2022,4
-12,2033,R2,heatpump,2022,4
-13,2026,R2,heatpump,2024,4
-13,2028,R2,heatpump,2024,4
-13,2030,R2,heatpump,2024,4
-13,2031,R2,heatpump,2024,4
-13,2032,R2,heatpump,2024,4
-13,2033,R2,heatpump,2024,4
-13,2034,R2,heatpump,2024,4
-13,2035,R2,heatpump,2024,4
-14,2028,R2,heatpump,2026,4
-14,2030,R2,heatpump,2026,4
-14,2031,R2,heatpump,2026,4
-14,2032,R2,heatpump,2026,4
-14,2033,R2,heatpump,2026,4
-14,2034,R2,heatpump,2026,4
-14,2035,R2,heatpump,2026,4
-14,2036,R2,heatpump,2026,4
-14,2037,R2,heatpump,2026,4
-15,2030,R2,heatpump,2028,5
-15,2031,R2,heatpump,2028,5
-15,2032,R2,heatpump,2028,5
-15,2033,R2,heatpump,2028,5
-15,2034,R2,heatpump,2028,5
-15,2035,R2,heatpump,2028,5
-15,2036,R2,heatpump,2028,5
-15,2037,R2,heatpump,2028,5
-15,2038,R2,heatpump,2028,5
-15,2039,R2,heatpump,2028,5
-16,2032,R2,heatpump,2030,13
-16,2033,R2,heatpump,2030,13
-16,2034,R2,heatpump,2030,13
-16,2035,R2,heatpump,2030,13
-16,2036,R2,heatpump,2030,13
-16,2037,R2,heatpump,2030,13
-16,2038,R2,heatpump,2030,13
-16,2039,R2,heatpump,2030,13
-16,2040,R2,heatpump,2030,13
-16,2041,R2,heatpump,2030,13
-17,2034,R2,heatpump,2032,6
-17,2035,R2,heatpump,2032,6
-17,2036,R2,heatpump,2032,6
-17,2037,R2,heatpump,2032,6
-17,2038,R2,heatpump,2032,6
-17,2039,R2,heatpump,2032,6
-17,2040,R2,heatpump,2032,6
-17,2041,R2,heatpump,2032,6
-17,2042,R2,heatpump,2032,6
-17,2043,R2,heatpump,2032,6
-18,2036,R2,heatpump,2034,6
-18,2037,R2,heatpump,2034,6
-18,2038,R2,heatpump,2034,6
-18,2039,R2,heatpump,2034,6
-18,2040,R2,heatpump,2034,6
-18,2041,R2,heatpump,2034,6
-18,2042,R2,heatpump,2034,6
-18,2043,R2,heatpump,2034,6
-18,2044,R2,heatpump,2034,6
-18,2045,R2,heatpump,2034,6
-19,2038,R2,heatpump,2036,6
-19,2039,R2,heatpump,2036,6
-19,2040,R2,heatpump,2036,6
-19,2041,R2,heatpump,2036,6
-19,2042,R2,heatpump,2036,6
-19,2043,R2,heatpump,2036,6
-19,2044,R2,heatpump,2036,6
-19,2045,R2,heatpump,2036,6
-19,2046,R2,heatpump,2036,6
-19,2047,R2,heatpump,2036,6
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
deleted file mode 100644
index b50c0beee..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
+++ /dev/null
@@ -1,197 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2032,R1,heatpump,2030,13
-6,2033,R1,heatpump,2030,13
-6,2034,R1,heatpump,2030,13
-6,2035,R1,heatpump,2030,13
-6,2036,R1,heatpump,2030,13
-6,2037,R1,heatpump,2030,13
-6,2038,R1,heatpump,2030,13
-6,2039,R1,heatpump,2030,13
-6,2040,R1,heatpump,2030,13
-6,2041,R1,heatpump,2030,13
-7,2034,R1,heatpump,2032,6
-7,2035,R1,heatpump,2032,6
-7,2036,R1,heatpump,2032,6
-7,2037,R1,heatpump,2032,6
-7,2038,R1,heatpump,2032,6
-7,2039,R1,heatpump,2032,6
-7,2040,R1,heatpump,2032,6
-7,2041,R1,heatpump,2032,6
-7,2042,R1,heatpump,2032,6
-7,2043,R1,heatpump,2032,6
-8,2036,R1,heatpump,2034,6
-8,2037,R1,heatpump,2034,6
-8,2038,R1,heatpump,2034,6
-8,2039,R1,heatpump,2034,6
-8,2040,R1,heatpump,2034,6
-8,2041,R1,heatpump,2034,6
-8,2042,R1,heatpump,2034,6
-8,2043,R1,heatpump,2034,6
-8,2044,R1,heatpump,2034,6
-8,2045,R1,heatpump,2034,6
-9,2038,R1,heatpump,2036,6
-9,2039,R1,heatpump,2036,6
-9,2040,R1,heatpump,2036,6
-9,2041,R1,heatpump,2036,6
-9,2042,R1,heatpump,2036,6
-9,2043,R1,heatpump,2036,6
-9,2044,R1,heatpump,2036,6
-9,2045,R1,heatpump,2036,6
-9,2046,R1,heatpump,2036,6
-9,2047,R1,heatpump,2036,6
-10,2040,R1,heatpump,2038,8
-10,2041,R1,heatpump,2038,8
-10,2042,R1,heatpump,2038,8
-10,2043,R1,heatpump,2038,8
-10,2044,R1,heatpump,2038,8
-10,2045,R1,heatpump,2038,8
-10,2046,R1,heatpump,2038,8
-10,2047,R1,heatpump,2038,8
-10,2048,R1,heatpump,2038,8
-10,2049,R1,heatpump,2038,8
-11,2020,R2,gasboiler,2020,10
-11,2022,R2,gasboiler,2020,8
-11,2024,R2,gasboiler,2020,6
-11,2025,R2,gasboiler,2020,5
-11,2026,R2,gasboiler,2020,4
-11,2028,R2,gasboiler,2020,2
-12,2022,R2,heatpump,2020,11
-12,2024,R2,heatpump,2020,11
-12,2025,R2,heatpump,2020,11
-12,2026,R2,heatpump,2020,11
-12,2028,R2,heatpump,2020,11
-12,2030,R2,heatpump,2020,11
-12,2031,R2,heatpump,2020,11
-13,2024,R2,heatpump,2022,4
-13,2025,R2,heatpump,2022,4
-13,2026,R2,heatpump,2022,4
-13,2028,R2,heatpump,2022,4
-13,2030,R2,heatpump,2022,4
-13,2031,R2,heatpump,2022,4
-13,2032,R2,heatpump,2022,4
-13,2033,R2,heatpump,2022,4
-14,2026,R2,heatpump,2024,4
-14,2028,R2,heatpump,2024,4
-14,2030,R2,heatpump,2024,4
-14,2031,R2,heatpump,2024,4
-14,2032,R2,heatpump,2024,4
-14,2033,R2,heatpump,2024,4
-14,2034,R2,heatpump,2024,4
-14,2035,R2,heatpump,2024,4
-15,2028,R2,heatpump,2026,4
-15,2030,R2,heatpump,2026,4
-15,2031,R2,heatpump,2026,4
-15,2032,R2,heatpump,2026,4
-15,2033,R2,heatpump,2026,4
-15,2034,R2,heatpump,2026,4
-15,2035,R2,heatpump,2026,4
-15,2036,R2,heatpump,2026,4
-15,2037,R2,heatpump,2026,4
-16,2030,R2,heatpump,2028,5
-16,2031,R2,heatpump,2028,5
-16,2032,R2,heatpump,2028,5
-16,2033,R2,heatpump,2028,5
-16,2034,R2,heatpump,2028,5
-16,2035,R2,heatpump,2028,5
-16,2036,R2,heatpump,2028,5
-16,2037,R2,heatpump,2028,5
-16,2038,R2,heatpump,2028,5
-16,2039,R2,heatpump,2028,5
-17,2032,R2,heatpump,2030,13
-17,2033,R2,heatpump,2030,13
-17,2034,R2,heatpump,2030,13
-17,2035,R2,heatpump,2030,13
-17,2036,R2,heatpump,2030,13
-17,2037,R2,heatpump,2030,13
-17,2038,R2,heatpump,2030,13
-17,2039,R2,heatpump,2030,13
-17,2040,R2,heatpump,2030,13
-17,2041,R2,heatpump,2030,13
-18,2034,R2,heatpump,2032,6
-18,2035,R2,heatpump,2032,6
-18,2036,R2,heatpump,2032,6
-18,2037,R2,heatpump,2032,6
-18,2038,R2,heatpump,2032,6
-18,2039,R2,heatpump,2032,6
-18,2040,R2,heatpump,2032,6
-18,2041,R2,heatpump,2032,6
-18,2042,R2,heatpump,2032,6
-18,2043,R2,heatpump,2032,6
-19,2036,R2,heatpump,2034,6
-19,2037,R2,heatpump,2034,6
-19,2038,R2,heatpump,2034,6
-19,2039,R2,heatpump,2034,6
-19,2040,R2,heatpump,2034,6
-19,2041,R2,heatpump,2034,6
-19,2042,R2,heatpump,2034,6
-19,2043,R2,heatpump,2034,6
-19,2044,R2,heatpump,2034,6
-19,2045,R2,heatpump,2034,6
-20,2038,R2,heatpump,2036,6
-20,2039,R2,heatpump,2036,6
-20,2040,R2,heatpump,2036,6
-20,2041,R2,heatpump,2036,6
-20,2042,R2,heatpump,2036,6
-20,2043,R2,heatpump,2036,6
-20,2044,R2,heatpump,2036,6
-20,2045,R2,heatpump,2036,6
-20,2046,R2,heatpump,2036,6
-20,2047,R2,heatpump,2036,6
-21,2040,R2,heatpump,2038,8
-21,2041,R2,heatpump,2038,8
-21,2042,R2,heatpump,2038,8
-21,2043,R2,heatpump,2038,8
-21,2044,R2,heatpump,2038,8
-21,2045,R2,heatpump,2038,8
-21,2046,R2,heatpump,2038,8
-21,2047,R2,heatpump,2038,8
-21,2048,R2,heatpump,2038,8
-21,2049,R2,heatpump,2038,8
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 836f4a676..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,217 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2022,R1,gasboiler,2020,8
-0,2024,R1,gasboiler,2020,6
-0,2025,R1,gasboiler,2020,5
-0,2026,R1,gasboiler,2020,4
-0,2028,R1,gasboiler,2020,2
-1,2022,R1,heatpump,2020,11
-1,2024,R1,heatpump,2020,11
-1,2025,R1,heatpump,2020,11
-1,2026,R1,heatpump,2020,11
-1,2028,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2031,R1,heatpump,2020,11
-2,2024,R1,heatpump,2022,4
-2,2025,R1,heatpump,2022,4
-2,2026,R1,heatpump,2022,4
-2,2028,R1,heatpump,2022,4
-2,2030,R1,heatpump,2022,4
-2,2031,R1,heatpump,2022,4
-2,2032,R1,heatpump,2022,4
-2,2033,R1,heatpump,2022,4
-3,2026,R1,heatpump,2024,4
-3,2028,R1,heatpump,2024,4
-3,2030,R1,heatpump,2024,4
-3,2031,R1,heatpump,2024,4
-3,2032,R1,heatpump,2024,4
-3,2033,R1,heatpump,2024,4
-3,2034,R1,heatpump,2024,4
-3,2035,R1,heatpump,2024,4
-4,2028,R1,heatpump,2026,4
-4,2030,R1,heatpump,2026,4
-4,2031,R1,heatpump,2026,4
-4,2032,R1,heatpump,2026,4
-4,2033,R1,heatpump,2026,4
-4,2034,R1,heatpump,2026,4
-4,2035,R1,heatpump,2026,4
-4,2036,R1,heatpump,2026,4
-4,2037,R1,heatpump,2026,4
-5,2030,R1,heatpump,2028,5
-5,2031,R1,heatpump,2028,5
-5,2032,R1,heatpump,2028,5
-5,2033,R1,heatpump,2028,5
-5,2034,R1,heatpump,2028,5
-5,2035,R1,heatpump,2028,5
-5,2036,R1,heatpump,2028,5
-5,2037,R1,heatpump,2028,5
-5,2038,R1,heatpump,2028,5
-5,2039,R1,heatpump,2028,5
-6,2032,R1,heatpump,2030,13
-6,2033,R1,heatpump,2030,13
-6,2034,R1,heatpump,2030,13
-6,2035,R1,heatpump,2030,13
-6,2036,R1,heatpump,2030,13
-6,2037,R1,heatpump,2030,13
-6,2038,R1,heatpump,2030,13
-6,2039,R1,heatpump,2030,13
-6,2040,R1,heatpump,2030,13
-6,2041,R1,heatpump,2030,13
-7,2034,R1,heatpump,2032,6
-7,2035,R1,heatpump,2032,6
-7,2036,R1,heatpump,2032,6
-7,2037,R1,heatpump,2032,6
-7,2038,R1,heatpump,2032,6
-7,2039,R1,heatpump,2032,6
-7,2040,R1,heatpump,2032,6
-7,2041,R1,heatpump,2032,6
-7,2042,R1,heatpump,2032,6
-7,2043,R1,heatpump,2032,6
-8,2036,R1,heatpump,2034,6
-8,2037,R1,heatpump,2034,6
-8,2038,R1,heatpump,2034,6
-8,2039,R1,heatpump,2034,6
-8,2040,R1,heatpump,2034,6
-8,2041,R1,heatpump,2034,6
-8,2042,R1,heatpump,2034,6
-8,2043,R1,heatpump,2034,6
-8,2044,R1,heatpump,2034,6
-8,2045,R1,heatpump,2034,6
-9,2038,R1,heatpump,2036,6
-9,2039,R1,heatpump,2036,6
-9,2040,R1,heatpump,2036,6
-9,2041,R1,heatpump,2036,6
-9,2042,R1,heatpump,2036,6
-9,2043,R1,heatpump,2036,6
-9,2044,R1,heatpump,2036,6
-9,2045,R1,heatpump,2036,6
-9,2046,R1,heatpump,2036,6
-9,2047,R1,heatpump,2036,6
-10,2040,R1,heatpump,2038,8
-10,2041,R1,heatpump,2038,8
-10,2042,R1,heatpump,2038,8
-10,2043,R1,heatpump,2038,8
-10,2044,R1,heatpump,2038,8
-10,2045,R1,heatpump,2038,8
-10,2046,R1,heatpump,2038,8
-10,2047,R1,heatpump,2038,8
-10,2048,R1,heatpump,2038,8
-10,2049,R1,heatpump,2038,8
-11,2042,R1,heatpump,2040,15
-11,2043,R1,heatpump,2040,15
-11,2044,R1,heatpump,2040,15
-11,2045,R1,heatpump,2040,15
-11,2046,R1,heatpump,2040,15
-11,2047,R1,heatpump,2040,15
-11,2048,R1,heatpump,2040,15
-11,2049,R1,heatpump,2040,15
-11,2050,R1,heatpump,2040,15
-11,2051,R1,heatpump,2040,15
-12,2020,R2,gasboiler,2020,10
-12,2022,R2,gasboiler,2020,8
-12,2024,R2,gasboiler,2020,6
-12,2025,R2,gasboiler,2020,5
-12,2026,R2,gasboiler,2020,4
-12,2028,R2,gasboiler,2020,2
-13,2022,R2,heatpump,2020,11
-13,2024,R2,heatpump,2020,11
-13,2025,R2,heatpump,2020,11
-13,2026,R2,heatpump,2020,11
-13,2028,R2,heatpump,2020,11
-13,2030,R2,heatpump,2020,11
-13,2031,R2,heatpump,2020,11
-14,2024,R2,heatpump,2022,4
-14,2025,R2,heatpump,2022,4
-14,2026,R2,heatpump,2022,4
-14,2028,R2,heatpump,2022,4
-14,2030,R2,heatpump,2022,4
-14,2031,R2,heatpump,2022,4
-14,2032,R2,heatpump,2022,4
-14,2033,R2,heatpump,2022,4
-15,2026,R2,heatpump,2024,4
-15,2028,R2,heatpump,2024,4
-15,2030,R2,heatpump,2024,4
-15,2031,R2,heatpump,2024,4
-15,2032,R2,heatpump,2024,4
-15,2033,R2,heatpump,2024,4
-15,2034,R2,heatpump,2024,4
-15,2035,R2,heatpump,2024,4
-16,2028,R2,heatpump,2026,4
-16,2030,R2,heatpump,2026,4
-16,2031,R2,heatpump,2026,4
-16,2032,R2,heatpump,2026,4
-16,2033,R2,heatpump,2026,4
-16,2034,R2,heatpump,2026,4
-16,2035,R2,heatpump,2026,4
-16,2036,R2,heatpump,2026,4
-16,2037,R2,heatpump,2026,4
-17,2030,R2,heatpump,2028,5
-17,2031,R2,heatpump,2028,5
-17,2032,R2,heatpump,2028,5
-17,2033,R2,heatpump,2028,5
-17,2034,R2,heatpump,2028,5
-17,2035,R2,heatpump,2028,5
-17,2036,R2,heatpump,2028,5
-17,2037,R2,heatpump,2028,5
-17,2038,R2,heatpump,2028,5
-17,2039,R2,heatpump,2028,5
-18,2032,R2,heatpump,2030,13
-18,2033,R2,heatpump,2030,13
-18,2034,R2,heatpump,2030,13
-18,2035,R2,heatpump,2030,13
-18,2036,R2,heatpump,2030,13
-18,2037,R2,heatpump,2030,13
-18,2038,R2,heatpump,2030,13
-18,2039,R2,heatpump,2030,13
-18,2040,R2,heatpump,2030,13
-18,2041,R2,heatpump,2030,13
-19,2034,R2,heatpump,2032,6
-19,2035,R2,heatpump,2032,6
-19,2036,R2,heatpump,2032,6
-19,2037,R2,heatpump,2032,6
-19,2038,R2,heatpump,2032,6
-19,2039,R2,heatpump,2032,6
-19,2040,R2,heatpump,2032,6
-19,2041,R2,heatpump,2032,6
-19,2042,R2,heatpump,2032,6
-19,2043,R2,heatpump,2032,6
-20,2036,R2,heatpump,2034,6
-20,2037,R2,heatpump,2034,6
-20,2038,R2,heatpump,2034,6
-20,2039,R2,heatpump,2034,6
-20,2040,R2,heatpump,2034,6
-20,2041,R2,heatpump,2034,6
-20,2042,R2,heatpump,2034,6
-20,2043,R2,heatpump,2034,6
-20,2044,R2,heatpump,2034,6
-20,2045,R2,heatpump,2034,6
-21,2038,R2,heatpump,2036,6
-21,2039,R2,heatpump,2036,6
-21,2040,R2,heatpump,2036,6
-21,2041,R2,heatpump,2036,6
-21,2042,R2,heatpump,2036,6
-21,2043,R2,heatpump,2036,6
-21,2044,R2,heatpump,2036,6
-21,2045,R2,heatpump,2036,6
-21,2046,R2,heatpump,2036,6
-21,2047,R2,heatpump,2036,6
-22,2040,R2,heatpump,2038,8
-22,2041,R2,heatpump,2038,8
-22,2042,R2,heatpump,2038,8
-22,2043,R2,heatpump,2038,8
-22,2044,R2,heatpump,2038,8
-22,2045,R2,heatpump,2038,8
-22,2046,R2,heatpump,2038,8
-22,2047,R2,heatpump,2038,8
-22,2048,R2,heatpump,2038,8
-22,2049,R2,heatpump,2038,8
-23,2042,R2,heatpump,2040,15
-23,2043,R2,heatpump,2040,15
-23,2044,R2,heatpump,2040,15
-23,2045,R2,heatpump,2040,15
-23,2046,R2,heatpump,2040,15
-23,2047,R2,heatpump,2040,15
-23,2048,R2,heatpump,2040,15
-23,2049,R2,heatpump,2040,15
-23,2050,R2,heatpump,2040,15
-23,2051,R2,heatpump,2040,15
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply.csv
new file mode 100644
index 000000000..d968f7fb1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply.csv
@@ -0,0 +1,1601 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020
+0,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020
+2,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020
+2,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020
+0,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020
+2,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020
+2,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020
+2,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020
+2,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020
+2,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020
+2,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020
+0,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020
+0,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020
+0,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020
+2,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020
+2,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020
+0,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020
+2,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020
+0,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020
+2,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020
+0,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020
+2,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020
+0,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020
+2,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020
+2,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020
+2,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020
+2,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020
+2,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020
+0,heat,all-week,night,2020,all-year,R1,0.16700000000,gasboiler,0,2022
+1,heat,all-week,night,2020,all-year,R1,0.22960000000,heatpump,0,2022
+3,heat,all-week,night,2020,all-year,R1,0.16700000000,gasboiler,0,2022
+4,heat,all-week,night,2020,all-year,R1,0.22960000000,heatpump,0,2022
+0,heat,all-week,night,2020,all-year,R2,0.16700000000,gasboiler,0,2022
+1,heat,all-week,night,2020,all-year,R2,0.22960000000,heatpump,0,2022
+3,heat,all-week,night,2020,all-year,R2,0.16700000000,gasboiler,0,2022
+4,heat,all-week,night,2020,all-year,R2,0.22960000000,heatpump,0,2022
+0,CO2f,all-week,night,2020,all-year,R1,10.80770000000,gasboiler,0,2022
+3,CO2f,all-week,night,2020,all-year,R1,10.80770000000,gasboiler,0,2022
+0,CO2f,all-week,night,2020,all-year,R2,10.80770000000,gasboiler,0,2022
+3,CO2f,all-week,night,2020,all-year,R2,10.80770000000,gasboiler,0,2022
+0,heat,all-week,morning,2020,all-year,R1,0.23860000000,gasboiler,1,2022
+1,heat,all-week,morning,2020,all-year,R1,0.32810000000,heatpump,1,2022
+3,heat,all-week,morning,2020,all-year,R1,0.23860000000,gasboiler,1,2022
+4,heat,all-week,morning,2020,all-year,R1,0.32810000000,heatpump,1,2022
+0,heat,all-week,morning,2020,all-year,R2,0.23860000000,gasboiler,1,2022
+1,heat,all-week,morning,2020,all-year,R2,0.32810000000,heatpump,1,2022
+3,heat,all-week,morning,2020,all-year,R2,0.23860000000,gasboiler,1,2022
+4,heat,all-week,morning,2020,all-year,R2,0.32810000000,heatpump,1,2022
+0,CO2f,all-week,morning,2020,all-year,R1,15.43960000000,gasboiler,1,2022
+3,CO2f,all-week,morning,2020,all-year,R1,15.43960000000,gasboiler,1,2022
+0,CO2f,all-week,morning,2020,all-year,R2,15.43960000000,gasboiler,1,2022
+3,CO2f,all-week,morning,2020,all-year,R2,15.43960000000,gasboiler,1,2022
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.16700000000,gasboiler,2,2022
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.22960000000,heatpump,2,2022
+3,heat,all-week,mid-afternoon,2020,all-year,R1,0.16700000000,gasboiler,2,2022
+4,heat,all-week,mid-afternoon,2020,all-year,R1,0.22960000000,heatpump,2,2022
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.16700000000,gasboiler,2,2022
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.22960000000,heatpump,2,2022
+3,heat,all-week,mid-afternoon,2020,all-year,R2,0.16700000000,gasboiler,2,2022
+4,heat,all-week,mid-afternoon,2020,all-year,R2,0.22960000000,heatpump,2,2022
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,10.80770000000,gasboiler,2,2022
+3,CO2f,all-week,mid-afternoon,2020,all-year,R1,10.80770000000,gasboiler,2,2022
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,10.80770000000,gasboiler,2,2022
+3,CO2f,all-week,mid-afternoon,2020,all-year,R2,10.80770000000,gasboiler,2,2022
+0,heat,all-week,early-peak,2020,all-year,R1,0.23860000000,gasboiler,3,2022
+1,heat,all-week,early-peak,2020,all-year,R1,0.32810000000,heatpump,3,2022
+3,heat,all-week,early-peak,2020,all-year,R1,0.23860000000,gasboiler,3,2022
+4,heat,all-week,early-peak,2020,all-year,R1,0.32810000000,heatpump,3,2022
+0,heat,all-week,early-peak,2020,all-year,R2,0.23860000000,gasboiler,3,2022
+1,heat,all-week,early-peak,2020,all-year,R2,0.32810000000,heatpump,3,2022
+3,heat,all-week,early-peak,2020,all-year,R2,0.23860000000,gasboiler,3,2022
+4,heat,all-week,early-peak,2020,all-year,R2,0.32810000000,heatpump,3,2022
+0,CO2f,all-week,early-peak,2020,all-year,R1,15.43960000000,gasboiler,3,2022
+3,CO2f,all-week,early-peak,2020,all-year,R1,15.43960000000,gasboiler,3,2022
+0,CO2f,all-week,early-peak,2020,all-year,R2,15.43960000000,gasboiler,3,2022
+3,CO2f,all-week,early-peak,2020,all-year,R2,15.43960000000,gasboiler,3,2022
+0,heat,all-week,late-peak,2020,all-year,R1,0.50110000000,gasboiler,4,2022
+1,heat,all-week,late-peak,2020,all-year,R1,0.68890000000,heatpump,4,2022
+3,heat,all-week,late-peak,2020,all-year,R1,0.50110000000,gasboiler,4,2022
+4,heat,all-week,late-peak,2020,all-year,R1,0.68890000000,heatpump,4,2022
+0,heat,all-week,late-peak,2020,all-year,R2,0.50110000000,gasboiler,4,2022
+1,heat,all-week,late-peak,2020,all-year,R2,0.68890000000,heatpump,4,2022
+3,heat,all-week,late-peak,2020,all-year,R2,0.50110000000,gasboiler,4,2022
+4,heat,all-week,late-peak,2020,all-year,R2,0.68890000000,heatpump,4,2022
+0,CO2f,all-week,late-peak,2020,all-year,R1,32.42310000000,gasboiler,4,2022
+3,CO2f,all-week,late-peak,2020,all-year,R1,32.42310000000,gasboiler,4,2022
+0,CO2f,all-week,late-peak,2020,all-year,R2,32.42310000000,gasboiler,4,2022
+3,CO2f,all-week,late-peak,2020,all-year,R2,32.42310000000,gasboiler,4,2022
+0,heat,all-week,evening,2020,all-year,R1,0.33400000000,gasboiler,5,2022
+1,heat,all-week,evening,2020,all-year,R1,0.45930000000,heatpump,5,2022
+3,heat,all-week,evening,2020,all-year,R1,0.33400000000,gasboiler,5,2022
+4,heat,all-week,evening,2020,all-year,R1,0.45930000000,heatpump,5,2022
+0,heat,all-week,evening,2020,all-year,R2,0.33400000000,gasboiler,5,2022
+1,heat,all-week,evening,2020,all-year,R2,0.45930000000,heatpump,5,2022
+3,heat,all-week,evening,2020,all-year,R2,0.33400000000,gasboiler,5,2022
+4,heat,all-week,evening,2020,all-year,R2,0.45930000000,heatpump,5,2022
+0,CO2f,all-week,evening,2020,all-year,R1,21.61540000000,gasboiler,5,2022
+3,CO2f,all-week,evening,2020,all-year,R1,21.61540000000,gasboiler,5,2022
+0,CO2f,all-week,evening,2020,all-year,R2,21.61540000000,gasboiler,5,2022
+3,CO2f,all-week,evening,2020,all-year,R2,21.61540000000,gasboiler,5,2022
+0,heat,all-week,early-morning,2020,all-year,R1,0.33400000000,gasboiler,6,2022
+1,heat,all-week,early-morning,2020,all-year,R1,0.45930000000,heatpump,6,2022
+3,heat,all-week,early-morning,2020,all-year,R1,0.33400000000,gasboiler,6,2022
+4,heat,all-week,early-morning,2020,all-year,R1,0.45930000000,heatpump,6,2022
+0,heat,all-week,early-morning,2020,all-year,R2,0.33400000000,gasboiler,6,2022
+1,heat,all-week,early-morning,2020,all-year,R2,0.45930000000,heatpump,6,2022
+3,heat,all-week,early-morning,2020,all-year,R2,0.33400000000,gasboiler,6,2022
+4,heat,all-week,early-morning,2020,all-year,R2,0.45930000000,heatpump,6,2022
+0,CO2f,all-week,early-morning,2020,all-year,R1,21.61540000000,gasboiler,6,2022
+3,CO2f,all-week,early-morning,2020,all-year,R1,21.61540000000,gasboiler,6,2022
+0,CO2f,all-week,early-morning,2020,all-year,R2,21.61540000000,gasboiler,6,2022
+3,CO2f,all-week,early-morning,2020,all-year,R2,21.61540000000,gasboiler,6,2022
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.33400000000,gasboiler,7,2022
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.45930000000,heatpump,7,2022
+3,heat,all-week,late-afternoon,2020,all-year,R1,0.33400000000,gasboiler,7,2022
+4,heat,all-week,late-afternoon,2020,all-year,R1,0.45930000000,heatpump,7,2022
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.33400000000,gasboiler,7,2022
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.45930000000,heatpump,7,2022
+3,heat,all-week,late-afternoon,2020,all-year,R2,0.33400000000,gasboiler,7,2022
+4,heat,all-week,late-afternoon,2020,all-year,R2,0.45930000000,heatpump,7,2022
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,21.61540000000,gasboiler,7,2022
+3,CO2f,all-week,late-afternoon,2020,all-year,R1,21.61540000000,gasboiler,7,2022
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,21.61540000000,gasboiler,7,2022
+3,CO2f,all-week,late-afternoon,2020,all-year,R2,21.61540000000,gasboiler,7,2022
+0,heat,all-week,night,2020,all-year,R1,0.12670000000,gasboiler,0,2024
+1,heat,all-week,night,2020,all-year,R1,0.23220000000,heatpump,0,2024
+2,heat,all-week,night,2022,all-year,R1,0.08440000000,heatpump,0,2024
+4,heat,all-week,night,2020,all-year,R1,0.12670000000,gasboiler,0,2024
+5,heat,all-week,night,2020,all-year,R1,0.23220000000,heatpump,0,2024
+6,heat,all-week,night,2022,all-year,R1,0.08440000000,heatpump,0,2024
+0,heat,all-week,night,2020,all-year,R2,0.12670000000,gasboiler,0,2024
+1,heat,all-week,night,2020,all-year,R2,0.23220000000,heatpump,0,2024
+2,heat,all-week,night,2022,all-year,R2,0.08440000000,heatpump,0,2024
+4,heat,all-week,night,2020,all-year,R2,0.12670000000,gasboiler,0,2024
+5,heat,all-week,night,2020,all-year,R2,0.23220000000,heatpump,0,2024
+6,heat,all-week,night,2022,all-year,R2,0.08440000000,heatpump,0,2024
+0,CO2f,all-week,night,2020,all-year,R1,8.19660000000,gasboiler,0,2024
+4,CO2f,all-week,night,2020,all-year,R1,8.19660000000,gasboiler,0,2024
+0,CO2f,all-week,night,2020,all-year,R2,8.19660000000,gasboiler,0,2024
+4,CO2f,all-week,night,2020,all-year,R2,8.19660000000,gasboiler,0,2024
+0,heat,all-week,morning,2020,all-year,R1,0.18100000000,gasboiler,1,2024
+1,heat,all-week,morning,2020,all-year,R1,0.33170000000,heatpump,1,2024
+2,heat,all-week,morning,2022,all-year,R1,0.12060000000,heatpump,1,2024
+4,heat,all-week,morning,2020,all-year,R1,0.18100000000,gasboiler,1,2024
+5,heat,all-week,morning,2020,all-year,R1,0.33170000000,heatpump,1,2024
+6,heat,all-week,morning,2022,all-year,R1,0.12060000000,heatpump,1,2024
+0,heat,all-week,morning,2020,all-year,R2,0.18100000000,gasboiler,1,2024
+1,heat,all-week,morning,2020,all-year,R2,0.33170000000,heatpump,1,2024
+2,heat,all-week,morning,2022,all-year,R2,0.12060000000,heatpump,1,2024
+4,heat,all-week,morning,2020,all-year,R2,0.18100000000,gasboiler,1,2024
+5,heat,all-week,morning,2020,all-year,R2,0.33170000000,heatpump,1,2024
+6,heat,all-week,morning,2022,all-year,R2,0.12060000000,heatpump,1,2024
+0,CO2f,all-week,morning,2020,all-year,R1,11.70940000000,gasboiler,1,2024
+4,CO2f,all-week,morning,2020,all-year,R1,11.70940000000,gasboiler,1,2024
+0,CO2f,all-week,morning,2020,all-year,R2,11.70940000000,gasboiler,1,2024
+4,CO2f,all-week,morning,2020,all-year,R2,11.70940000000,gasboiler,1,2024
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.12670000000,gasboiler,2,2024
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.23220000000,heatpump,2,2024
+2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08440000000,heatpump,2,2024
+4,heat,all-week,mid-afternoon,2020,all-year,R1,0.12670000000,gasboiler,2,2024
+5,heat,all-week,mid-afternoon,2020,all-year,R1,0.23220000000,heatpump,2,2024
+6,heat,all-week,mid-afternoon,2022,all-year,R1,0.08440000000,heatpump,2,2024
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.12670000000,gasboiler,2,2024
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.23220000000,heatpump,2,2024
+2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08440000000,heatpump,2,2024
+4,heat,all-week,mid-afternoon,2020,all-year,R2,0.12670000000,gasboiler,2,2024
+5,heat,all-week,mid-afternoon,2020,all-year,R2,0.23220000000,heatpump,2,2024
+6,heat,all-week,mid-afternoon,2022,all-year,R2,0.08440000000,heatpump,2,2024
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,8.19660000000,gasboiler,2,2024
+4,CO2f,all-week,mid-afternoon,2020,all-year,R1,8.19660000000,gasboiler,2,2024
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,8.19660000000,gasboiler,2,2024
+4,CO2f,all-week,mid-afternoon,2020,all-year,R2,8.19660000000,gasboiler,2,2024
+0,heat,all-week,early-peak,2020,all-year,R1,0.18100000000,gasboiler,3,2024
+1,heat,all-week,early-peak,2020,all-year,R1,0.33170000000,heatpump,3,2024
+2,heat,all-week,early-peak,2022,all-year,R1,0.12060000000,heatpump,3,2024
+4,heat,all-week,early-peak,2020,all-year,R1,0.18100000000,gasboiler,3,2024
+5,heat,all-week,early-peak,2020,all-year,R1,0.33170000000,heatpump,3,2024
+6,heat,all-week,early-peak,2022,all-year,R1,0.12060000000,heatpump,3,2024
+0,heat,all-week,early-peak,2020,all-year,R2,0.18100000000,gasboiler,3,2024
+1,heat,all-week,early-peak,2020,all-year,R2,0.33170000000,heatpump,3,2024
+2,heat,all-week,early-peak,2022,all-year,R2,0.12060000000,heatpump,3,2024
+4,heat,all-week,early-peak,2020,all-year,R2,0.18100000000,gasboiler,3,2024
+5,heat,all-week,early-peak,2020,all-year,R2,0.33170000000,heatpump,3,2024
+6,heat,all-week,early-peak,2022,all-year,R2,0.12060000000,heatpump,3,2024
+0,CO2f,all-week,early-peak,2020,all-year,R1,11.70940000000,gasboiler,3,2024
+4,CO2f,all-week,early-peak,2020,all-year,R1,11.70940000000,gasboiler,3,2024
+0,CO2f,all-week,early-peak,2020,all-year,R2,11.70940000000,gasboiler,3,2024
+4,CO2f,all-week,early-peak,2020,all-year,R2,11.70940000000,gasboiler,3,2024
+0,heat,all-week,late-peak,2020,all-year,R1,0.38000000000,gasboiler,4,2024
+1,heat,all-week,late-peak,2020,all-year,R1,0.69670000000,heatpump,4,2024
+2,heat,all-week,late-peak,2022,all-year,R1,0.25330000000,heatpump,4,2024
+4,heat,all-week,late-peak,2020,all-year,R1,0.38000000000,gasboiler,4,2024
+5,heat,all-week,late-peak,2020,all-year,R1,0.69670000000,heatpump,4,2024
+6,heat,all-week,late-peak,2022,all-year,R1,0.25330000000,heatpump,4,2024
+0,heat,all-week,late-peak,2020,all-year,R2,0.38000000000,gasboiler,4,2024
+1,heat,all-week,late-peak,2020,all-year,R2,0.69670000000,heatpump,4,2024
+2,heat,all-week,late-peak,2022,all-year,R2,0.25330000000,heatpump,4,2024
+4,heat,all-week,late-peak,2020,all-year,R2,0.38000000000,gasboiler,4,2024
+5,heat,all-week,late-peak,2020,all-year,R2,0.69670000000,heatpump,4,2024
+6,heat,all-week,late-peak,2022,all-year,R2,0.25330000000,heatpump,4,2024
+0,CO2f,all-week,late-peak,2020,all-year,R1,24.58980000000,gasboiler,4,2024
+4,CO2f,all-week,late-peak,2020,all-year,R1,24.58980000000,gasboiler,4,2024
+0,CO2f,all-week,late-peak,2020,all-year,R2,24.58980000000,gasboiler,4,2024
+4,CO2f,all-week,late-peak,2020,all-year,R2,24.58980000000,gasboiler,4,2024
+0,heat,all-week,evening,2020,all-year,R1,0.25330000000,gasboiler,5,2024
+1,heat,all-week,evening,2020,all-year,R1,0.46440000000,heatpump,5,2024
+2,heat,all-week,evening,2022,all-year,R1,0.16890000000,heatpump,5,2024
+4,heat,all-week,evening,2020,all-year,R1,0.25330000000,gasboiler,5,2024
+5,heat,all-week,evening,2020,all-year,R1,0.46440000000,heatpump,5,2024
+6,heat,all-week,evening,2022,all-year,R1,0.16890000000,heatpump,5,2024
+0,heat,all-week,evening,2020,all-year,R2,0.25330000000,gasboiler,5,2024
+1,heat,all-week,evening,2020,all-year,R2,0.46440000000,heatpump,5,2024
+2,heat,all-week,evening,2022,all-year,R2,0.16890000000,heatpump,5,2024
+4,heat,all-week,evening,2020,all-year,R2,0.25330000000,gasboiler,5,2024
+5,heat,all-week,evening,2020,all-year,R2,0.46440000000,heatpump,5,2024
+6,heat,all-week,evening,2022,all-year,R2,0.16890000000,heatpump,5,2024
+0,CO2f,all-week,evening,2020,all-year,R1,16.39320000000,gasboiler,5,2024
+4,CO2f,all-week,evening,2020,all-year,R1,16.39320000000,gasboiler,5,2024
+0,CO2f,all-week,evening,2020,all-year,R2,16.39320000000,gasboiler,5,2024
+4,CO2f,all-week,evening,2020,all-year,R2,16.39320000000,gasboiler,5,2024
+0,heat,all-week,early-morning,2020,all-year,R1,0.25330000000,gasboiler,6,2024
+1,heat,all-week,early-morning,2020,all-year,R1,0.46440000000,heatpump,6,2024
+2,heat,all-week,early-morning,2022,all-year,R1,0.16890000000,heatpump,6,2024
+4,heat,all-week,early-morning,2020,all-year,R1,0.25330000000,gasboiler,6,2024
+5,heat,all-week,early-morning,2020,all-year,R1,0.46440000000,heatpump,6,2024
+6,heat,all-week,early-morning,2022,all-year,R1,0.16890000000,heatpump,6,2024
+0,heat,all-week,early-morning,2020,all-year,R2,0.25330000000,gasboiler,6,2024
+1,heat,all-week,early-morning,2020,all-year,R2,0.46440000000,heatpump,6,2024
+2,heat,all-week,early-morning,2022,all-year,R2,0.16890000000,heatpump,6,2024
+4,heat,all-week,early-morning,2020,all-year,R2,0.25330000000,gasboiler,6,2024
+5,heat,all-week,early-morning,2020,all-year,R2,0.46440000000,heatpump,6,2024
+6,heat,all-week,early-morning,2022,all-year,R2,0.16890000000,heatpump,6,2024
+0,CO2f,all-week,early-morning,2020,all-year,R1,16.39320000000,gasboiler,6,2024
+4,CO2f,all-week,early-morning,2020,all-year,R1,16.39320000000,gasboiler,6,2024
+0,CO2f,all-week,early-morning,2020,all-year,R2,16.39320000000,gasboiler,6,2024
+4,CO2f,all-week,early-morning,2020,all-year,R2,16.39320000000,gasboiler,6,2024
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.25330000000,gasboiler,7,2024
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.46440000000,heatpump,7,2024
+2,heat,all-week,late-afternoon,2022,all-year,R1,0.16890000000,heatpump,7,2024
+4,heat,all-week,late-afternoon,2020,all-year,R1,0.25330000000,gasboiler,7,2024
+5,heat,all-week,late-afternoon,2020,all-year,R1,0.46440000000,heatpump,7,2024
+6,heat,all-week,late-afternoon,2022,all-year,R1,0.16890000000,heatpump,7,2024
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.25330000000,gasboiler,7,2024
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.46440000000,heatpump,7,2024
+2,heat,all-week,late-afternoon,2022,all-year,R2,0.16890000000,heatpump,7,2024
+4,heat,all-week,late-afternoon,2020,all-year,R2,0.25330000000,gasboiler,7,2024
+5,heat,all-week,late-afternoon,2020,all-year,R2,0.46440000000,heatpump,7,2024
+6,heat,all-week,late-afternoon,2022,all-year,R2,0.16890000000,heatpump,7,2024
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,16.39320000000,gasboiler,7,2024
+4,CO2f,all-week,late-afternoon,2020,all-year,R1,16.39320000000,gasboiler,7,2024
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,16.39320000000,gasboiler,7,2024
+4,CO2f,all-week,late-afternoon,2020,all-year,R2,16.39320000000,gasboiler,7,2024
+0,heat,all-week,night,2020,all-year,R1,0.08520000000,gasboiler,0,2026
+1,heat,all-week,night,2020,all-year,R1,0.23430000000,heatpump,0,2026
+2,heat,all-week,night,2022,all-year,R1,0.08520000000,heatpump,0,2026
+3,heat,all-week,night,2024,all-year,R1,0.08520000000,heatpump,0,2026
+5,heat,all-week,night,2020,all-year,R1,0.08520000000,gasboiler,0,2026
+6,heat,all-week,night,2020,all-year,R1,0.23430000000,heatpump,0,2026
+7,heat,all-week,night,2022,all-year,R1,0.08520000000,heatpump,0,2026
+8,heat,all-week,night,2024,all-year,R1,0.08520000000,heatpump,0,2026
+0,heat,all-week,night,2020,all-year,R2,0.08520000000,gasboiler,0,2026
+1,heat,all-week,night,2020,all-year,R2,0.23430000000,heatpump,0,2026
+2,heat,all-week,night,2022,all-year,R2,0.08520000000,heatpump,0,2026
+3,heat,all-week,night,2024,all-year,R2,0.08520000000,heatpump,0,2026
+5,heat,all-week,night,2020,all-year,R2,0.08520000000,gasboiler,0,2026
+6,heat,all-week,night,2020,all-year,R2,0.23430000000,heatpump,0,2026
+7,heat,all-week,night,2022,all-year,R2,0.08520000000,heatpump,0,2026
+8,heat,all-week,night,2024,all-year,R2,0.08520000000,heatpump,0,2026
+0,CO2f,all-week,night,2020,all-year,R1,5.51440000000,gasboiler,0,2026
+5,CO2f,all-week,night,2020,all-year,R1,5.51440000000,gasboiler,0,2026
+0,CO2f,all-week,night,2020,all-year,R2,5.51440000000,gasboiler,0,2026
+5,CO2f,all-week,night,2020,all-year,R2,5.51440000000,gasboiler,0,2026
+0,heat,all-week,morning,2020,all-year,R1,0.12170000000,gasboiler,1,2026
+1,heat,all-week,morning,2020,all-year,R1,0.33480000000,heatpump,1,2026
+2,heat,all-week,morning,2022,all-year,R1,0.12170000000,heatpump,1,2026
+3,heat,all-week,morning,2024,all-year,R1,0.12170000000,heatpump,1,2026
+5,heat,all-week,morning,2020,all-year,R1,0.12170000000,gasboiler,1,2026
+6,heat,all-week,morning,2020,all-year,R1,0.33480000000,heatpump,1,2026
+7,heat,all-week,morning,2022,all-year,R1,0.12170000000,heatpump,1,2026
+8,heat,all-week,morning,2024,all-year,R1,0.12170000000,heatpump,1,2026
+0,heat,all-week,morning,2020,all-year,R2,0.12170000000,gasboiler,1,2026
+1,heat,all-week,morning,2020,all-year,R2,0.33480000000,heatpump,1,2026
+2,heat,all-week,morning,2022,all-year,R2,0.12170000000,heatpump,1,2026
+3,heat,all-week,morning,2024,all-year,R2,0.12170000000,heatpump,1,2026
+5,heat,all-week,morning,2020,all-year,R2,0.12170000000,gasboiler,1,2026
+6,heat,all-week,morning,2020,all-year,R2,0.33480000000,heatpump,1,2026
+7,heat,all-week,morning,2022,all-year,R2,0.12170000000,heatpump,1,2026
+8,heat,all-week,morning,2024,all-year,R2,0.12170000000,heatpump,1,2026
+0,CO2f,all-week,morning,2020,all-year,R1,7.87770000000,gasboiler,1,2026
+5,CO2f,all-week,morning,2020,all-year,R1,7.87770000000,gasboiler,1,2026
+0,CO2f,all-week,morning,2020,all-year,R2,7.87770000000,gasboiler,1,2026
+5,CO2f,all-week,morning,2020,all-year,R2,7.87770000000,gasboiler,1,2026
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.08520000000,gasboiler,2,2026
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.23430000000,heatpump,2,2026
+2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08520000000,heatpump,2,2026
+3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08520000000,heatpump,2,2026
+5,heat,all-week,mid-afternoon,2020,all-year,R1,0.08520000000,gasboiler,2,2026
+6,heat,all-week,mid-afternoon,2020,all-year,R1,0.23430000000,heatpump,2,2026
+7,heat,all-week,mid-afternoon,2022,all-year,R1,0.08520000000,heatpump,2,2026
+8,heat,all-week,mid-afternoon,2024,all-year,R1,0.08520000000,heatpump,2,2026
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.08520000000,gasboiler,2,2026
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.23430000000,heatpump,2,2026
+2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08520000000,heatpump,2,2026
+3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08520000000,heatpump,2,2026
+5,heat,all-week,mid-afternoon,2020,all-year,R2,0.08520000000,gasboiler,2,2026
+6,heat,all-week,mid-afternoon,2020,all-year,R2,0.23430000000,heatpump,2,2026
+7,heat,all-week,mid-afternoon,2022,all-year,R2,0.08520000000,heatpump,2,2026
+8,heat,all-week,mid-afternoon,2024,all-year,R2,0.08520000000,heatpump,2,2026
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.51440000000,gasboiler,2,2026
+5,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.51440000000,gasboiler,2,2026
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.51440000000,gasboiler,2,2026
+5,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.51440000000,gasboiler,2,2026
+0,heat,all-week,early-peak,2020,all-year,R1,0.12170000000,gasboiler,3,2026
+1,heat,all-week,early-peak,2020,all-year,R1,0.33480000000,heatpump,3,2026
+2,heat,all-week,early-peak,2022,all-year,R1,0.12170000000,heatpump,3,2026
+3,heat,all-week,early-peak,2024,all-year,R1,0.12170000000,heatpump,3,2026
+5,heat,all-week,early-peak,2020,all-year,R1,0.12170000000,gasboiler,3,2026
+6,heat,all-week,early-peak,2020,all-year,R1,0.33480000000,heatpump,3,2026
+7,heat,all-week,early-peak,2022,all-year,R1,0.12170000000,heatpump,3,2026
+8,heat,all-week,early-peak,2024,all-year,R1,0.12170000000,heatpump,3,2026
+0,heat,all-week,early-peak,2020,all-year,R2,0.12170000000,gasboiler,3,2026
+1,heat,all-week,early-peak,2020,all-year,R2,0.33480000000,heatpump,3,2026
+2,heat,all-week,early-peak,2022,all-year,R2,0.12170000000,heatpump,3,2026
+3,heat,all-week,early-peak,2024,all-year,R2,0.12170000000,heatpump,3,2026
+5,heat,all-week,early-peak,2020,all-year,R2,0.12170000000,gasboiler,3,2026
+6,heat,all-week,early-peak,2020,all-year,R2,0.33480000000,heatpump,3,2026
+7,heat,all-week,early-peak,2022,all-year,R2,0.12170000000,heatpump,3,2026
+8,heat,all-week,early-peak,2024,all-year,R2,0.12170000000,heatpump,3,2026
+0,CO2f,all-week,early-peak,2020,all-year,R1,7.87770000000,gasboiler,3,2026
+5,CO2f,all-week,early-peak,2020,all-year,R1,7.87770000000,gasboiler,3,2026
+0,CO2f,all-week,early-peak,2020,all-year,R2,7.87770000000,gasboiler,3,2026
+5,CO2f,all-week,early-peak,2020,all-year,R2,7.87770000000,gasboiler,3,2026
+0,heat,all-week,late-peak,2020,all-year,R1,0.25570000000,gasboiler,4,2026
+1,heat,all-week,late-peak,2020,all-year,R1,0.70300000000,heatpump,4,2026
+2,heat,all-week,late-peak,2022,all-year,R1,0.25570000000,heatpump,4,2026
+3,heat,all-week,late-peak,2024,all-year,R1,0.25570000000,heatpump,4,2026
+5,heat,all-week,late-peak,2020,all-year,R1,0.25570000000,gasboiler,4,2026
+6,heat,all-week,late-peak,2020,all-year,R1,0.70300000000,heatpump,4,2026
+7,heat,all-week,late-peak,2022,all-year,R1,0.25570000000,heatpump,4,2026
+8,heat,all-week,late-peak,2024,all-year,R1,0.25570000000,heatpump,4,2026
+0,heat,all-week,late-peak,2020,all-year,R2,0.25570000000,gasboiler,4,2026
+1,heat,all-week,late-peak,2020,all-year,R2,0.70300000000,heatpump,4,2026
+2,heat,all-week,late-peak,2022,all-year,R2,0.25570000000,heatpump,4,2026
+3,heat,all-week,late-peak,2024,all-year,R2,0.25570000000,heatpump,4,2026
+5,heat,all-week,late-peak,2020,all-year,R2,0.25570000000,gasboiler,4,2026
+6,heat,all-week,late-peak,2020,all-year,R2,0.70300000000,heatpump,4,2026
+7,heat,all-week,late-peak,2022,all-year,R2,0.25570000000,heatpump,4,2026
+8,heat,all-week,late-peak,2024,all-year,R2,0.25570000000,heatpump,4,2026
+0,CO2f,all-week,late-peak,2020,all-year,R1,16.54330000000,gasboiler,4,2026
+5,CO2f,all-week,late-peak,2020,all-year,R1,16.54330000000,gasboiler,4,2026
+0,CO2f,all-week,late-peak,2020,all-year,R2,16.54330000000,gasboiler,4,2026
+5,CO2f,all-week,late-peak,2020,all-year,R2,16.54330000000,gasboiler,4,2026
+0,heat,all-week,evening,2020,all-year,R1,0.17040000000,gasboiler,5,2026
+1,heat,all-week,evening,2020,all-year,R1,0.46870000000,heatpump,5,2026
+2,heat,all-week,evening,2022,all-year,R1,0.17040000000,heatpump,5,2026
+3,heat,all-week,evening,2024,all-year,R1,0.17040000000,heatpump,5,2026
+5,heat,all-week,evening,2020,all-year,R1,0.17040000000,gasboiler,5,2026
+6,heat,all-week,evening,2020,all-year,R1,0.46870000000,heatpump,5,2026
+7,heat,all-week,evening,2022,all-year,R1,0.17040000000,heatpump,5,2026
+8,heat,all-week,evening,2024,all-year,R1,0.17040000000,heatpump,5,2026
+0,heat,all-week,evening,2020,all-year,R2,0.17040000000,gasboiler,5,2026
+1,heat,all-week,evening,2020,all-year,R2,0.46870000000,heatpump,5,2026
+2,heat,all-week,evening,2022,all-year,R2,0.17040000000,heatpump,5,2026
+3,heat,all-week,evening,2024,all-year,R2,0.17040000000,heatpump,5,2026
+5,heat,all-week,evening,2020,all-year,R2,0.17040000000,gasboiler,5,2026
+6,heat,all-week,evening,2020,all-year,R2,0.46870000000,heatpump,5,2026
+7,heat,all-week,evening,2022,all-year,R2,0.17040000000,heatpump,5,2026
+8,heat,all-week,evening,2024,all-year,R2,0.17040000000,heatpump,5,2026
+0,CO2f,all-week,evening,2020,all-year,R1,11.02880000000,gasboiler,5,2026
+5,CO2f,all-week,evening,2020,all-year,R1,11.02880000000,gasboiler,5,2026
+0,CO2f,all-week,evening,2020,all-year,R2,11.02880000000,gasboiler,5,2026
+5,CO2f,all-week,evening,2020,all-year,R2,11.02880000000,gasboiler,5,2026
+0,heat,all-week,early-morning,2020,all-year,R1,0.17040000000,gasboiler,6,2026
+1,heat,all-week,early-morning,2020,all-year,R1,0.46870000000,heatpump,6,2026
+2,heat,all-week,early-morning,2022,all-year,R1,0.17040000000,heatpump,6,2026
+3,heat,all-week,early-morning,2024,all-year,R1,0.17040000000,heatpump,6,2026
+5,heat,all-week,early-morning,2020,all-year,R1,0.17040000000,gasboiler,6,2026
+6,heat,all-week,early-morning,2020,all-year,R1,0.46870000000,heatpump,6,2026
+7,heat,all-week,early-morning,2022,all-year,R1,0.17040000000,heatpump,6,2026
+8,heat,all-week,early-morning,2024,all-year,R1,0.17040000000,heatpump,6,2026
+0,heat,all-week,early-morning,2020,all-year,R2,0.17040000000,gasboiler,6,2026
+1,heat,all-week,early-morning,2020,all-year,R2,0.46870000000,heatpump,6,2026
+2,heat,all-week,early-morning,2022,all-year,R2,0.17040000000,heatpump,6,2026
+3,heat,all-week,early-morning,2024,all-year,R2,0.17040000000,heatpump,6,2026
+5,heat,all-week,early-morning,2020,all-year,R2,0.17040000000,gasboiler,6,2026
+6,heat,all-week,early-morning,2020,all-year,R2,0.46870000000,heatpump,6,2026
+7,heat,all-week,early-morning,2022,all-year,R2,0.17040000000,heatpump,6,2026
+8,heat,all-week,early-morning,2024,all-year,R2,0.17040000000,heatpump,6,2026
+0,CO2f,all-week,early-morning,2020,all-year,R1,11.02880000000,gasboiler,6,2026
+5,CO2f,all-week,early-morning,2020,all-year,R1,11.02880000000,gasboiler,6,2026
+0,CO2f,all-week,early-morning,2020,all-year,R2,11.02880000000,gasboiler,6,2026
+5,CO2f,all-week,early-morning,2020,all-year,R2,11.02880000000,gasboiler,6,2026
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.17040000000,gasboiler,7,2026
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.46870000000,heatpump,7,2026
+2,heat,all-week,late-afternoon,2022,all-year,R1,0.17040000000,heatpump,7,2026
+3,heat,all-week,late-afternoon,2024,all-year,R1,0.17040000000,heatpump,7,2026
+5,heat,all-week,late-afternoon,2020,all-year,R1,0.17040000000,gasboiler,7,2026
+6,heat,all-week,late-afternoon,2020,all-year,R1,0.46870000000,heatpump,7,2026
+7,heat,all-week,late-afternoon,2022,all-year,R1,0.17040000000,heatpump,7,2026
+8,heat,all-week,late-afternoon,2024,all-year,R1,0.17040000000,heatpump,7,2026
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.17040000000,gasboiler,7,2026
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.46870000000,heatpump,7,2026
+2,heat,all-week,late-afternoon,2022,all-year,R2,0.17040000000,heatpump,7,2026
+3,heat,all-week,late-afternoon,2024,all-year,R2,0.17040000000,heatpump,7,2026
+5,heat,all-week,late-afternoon,2020,all-year,R2,0.17040000000,gasboiler,7,2026
+6,heat,all-week,late-afternoon,2020,all-year,R2,0.46870000000,heatpump,7,2026
+7,heat,all-week,late-afternoon,2022,all-year,R2,0.17040000000,heatpump,7,2026
+8,heat,all-week,late-afternoon,2024,all-year,R2,0.17040000000,heatpump,7,2026
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,11.02880000000,gasboiler,7,2026
+5,CO2f,all-week,late-afternoon,2020,all-year,R1,11.02880000000,gasboiler,7,2026
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,11.02880000000,gasboiler,7,2026
+5,CO2f,all-week,late-afternoon,2020,all-year,R2,11.02880000000,gasboiler,7,2026
+0,heat,all-week,night,2020,all-year,R1,0.04290000000,gasboiler,0,2028
+1,heat,all-week,night,2020,all-year,R1,0.23610000000,heatpump,0,2028
+2,heat,all-week,night,2022,all-year,R1,0.08590000000,heatpump,0,2028
+3,heat,all-week,night,2024,all-year,R1,0.08590000000,heatpump,0,2028
+4,heat,all-week,night,2026,all-year,R1,0.08590000000,heatpump,0,2028
+6,heat,all-week,night,2020,all-year,R1,0.04290000000,gasboiler,0,2028
+7,heat,all-week,night,2020,all-year,R1,0.23610000000,heatpump,0,2028
+8,heat,all-week,night,2022,all-year,R1,0.08590000000,heatpump,0,2028
+9,heat,all-week,night,2024,all-year,R1,0.08590000000,heatpump,0,2028
+10,heat,all-week,night,2026,all-year,R1,0.08590000000,heatpump,0,2028
+0,heat,all-week,night,2020,all-year,R2,0.04290000000,gasboiler,0,2028
+1,heat,all-week,night,2020,all-year,R2,0.23610000000,heatpump,0,2028
+2,heat,all-week,night,2022,all-year,R2,0.08590000000,heatpump,0,2028
+3,heat,all-week,night,2024,all-year,R2,0.08590000000,heatpump,0,2028
+4,heat,all-week,night,2026,all-year,R2,0.08590000000,heatpump,0,2028
+6,heat,all-week,night,2020,all-year,R2,0.04290000000,gasboiler,0,2028
+7,heat,all-week,night,2020,all-year,R2,0.23610000000,heatpump,0,2028
+8,heat,all-week,night,2022,all-year,R2,0.08590000000,heatpump,0,2028
+9,heat,all-week,night,2024,all-year,R2,0.08590000000,heatpump,0,2028
+10,heat,all-week,night,2026,all-year,R2,0.08590000000,heatpump,0,2028
+0,CO2f,all-week,night,2020,all-year,R1,2.77820000000,gasboiler,0,2028
+6,CO2f,all-week,night,2020,all-year,R1,2.77820000000,gasboiler,0,2028
+0,CO2f,all-week,night,2020,all-year,R2,2.77820000000,gasboiler,0,2028
+6,CO2f,all-week,night,2020,all-year,R2,2.77820000000,gasboiler,0,2028
+0,heat,all-week,morning,2020,all-year,R1,0.06130000000,gasboiler,1,2028
+1,heat,all-week,morning,2020,all-year,R1,0.33730000000,heatpump,1,2028
+2,heat,all-week,morning,2022,all-year,R1,0.12270000000,heatpump,1,2028
+3,heat,all-week,morning,2024,all-year,R1,0.12270000000,heatpump,1,2028
+4,heat,all-week,morning,2026,all-year,R1,0.12270000000,heatpump,1,2028
+6,heat,all-week,morning,2020,all-year,R1,0.06130000000,gasboiler,1,2028
+7,heat,all-week,morning,2020,all-year,R1,0.33730000000,heatpump,1,2028
+8,heat,all-week,morning,2022,all-year,R1,0.12270000000,heatpump,1,2028
+9,heat,all-week,morning,2024,all-year,R1,0.12270000000,heatpump,1,2028
+10,heat,all-week,morning,2026,all-year,R1,0.12270000000,heatpump,1,2028
+0,heat,all-week,morning,2020,all-year,R2,0.06130000000,gasboiler,1,2028
+1,heat,all-week,morning,2020,all-year,R2,0.33730000000,heatpump,1,2028
+2,heat,all-week,morning,2022,all-year,R2,0.12270000000,heatpump,1,2028
+3,heat,all-week,morning,2024,all-year,R2,0.12270000000,heatpump,1,2028
+4,heat,all-week,morning,2026,all-year,R2,0.12270000000,heatpump,1,2028
+6,heat,all-week,morning,2020,all-year,R2,0.06130000000,gasboiler,1,2028
+7,heat,all-week,morning,2020,all-year,R2,0.33730000000,heatpump,1,2028
+8,heat,all-week,morning,2022,all-year,R2,0.12270000000,heatpump,1,2028
+9,heat,all-week,morning,2024,all-year,R2,0.12270000000,heatpump,1,2028
+10,heat,all-week,morning,2026,all-year,R2,0.12270000000,heatpump,1,2028
+0,CO2f,all-week,morning,2020,all-year,R1,3.96890000000,gasboiler,1,2028
+6,CO2f,all-week,morning,2020,all-year,R1,3.96890000000,gasboiler,1,2028
+0,CO2f,all-week,morning,2020,all-year,R2,3.96890000000,gasboiler,1,2028
+6,CO2f,all-week,morning,2020,all-year,R2,3.96890000000,gasboiler,1,2028
+0,heat,all-week,mid-afternoon,2020,all-year,R1,0.04290000000,gasboiler,2,2028
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.23610000000,heatpump,2,2028
+2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08590000000,heatpump,2,2028
+3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08590000000,heatpump,2,2028
+4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08590000000,heatpump,2,2028
+6,heat,all-week,mid-afternoon,2020,all-year,R1,0.04290000000,gasboiler,2,2028
+7,heat,all-week,mid-afternoon,2020,all-year,R1,0.23610000000,heatpump,2,2028
+8,heat,all-week,mid-afternoon,2022,all-year,R1,0.08590000000,heatpump,2,2028
+9,heat,all-week,mid-afternoon,2024,all-year,R1,0.08590000000,heatpump,2,2028
+10,heat,all-week,mid-afternoon,2026,all-year,R1,0.08590000000,heatpump,2,2028
+0,heat,all-week,mid-afternoon,2020,all-year,R2,0.04290000000,gasboiler,2,2028
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.23610000000,heatpump,2,2028
+2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08590000000,heatpump,2,2028
+3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08590000000,heatpump,2,2028
+4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08590000000,heatpump,2,2028
+6,heat,all-week,mid-afternoon,2020,all-year,R2,0.04290000000,gasboiler,2,2028
+7,heat,all-week,mid-afternoon,2020,all-year,R2,0.23610000000,heatpump,2,2028
+8,heat,all-week,mid-afternoon,2022,all-year,R2,0.08590000000,heatpump,2,2028
+9,heat,all-week,mid-afternoon,2024,all-year,R2,0.08590000000,heatpump,2,2028
+10,heat,all-week,mid-afternoon,2026,all-year,R2,0.08590000000,heatpump,2,2028
+0,CO2f,all-week,mid-afternoon,2020,all-year,R1,2.77820000000,gasboiler,2,2028
+6,CO2f,all-week,mid-afternoon,2020,all-year,R1,2.77820000000,gasboiler,2,2028
+0,CO2f,all-week,mid-afternoon,2020,all-year,R2,2.77820000000,gasboiler,2,2028
+6,CO2f,all-week,mid-afternoon,2020,all-year,R2,2.77820000000,gasboiler,2,2028
+0,heat,all-week,early-peak,2020,all-year,R1,0.06130000000,gasboiler,3,2028
+1,heat,all-week,early-peak,2020,all-year,R1,0.33730000000,heatpump,3,2028
+2,heat,all-week,early-peak,2022,all-year,R1,0.12270000000,heatpump,3,2028
+3,heat,all-week,early-peak,2024,all-year,R1,0.12270000000,heatpump,3,2028
+4,heat,all-week,early-peak,2026,all-year,R1,0.12270000000,heatpump,3,2028
+6,heat,all-week,early-peak,2020,all-year,R1,0.06130000000,gasboiler,3,2028
+7,heat,all-week,early-peak,2020,all-year,R1,0.33730000000,heatpump,3,2028
+8,heat,all-week,early-peak,2022,all-year,R1,0.12270000000,heatpump,3,2028
+9,heat,all-week,early-peak,2024,all-year,R1,0.12270000000,heatpump,3,2028
+10,heat,all-week,early-peak,2026,all-year,R1,0.12270000000,heatpump,3,2028
+0,heat,all-week,early-peak,2020,all-year,R2,0.06130000000,gasboiler,3,2028
+1,heat,all-week,early-peak,2020,all-year,R2,0.33730000000,heatpump,3,2028
+2,heat,all-week,early-peak,2022,all-year,R2,0.12270000000,heatpump,3,2028
+3,heat,all-week,early-peak,2024,all-year,R2,0.12270000000,heatpump,3,2028
+4,heat,all-week,early-peak,2026,all-year,R2,0.12270000000,heatpump,3,2028
+6,heat,all-week,early-peak,2020,all-year,R2,0.06130000000,gasboiler,3,2028
+7,heat,all-week,early-peak,2020,all-year,R2,0.33730000000,heatpump,3,2028
+8,heat,all-week,early-peak,2022,all-year,R2,0.12270000000,heatpump,3,2028
+9,heat,all-week,early-peak,2024,all-year,R2,0.12270000000,heatpump,3,2028
+10,heat,all-week,early-peak,2026,all-year,R2,0.12270000000,heatpump,3,2028
+0,CO2f,all-week,early-peak,2020,all-year,R1,3.96890000000,gasboiler,3,2028
+6,CO2f,all-week,early-peak,2020,all-year,R1,3.96890000000,gasboiler,3,2028
+0,CO2f,all-week,early-peak,2020,all-year,R2,3.96890000000,gasboiler,3,2028
+6,CO2f,all-week,early-peak,2020,all-year,R2,3.96890000000,gasboiler,3,2028
+0,heat,all-week,late-peak,2020,all-year,R1,0.12880000000,gasboiler,4,2028
+1,heat,all-week,late-peak,2020,all-year,R1,0.70840000000,heatpump,4,2028
+2,heat,all-week,late-peak,2022,all-year,R1,0.25760000000,heatpump,4,2028
+3,heat,all-week,late-peak,2024,all-year,R1,0.25760000000,heatpump,4,2028
+4,heat,all-week,late-peak,2026,all-year,R1,0.25760000000,heatpump,4,2028
+6,heat,all-week,late-peak,2020,all-year,R1,0.12880000000,gasboiler,4,2028
+7,heat,all-week,late-peak,2020,all-year,R1,0.70840000000,heatpump,4,2028
+8,heat,all-week,late-peak,2022,all-year,R1,0.25760000000,heatpump,4,2028
+9,heat,all-week,late-peak,2024,all-year,R1,0.25760000000,heatpump,4,2028
+10,heat,all-week,late-peak,2026,all-year,R1,0.25760000000,heatpump,4,2028
+0,heat,all-week,late-peak,2020,all-year,R2,0.12880000000,gasboiler,4,2028
+1,heat,all-week,late-peak,2020,all-year,R2,0.70840000000,heatpump,4,2028
+2,heat,all-week,late-peak,2022,all-year,R2,0.25760000000,heatpump,4,2028
+3,heat,all-week,late-peak,2024,all-year,R2,0.25760000000,heatpump,4,2028
+4,heat,all-week,late-peak,2026,all-year,R2,0.25760000000,heatpump,4,2028
+6,heat,all-week,late-peak,2020,all-year,R2,0.12880000000,gasboiler,4,2028
+7,heat,all-week,late-peak,2020,all-year,R2,0.70840000000,heatpump,4,2028
+8,heat,all-week,late-peak,2022,all-year,R2,0.25760000000,heatpump,4,2028
+9,heat,all-week,late-peak,2024,all-year,R2,0.25760000000,heatpump,4,2028
+10,heat,all-week,late-peak,2026,all-year,R2,0.25760000000,heatpump,4,2028
+0,CO2f,all-week,late-peak,2020,all-year,R1,8.33460000000,gasboiler,4,2028
+6,CO2f,all-week,late-peak,2020,all-year,R1,8.33460000000,gasboiler,4,2028
+0,CO2f,all-week,late-peak,2020,all-year,R2,8.33460000000,gasboiler,4,2028
+6,CO2f,all-week,late-peak,2020,all-year,R2,8.33460000000,gasboiler,4,2028
+0,heat,all-week,evening,2020,all-year,R1,0.08590000000,gasboiler,5,2028
+1,heat,all-week,evening,2020,all-year,R1,0.47230000000,heatpump,5,2028
+2,heat,all-week,evening,2022,all-year,R1,0.17170000000,heatpump,5,2028
+3,heat,all-week,evening,2024,all-year,R1,0.17170000000,heatpump,5,2028
+4,heat,all-week,evening,2026,all-year,R1,0.17170000000,heatpump,5,2028
+6,heat,all-week,evening,2020,all-year,R1,0.08590000000,gasboiler,5,2028
+7,heat,all-week,evening,2020,all-year,R1,0.47230000000,heatpump,5,2028
+8,heat,all-week,evening,2022,all-year,R1,0.17170000000,heatpump,5,2028
+9,heat,all-week,evening,2024,all-year,R1,0.17170000000,heatpump,5,2028
+10,heat,all-week,evening,2026,all-year,R1,0.17170000000,heatpump,5,2028
+0,heat,all-week,evening,2020,all-year,R2,0.08590000000,gasboiler,5,2028
+1,heat,all-week,evening,2020,all-year,R2,0.47230000000,heatpump,5,2028
+2,heat,all-week,evening,2022,all-year,R2,0.17170000000,heatpump,5,2028
+3,heat,all-week,evening,2024,all-year,R2,0.17170000000,heatpump,5,2028
+4,heat,all-week,evening,2026,all-year,R2,0.17170000000,heatpump,5,2028
+6,heat,all-week,evening,2020,all-year,R2,0.08590000000,gasboiler,5,2028
+7,heat,all-week,evening,2020,all-year,R2,0.47230000000,heatpump,5,2028
+8,heat,all-week,evening,2022,all-year,R2,0.17170000000,heatpump,5,2028
+9,heat,all-week,evening,2024,all-year,R2,0.17170000000,heatpump,5,2028
+10,heat,all-week,evening,2026,all-year,R2,0.17170000000,heatpump,5,2028
+0,CO2f,all-week,evening,2020,all-year,R1,5.55640000000,gasboiler,5,2028
+6,CO2f,all-week,evening,2020,all-year,R1,5.55640000000,gasboiler,5,2028
+0,CO2f,all-week,evening,2020,all-year,R2,5.55640000000,gasboiler,5,2028
+6,CO2f,all-week,evening,2020,all-year,R2,5.55640000000,gasboiler,5,2028
+0,heat,all-week,early-morning,2020,all-year,R1,0.08590000000,gasboiler,6,2028
+1,heat,all-week,early-morning,2020,all-year,R1,0.47230000000,heatpump,6,2028
+2,heat,all-week,early-morning,2022,all-year,R1,0.17170000000,heatpump,6,2028
+3,heat,all-week,early-morning,2024,all-year,R1,0.17170000000,heatpump,6,2028
+4,heat,all-week,early-morning,2026,all-year,R1,0.17170000000,heatpump,6,2028
+6,heat,all-week,early-morning,2020,all-year,R1,0.08590000000,gasboiler,6,2028
+7,heat,all-week,early-morning,2020,all-year,R1,0.47230000000,heatpump,6,2028
+8,heat,all-week,early-morning,2022,all-year,R1,0.17170000000,heatpump,6,2028
+9,heat,all-week,early-morning,2024,all-year,R1,0.17170000000,heatpump,6,2028
+10,heat,all-week,early-morning,2026,all-year,R1,0.17170000000,heatpump,6,2028
+0,heat,all-week,early-morning,2020,all-year,R2,0.08590000000,gasboiler,6,2028
+1,heat,all-week,early-morning,2020,all-year,R2,0.47230000000,heatpump,6,2028
+2,heat,all-week,early-morning,2022,all-year,R2,0.17170000000,heatpump,6,2028
+3,heat,all-week,early-morning,2024,all-year,R2,0.17170000000,heatpump,6,2028
+4,heat,all-week,early-morning,2026,all-year,R2,0.17170000000,heatpump,6,2028
+6,heat,all-week,early-morning,2020,all-year,R2,0.08590000000,gasboiler,6,2028
+7,heat,all-week,early-morning,2020,all-year,R2,0.47230000000,heatpump,6,2028
+8,heat,all-week,early-morning,2022,all-year,R2,0.17170000000,heatpump,6,2028
+9,heat,all-week,early-morning,2024,all-year,R2,0.17170000000,heatpump,6,2028
+10,heat,all-week,early-morning,2026,all-year,R2,0.17170000000,heatpump,6,2028
+0,CO2f,all-week,early-morning,2020,all-year,R1,5.55640000000,gasboiler,6,2028
+6,CO2f,all-week,early-morning,2020,all-year,R1,5.55640000000,gasboiler,6,2028
+0,CO2f,all-week,early-morning,2020,all-year,R2,5.55640000000,gasboiler,6,2028
+6,CO2f,all-week,early-morning,2020,all-year,R2,5.55640000000,gasboiler,6,2028
+0,heat,all-week,late-afternoon,2020,all-year,R1,0.08590000000,gasboiler,7,2028
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.47230000000,heatpump,7,2028
+2,heat,all-week,late-afternoon,2022,all-year,R1,0.17170000000,heatpump,7,2028
+3,heat,all-week,late-afternoon,2024,all-year,R1,0.17170000000,heatpump,7,2028
+4,heat,all-week,late-afternoon,2026,all-year,R1,0.17170000000,heatpump,7,2028
+6,heat,all-week,late-afternoon,2020,all-year,R1,0.08590000000,gasboiler,7,2028
+7,heat,all-week,late-afternoon,2020,all-year,R1,0.47230000000,heatpump,7,2028
+8,heat,all-week,late-afternoon,2022,all-year,R1,0.17170000000,heatpump,7,2028
+9,heat,all-week,late-afternoon,2024,all-year,R1,0.17170000000,heatpump,7,2028
+10,heat,all-week,late-afternoon,2026,all-year,R1,0.17170000000,heatpump,7,2028
+0,heat,all-week,late-afternoon,2020,all-year,R2,0.08590000000,gasboiler,7,2028
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.47230000000,heatpump,7,2028
+2,heat,all-week,late-afternoon,2022,all-year,R2,0.17170000000,heatpump,7,2028
+3,heat,all-week,late-afternoon,2024,all-year,R2,0.17170000000,heatpump,7,2028
+4,heat,all-week,late-afternoon,2026,all-year,R2,0.17170000000,heatpump,7,2028
+6,heat,all-week,late-afternoon,2020,all-year,R2,0.08590000000,gasboiler,7,2028
+7,heat,all-week,late-afternoon,2020,all-year,R2,0.47230000000,heatpump,7,2028
+8,heat,all-week,late-afternoon,2022,all-year,R2,0.17170000000,heatpump,7,2028
+9,heat,all-week,late-afternoon,2024,all-year,R2,0.17170000000,heatpump,7,2028
+10,heat,all-week,late-afternoon,2026,all-year,R2,0.17170000000,heatpump,7,2028
+0,CO2f,all-week,late-afternoon,2020,all-year,R1,5.55640000000,gasboiler,7,2028
+6,CO2f,all-week,late-afternoon,2020,all-year,R1,5.55640000000,gasboiler,7,2028
+0,CO2f,all-week,late-afternoon,2020,all-year,R2,5.55640000000,gasboiler,7,2028
+6,CO2f,all-week,late-afternoon,2020,all-year,R2,5.55640000000,gasboiler,7,2028
+1,heat,all-week,night,2020,all-year,R1,0.22920000000,heatpump,0,2030
+2,heat,all-week,night,2022,all-year,R1,0.08330000000,heatpump,0,2030
+3,heat,all-week,night,2024,all-year,R1,0.08330000000,heatpump,0,2030
+4,heat,all-week,night,2026,all-year,R1,0.08330000000,heatpump,0,2030
+5,heat,all-week,night,2028,all-year,R1,0.10420000000,heatpump,0,2030
+8,heat,all-week,night,2020,all-year,R1,0.22920000000,heatpump,0,2030
+9,heat,all-week,night,2022,all-year,R1,0.08330000000,heatpump,0,2030
+10,heat,all-week,night,2024,all-year,R1,0.08330000000,heatpump,0,2030
+11,heat,all-week,night,2026,all-year,R1,0.08330000000,heatpump,0,2030
+12,heat,all-week,night,2028,all-year,R1,0.10420000000,heatpump,0,2030
+1,heat,all-week,night,2020,all-year,R2,0.22920000000,heatpump,0,2030
+2,heat,all-week,night,2022,all-year,R2,0.08330000000,heatpump,0,2030
+3,heat,all-week,night,2024,all-year,R2,0.08330000000,heatpump,0,2030
+4,heat,all-week,night,2026,all-year,R2,0.08330000000,heatpump,0,2030
+5,heat,all-week,night,2028,all-year,R2,0.10420000000,heatpump,0,2030
+8,heat,all-week,night,2020,all-year,R2,0.22920000000,heatpump,0,2030
+9,heat,all-week,night,2022,all-year,R2,0.08330000000,heatpump,0,2030
+10,heat,all-week,night,2024,all-year,R2,0.08330000000,heatpump,0,2030
+11,heat,all-week,night,2026,all-year,R2,0.08330000000,heatpump,0,2030
+12,heat,all-week,night,2028,all-year,R2,0.10420000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,0.32740000000,heatpump,1,2030
+2,heat,all-week,morning,2022,all-year,R1,0.11900000000,heatpump,1,2030
+3,heat,all-week,morning,2024,all-year,R1,0.11900000000,heatpump,1,2030
+4,heat,all-week,morning,2026,all-year,R1,0.11900000000,heatpump,1,2030
+5,heat,all-week,morning,2028,all-year,R1,0.14880000000,heatpump,1,2030
+8,heat,all-week,morning,2020,all-year,R1,0.32740000000,heatpump,1,2030
+9,heat,all-week,morning,2022,all-year,R1,0.11900000000,heatpump,1,2030
+10,heat,all-week,morning,2024,all-year,R1,0.11900000000,heatpump,1,2030
+11,heat,all-week,morning,2026,all-year,R1,0.11900000000,heatpump,1,2030
+12,heat,all-week,morning,2028,all-year,R1,0.14880000000,heatpump,1,2030
+1,heat,all-week,morning,2020,all-year,R2,0.32740000000,heatpump,1,2030
+2,heat,all-week,morning,2022,all-year,R2,0.11900000000,heatpump,1,2030
+3,heat,all-week,morning,2024,all-year,R2,0.11900000000,heatpump,1,2030
+4,heat,all-week,morning,2026,all-year,R2,0.11900000000,heatpump,1,2030
+5,heat,all-week,morning,2028,all-year,R2,0.14880000000,heatpump,1,2030
+8,heat,all-week,morning,2020,all-year,R2,0.32740000000,heatpump,1,2030
+9,heat,all-week,morning,2022,all-year,R2,0.11900000000,heatpump,1,2030
+10,heat,all-week,morning,2024,all-year,R2,0.11900000000,heatpump,1,2030
+11,heat,all-week,morning,2026,all-year,R2,0.11900000000,heatpump,1,2030
+12,heat,all-week,morning,2028,all-year,R2,0.14880000000,heatpump,1,2030
+1,heat,all-week,mid-afternoon,2020,all-year,R1,0.22920000000,heatpump,2,2030
+2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08330000000,heatpump,2,2030
+3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08330000000,heatpump,2,2030
+4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08330000000,heatpump,2,2030
+5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10420000000,heatpump,2,2030
+8,heat,all-week,mid-afternoon,2020,all-year,R1,0.22920000000,heatpump,2,2030
+9,heat,all-week,mid-afternoon,2022,all-year,R1,0.08330000000,heatpump,2,2030
+10,heat,all-week,mid-afternoon,2024,all-year,R1,0.08330000000,heatpump,2,2030
+11,heat,all-week,mid-afternoon,2026,all-year,R1,0.08330000000,heatpump,2,2030
+12,heat,all-week,mid-afternoon,2028,all-year,R1,0.10420000000,heatpump,2,2030
+1,heat,all-week,mid-afternoon,2020,all-year,R2,0.22920000000,heatpump,2,2030
+2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08330000000,heatpump,2,2030
+3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08330000000,heatpump,2,2030
+4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08330000000,heatpump,2,2030
+5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10420000000,heatpump,2,2030
+8,heat,all-week,mid-afternoon,2020,all-year,R2,0.22920000000,heatpump,2,2030
+9,heat,all-week,mid-afternoon,2022,all-year,R2,0.08330000000,heatpump,2,2030
+10,heat,all-week,mid-afternoon,2024,all-year,R2,0.08330000000,heatpump,2,2030
+11,heat,all-week,mid-afternoon,2026,all-year,R2,0.08330000000,heatpump,2,2030
+12,heat,all-week,mid-afternoon,2028,all-year,R2,0.10420000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,0.32740000000,heatpump,3,2030
+2,heat,all-week,early-peak,2022,all-year,R1,0.11900000000,heatpump,3,2030
+3,heat,all-week,early-peak,2024,all-year,R1,0.11900000000,heatpump,3,2030
+4,heat,all-week,early-peak,2026,all-year,R1,0.11900000000,heatpump,3,2030
+5,heat,all-week,early-peak,2028,all-year,R1,0.14880000000,heatpump,3,2030
+8,heat,all-week,early-peak,2020,all-year,R1,0.32740000000,heatpump,3,2030
+9,heat,all-week,early-peak,2022,all-year,R1,0.11900000000,heatpump,3,2030
+10,heat,all-week,early-peak,2024,all-year,R1,0.11900000000,heatpump,3,2030
+11,heat,all-week,early-peak,2026,all-year,R1,0.11900000000,heatpump,3,2030
+12,heat,all-week,early-peak,2028,all-year,R1,0.14880000000,heatpump,3,2030
+1,heat,all-week,early-peak,2020,all-year,R2,0.32740000000,heatpump,3,2030
+2,heat,all-week,early-peak,2022,all-year,R2,0.11900000000,heatpump,3,2030
+3,heat,all-week,early-peak,2024,all-year,R2,0.11900000000,heatpump,3,2030
+4,heat,all-week,early-peak,2026,all-year,R2,0.11900000000,heatpump,3,2030
+5,heat,all-week,early-peak,2028,all-year,R2,0.14880000000,heatpump,3,2030
+8,heat,all-week,early-peak,2020,all-year,R2,0.32740000000,heatpump,3,2030
+9,heat,all-week,early-peak,2022,all-year,R2,0.11900000000,heatpump,3,2030
+10,heat,all-week,early-peak,2024,all-year,R2,0.11900000000,heatpump,3,2030
+11,heat,all-week,early-peak,2026,all-year,R2,0.11900000000,heatpump,3,2030
+12,heat,all-week,early-peak,2028,all-year,R2,0.14880000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,0.68750000000,heatpump,4,2030
+2,heat,all-week,late-peak,2022,all-year,R1,0.25000000000,heatpump,4,2030
+3,heat,all-week,late-peak,2024,all-year,R1,0.25000000000,heatpump,4,2030
+4,heat,all-week,late-peak,2026,all-year,R1,0.25000000000,heatpump,4,2030
+5,heat,all-week,late-peak,2028,all-year,R1,0.31250000000,heatpump,4,2030
+8,heat,all-week,late-peak,2020,all-year,R1,0.68750000000,heatpump,4,2030
+9,heat,all-week,late-peak,2022,all-year,R1,0.25000000000,heatpump,4,2030
+10,heat,all-week,late-peak,2024,all-year,R1,0.25000000000,heatpump,4,2030
+11,heat,all-week,late-peak,2026,all-year,R1,0.25000000000,heatpump,4,2030
+12,heat,all-week,late-peak,2028,all-year,R1,0.31250000000,heatpump,4,2030
+1,heat,all-week,late-peak,2020,all-year,R2,0.68750000000,heatpump,4,2030
+2,heat,all-week,late-peak,2022,all-year,R2,0.25000000000,heatpump,4,2030
+3,heat,all-week,late-peak,2024,all-year,R2,0.25000000000,heatpump,4,2030
+4,heat,all-week,late-peak,2026,all-year,R2,0.25000000000,heatpump,4,2030
+5,heat,all-week,late-peak,2028,all-year,R2,0.31250000000,heatpump,4,2030
+8,heat,all-week,late-peak,2020,all-year,R2,0.68750000000,heatpump,4,2030
+9,heat,all-week,late-peak,2022,all-year,R2,0.25000000000,heatpump,4,2030
+10,heat,all-week,late-peak,2024,all-year,R2,0.25000000000,heatpump,4,2030
+11,heat,all-week,late-peak,2026,all-year,R2,0.25000000000,heatpump,4,2030
+12,heat,all-week,late-peak,2028,all-year,R2,0.31250000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,0.45830000000,heatpump,5,2030
+2,heat,all-week,evening,2022,all-year,R1,0.16670000000,heatpump,5,2030
+3,heat,all-week,evening,2024,all-year,R1,0.16670000000,heatpump,5,2030
+4,heat,all-week,evening,2026,all-year,R1,0.16670000000,heatpump,5,2030
+5,heat,all-week,evening,2028,all-year,R1,0.20830000000,heatpump,5,2030
+8,heat,all-week,evening,2020,all-year,R1,0.45830000000,heatpump,5,2030
+9,heat,all-week,evening,2022,all-year,R1,0.16670000000,heatpump,5,2030
+10,heat,all-week,evening,2024,all-year,R1,0.16670000000,heatpump,5,2030
+11,heat,all-week,evening,2026,all-year,R1,0.16670000000,heatpump,5,2030
+12,heat,all-week,evening,2028,all-year,R1,0.20830000000,heatpump,5,2030
+1,heat,all-week,evening,2020,all-year,R2,0.45830000000,heatpump,5,2030
+2,heat,all-week,evening,2022,all-year,R2,0.16670000000,heatpump,5,2030
+3,heat,all-week,evening,2024,all-year,R2,0.16670000000,heatpump,5,2030
+4,heat,all-week,evening,2026,all-year,R2,0.16670000000,heatpump,5,2030
+5,heat,all-week,evening,2028,all-year,R2,0.20830000000,heatpump,5,2030
+8,heat,all-week,evening,2020,all-year,R2,0.45830000000,heatpump,5,2030
+9,heat,all-week,evening,2022,all-year,R2,0.16670000000,heatpump,5,2030
+10,heat,all-week,evening,2024,all-year,R2,0.16670000000,heatpump,5,2030
+11,heat,all-week,evening,2026,all-year,R2,0.16670000000,heatpump,5,2030
+12,heat,all-week,evening,2028,all-year,R2,0.20830000000,heatpump,5,2030
+1,heat,all-week,early-morning,2020,all-year,R1,0.45830000000,heatpump,6,2030
+2,heat,all-week,early-morning,2022,all-year,R1,0.16670000000,heatpump,6,2030
+3,heat,all-week,early-morning,2024,all-year,R1,0.16670000000,heatpump,6,2030
+4,heat,all-week,early-morning,2026,all-year,R1,0.16670000000,heatpump,6,2030
+5,heat,all-week,early-morning,2028,all-year,R1,0.20830000000,heatpump,6,2030
+8,heat,all-week,early-morning,2020,all-year,R1,0.45830000000,heatpump,6,2030
+9,heat,all-week,early-morning,2022,all-year,R1,0.16670000000,heatpump,6,2030
+10,heat,all-week,early-morning,2024,all-year,R1,0.16670000000,heatpump,6,2030
+11,heat,all-week,early-morning,2026,all-year,R1,0.16670000000,heatpump,6,2030
+12,heat,all-week,early-morning,2028,all-year,R1,0.20830000000,heatpump,6,2030
+1,heat,all-week,early-morning,2020,all-year,R2,0.45830000000,heatpump,6,2030
+2,heat,all-week,early-morning,2022,all-year,R2,0.16670000000,heatpump,6,2030
+3,heat,all-week,early-morning,2024,all-year,R2,0.16670000000,heatpump,6,2030
+4,heat,all-week,early-morning,2026,all-year,R2,0.16670000000,heatpump,6,2030
+5,heat,all-week,early-morning,2028,all-year,R2,0.20830000000,heatpump,6,2030
+8,heat,all-week,early-morning,2020,all-year,R2,0.45830000000,heatpump,6,2030
+9,heat,all-week,early-morning,2022,all-year,R2,0.16670000000,heatpump,6,2030
+10,heat,all-week,early-morning,2024,all-year,R2,0.16670000000,heatpump,6,2030
+11,heat,all-week,early-morning,2026,all-year,R2,0.16670000000,heatpump,6,2030
+12,heat,all-week,early-morning,2028,all-year,R2,0.20830000000,heatpump,6,2030
+1,heat,all-week,late-afternoon,2020,all-year,R1,0.45830000000,heatpump,7,2030
+2,heat,all-week,late-afternoon,2022,all-year,R1,0.16670000000,heatpump,7,2030
+3,heat,all-week,late-afternoon,2024,all-year,R1,0.16670000000,heatpump,7,2030
+4,heat,all-week,late-afternoon,2026,all-year,R1,0.16670000000,heatpump,7,2030
+5,heat,all-week,late-afternoon,2028,all-year,R1,0.20830000000,heatpump,7,2030
+8,heat,all-week,late-afternoon,2020,all-year,R1,0.45830000000,heatpump,7,2030
+9,heat,all-week,late-afternoon,2022,all-year,R1,0.16670000000,heatpump,7,2030
+10,heat,all-week,late-afternoon,2024,all-year,R1,0.16670000000,heatpump,7,2030
+11,heat,all-week,late-afternoon,2026,all-year,R1,0.16670000000,heatpump,7,2030
+12,heat,all-week,late-afternoon,2028,all-year,R1,0.20830000000,heatpump,7,2030
+1,heat,all-week,late-afternoon,2020,all-year,R2,0.45830000000,heatpump,7,2030
+2,heat,all-week,late-afternoon,2022,all-year,R2,0.16670000000,heatpump,7,2030
+3,heat,all-week,late-afternoon,2024,all-year,R2,0.16670000000,heatpump,7,2030
+4,heat,all-week,late-afternoon,2026,all-year,R2,0.16670000000,heatpump,7,2030
+5,heat,all-week,late-afternoon,2028,all-year,R2,0.20830000000,heatpump,7,2030
+8,heat,all-week,late-afternoon,2020,all-year,R2,0.45830000000,heatpump,7,2030
+9,heat,all-week,late-afternoon,2022,all-year,R2,0.16670000000,heatpump,7,2030
+10,heat,all-week,late-afternoon,2024,all-year,R2,0.16670000000,heatpump,7,2030
+11,heat,all-week,late-afternoon,2026,all-year,R2,0.16670000000,heatpump,7,2030
+12,heat,all-week,late-afternoon,2028,all-year,R2,0.20830000000,heatpump,7,2030
+2,heat,all-week,night,2022,all-year,R1,0.08400000000,heatpump,0,2032
+3,heat,all-week,night,2024,all-year,R1,0.08400000000,heatpump,0,2032
+4,heat,all-week,night,2026,all-year,R1,0.08400000000,heatpump,0,2032
+5,heat,all-week,night,2028,all-year,R1,0.10500000000,heatpump,0,2032
+6,heat,all-week,night,2030,all-year,R1,0.27300000000,heatpump,0,2032
+10,heat,all-week,night,2022,all-year,R1,0.08400000000,heatpump,0,2032
+11,heat,all-week,night,2024,all-year,R1,0.08400000000,heatpump,0,2032
+12,heat,all-week,night,2026,all-year,R1,0.08400000000,heatpump,0,2032
+13,heat,all-week,night,2028,all-year,R1,0.10500000000,heatpump,0,2032
+14,heat,all-week,night,2030,all-year,R1,0.27300000000,heatpump,0,2032
+2,heat,all-week,night,2022,all-year,R2,0.08400000000,heatpump,0,2032
+3,heat,all-week,night,2024,all-year,R2,0.08400000000,heatpump,0,2032
+4,heat,all-week,night,2026,all-year,R2,0.08400000000,heatpump,0,2032
+5,heat,all-week,night,2028,all-year,R2,0.10500000000,heatpump,0,2032
+6,heat,all-week,night,2030,all-year,R2,0.27300000000,heatpump,0,2032
+10,heat,all-week,night,2022,all-year,R2,0.08400000000,heatpump,0,2032
+11,heat,all-week,night,2024,all-year,R2,0.08400000000,heatpump,0,2032
+12,heat,all-week,night,2026,all-year,R2,0.08400000000,heatpump,0,2032
+13,heat,all-week,night,2028,all-year,R2,0.10500000000,heatpump,0,2032
+14,heat,all-week,night,2030,all-year,R2,0.27300000000,heatpump,0,2032
+2,heat,all-week,morning,2022,all-year,R1,0.12000000000,heatpump,1,2032
+3,heat,all-week,morning,2024,all-year,R1,0.12000000000,heatpump,1,2032
+4,heat,all-week,morning,2026,all-year,R1,0.12000000000,heatpump,1,2032
+5,heat,all-week,morning,2028,all-year,R1,0.15000000000,heatpump,1,2032
+6,heat,all-week,morning,2030,all-year,R1,0.39000000000,heatpump,1,2032
+10,heat,all-week,morning,2022,all-year,R1,0.12000000000,heatpump,1,2032
+11,heat,all-week,morning,2024,all-year,R1,0.12000000000,heatpump,1,2032
+12,heat,all-week,morning,2026,all-year,R1,0.12000000000,heatpump,1,2032
+13,heat,all-week,morning,2028,all-year,R1,0.15000000000,heatpump,1,2032
+14,heat,all-week,morning,2030,all-year,R1,0.39000000000,heatpump,1,2032
+2,heat,all-week,morning,2022,all-year,R2,0.12000000000,heatpump,1,2032
+3,heat,all-week,morning,2024,all-year,R2,0.12000000000,heatpump,1,2032
+4,heat,all-week,morning,2026,all-year,R2,0.12000000000,heatpump,1,2032
+5,heat,all-week,morning,2028,all-year,R2,0.15000000000,heatpump,1,2032
+6,heat,all-week,morning,2030,all-year,R2,0.39000000000,heatpump,1,2032
+10,heat,all-week,morning,2022,all-year,R2,0.12000000000,heatpump,1,2032
+11,heat,all-week,morning,2024,all-year,R2,0.12000000000,heatpump,1,2032
+12,heat,all-week,morning,2026,all-year,R2,0.12000000000,heatpump,1,2032
+13,heat,all-week,morning,2028,all-year,R2,0.15000000000,heatpump,1,2032
+14,heat,all-week,morning,2030,all-year,R2,0.39000000000,heatpump,1,2032
+2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08400000000,heatpump,2,2032
+3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08400000000,heatpump,2,2032
+4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08400000000,heatpump,2,2032
+5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10500000000,heatpump,2,2032
+6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27300000000,heatpump,2,2032
+10,heat,all-week,mid-afternoon,2022,all-year,R1,0.08400000000,heatpump,2,2032
+11,heat,all-week,mid-afternoon,2024,all-year,R1,0.08400000000,heatpump,2,2032
+12,heat,all-week,mid-afternoon,2026,all-year,R1,0.08400000000,heatpump,2,2032
+13,heat,all-week,mid-afternoon,2028,all-year,R1,0.10500000000,heatpump,2,2032
+14,heat,all-week,mid-afternoon,2030,all-year,R1,0.27300000000,heatpump,2,2032
+2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08400000000,heatpump,2,2032
+3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08400000000,heatpump,2,2032
+4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08400000000,heatpump,2,2032
+5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10500000000,heatpump,2,2032
+6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27300000000,heatpump,2,2032
+10,heat,all-week,mid-afternoon,2022,all-year,R2,0.08400000000,heatpump,2,2032
+11,heat,all-week,mid-afternoon,2024,all-year,R2,0.08400000000,heatpump,2,2032
+12,heat,all-week,mid-afternoon,2026,all-year,R2,0.08400000000,heatpump,2,2032
+13,heat,all-week,mid-afternoon,2028,all-year,R2,0.10500000000,heatpump,2,2032
+14,heat,all-week,mid-afternoon,2030,all-year,R2,0.27300000000,heatpump,2,2032
+2,heat,all-week,early-peak,2022,all-year,R1,0.12000000000,heatpump,3,2032
+3,heat,all-week,early-peak,2024,all-year,R1,0.12000000000,heatpump,3,2032
+4,heat,all-week,early-peak,2026,all-year,R1,0.12000000000,heatpump,3,2032
+5,heat,all-week,early-peak,2028,all-year,R1,0.15000000000,heatpump,3,2032
+6,heat,all-week,early-peak,2030,all-year,R1,0.39000000000,heatpump,3,2032
+10,heat,all-week,early-peak,2022,all-year,R1,0.12000000000,heatpump,3,2032
+11,heat,all-week,early-peak,2024,all-year,R1,0.12000000000,heatpump,3,2032
+12,heat,all-week,early-peak,2026,all-year,R1,0.12000000000,heatpump,3,2032
+13,heat,all-week,early-peak,2028,all-year,R1,0.15000000000,heatpump,3,2032
+14,heat,all-week,early-peak,2030,all-year,R1,0.39000000000,heatpump,3,2032
+2,heat,all-week,early-peak,2022,all-year,R2,0.12000000000,heatpump,3,2032
+3,heat,all-week,early-peak,2024,all-year,R2,0.12000000000,heatpump,3,2032
+4,heat,all-week,early-peak,2026,all-year,R2,0.12000000000,heatpump,3,2032
+5,heat,all-week,early-peak,2028,all-year,R2,0.15000000000,heatpump,3,2032
+6,heat,all-week,early-peak,2030,all-year,R2,0.39000000000,heatpump,3,2032
+10,heat,all-week,early-peak,2022,all-year,R2,0.12000000000,heatpump,3,2032
+11,heat,all-week,early-peak,2024,all-year,R2,0.12000000000,heatpump,3,2032
+12,heat,all-week,early-peak,2026,all-year,R2,0.12000000000,heatpump,3,2032
+13,heat,all-week,early-peak,2028,all-year,R2,0.15000000000,heatpump,3,2032
+14,heat,all-week,early-peak,2030,all-year,R2,0.39000000000,heatpump,3,2032
+2,heat,all-week,late-peak,2022,all-year,R1,0.25200000000,heatpump,4,2032
+3,heat,all-week,late-peak,2024,all-year,R1,0.25200000000,heatpump,4,2032
+4,heat,all-week,late-peak,2026,all-year,R1,0.25200000000,heatpump,4,2032
+5,heat,all-week,late-peak,2028,all-year,R1,0.31500000000,heatpump,4,2032
+6,heat,all-week,late-peak,2030,all-year,R1,0.81900000000,heatpump,4,2032
+10,heat,all-week,late-peak,2022,all-year,R1,0.25200000000,heatpump,4,2032
+11,heat,all-week,late-peak,2024,all-year,R1,0.25200000000,heatpump,4,2032
+12,heat,all-week,late-peak,2026,all-year,R1,0.25200000000,heatpump,4,2032
+13,heat,all-week,late-peak,2028,all-year,R1,0.31500000000,heatpump,4,2032
+14,heat,all-week,late-peak,2030,all-year,R1,0.81900000000,heatpump,4,2032
+2,heat,all-week,late-peak,2022,all-year,R2,0.25200000000,heatpump,4,2032
+3,heat,all-week,late-peak,2024,all-year,R2,0.25200000000,heatpump,4,2032
+4,heat,all-week,late-peak,2026,all-year,R2,0.25200000000,heatpump,4,2032
+5,heat,all-week,late-peak,2028,all-year,R2,0.31500000000,heatpump,4,2032
+6,heat,all-week,late-peak,2030,all-year,R2,0.81900000000,heatpump,4,2032
+10,heat,all-week,late-peak,2022,all-year,R2,0.25200000000,heatpump,4,2032
+11,heat,all-week,late-peak,2024,all-year,R2,0.25200000000,heatpump,4,2032
+12,heat,all-week,late-peak,2026,all-year,R2,0.25200000000,heatpump,4,2032
+13,heat,all-week,late-peak,2028,all-year,R2,0.31500000000,heatpump,4,2032
+14,heat,all-week,late-peak,2030,all-year,R2,0.81900000000,heatpump,4,2032
+2,heat,all-week,evening,2022,all-year,R1,0.16800000000,heatpump,5,2032
+3,heat,all-week,evening,2024,all-year,R1,0.16800000000,heatpump,5,2032
+4,heat,all-week,evening,2026,all-year,R1,0.16800000000,heatpump,5,2032
+5,heat,all-week,evening,2028,all-year,R1,0.21000000000,heatpump,5,2032
+6,heat,all-week,evening,2030,all-year,R1,0.54600000000,heatpump,5,2032
+10,heat,all-week,evening,2022,all-year,R1,0.16800000000,heatpump,5,2032
+11,heat,all-week,evening,2024,all-year,R1,0.16800000000,heatpump,5,2032
+12,heat,all-week,evening,2026,all-year,R1,0.16800000000,heatpump,5,2032
+13,heat,all-week,evening,2028,all-year,R1,0.21000000000,heatpump,5,2032
+14,heat,all-week,evening,2030,all-year,R1,0.54600000000,heatpump,5,2032
+2,heat,all-week,evening,2022,all-year,R2,0.16800000000,heatpump,5,2032
+3,heat,all-week,evening,2024,all-year,R2,0.16800000000,heatpump,5,2032
+4,heat,all-week,evening,2026,all-year,R2,0.16800000000,heatpump,5,2032
+5,heat,all-week,evening,2028,all-year,R2,0.21000000000,heatpump,5,2032
+6,heat,all-week,evening,2030,all-year,R2,0.54600000000,heatpump,5,2032
+10,heat,all-week,evening,2022,all-year,R2,0.16800000000,heatpump,5,2032
+11,heat,all-week,evening,2024,all-year,R2,0.16800000000,heatpump,5,2032
+12,heat,all-week,evening,2026,all-year,R2,0.16800000000,heatpump,5,2032
+13,heat,all-week,evening,2028,all-year,R2,0.21000000000,heatpump,5,2032
+14,heat,all-week,evening,2030,all-year,R2,0.54600000000,heatpump,5,2032
+2,heat,all-week,early-morning,2022,all-year,R1,0.16800000000,heatpump,6,2032
+3,heat,all-week,early-morning,2024,all-year,R1,0.16800000000,heatpump,6,2032
+4,heat,all-week,early-morning,2026,all-year,R1,0.16800000000,heatpump,6,2032
+5,heat,all-week,early-morning,2028,all-year,R1,0.21000000000,heatpump,6,2032
+6,heat,all-week,early-morning,2030,all-year,R1,0.54600000000,heatpump,6,2032
+10,heat,all-week,early-morning,2022,all-year,R1,0.16800000000,heatpump,6,2032
+11,heat,all-week,early-morning,2024,all-year,R1,0.16800000000,heatpump,6,2032
+12,heat,all-week,early-morning,2026,all-year,R1,0.16800000000,heatpump,6,2032
+13,heat,all-week,early-morning,2028,all-year,R1,0.21000000000,heatpump,6,2032
+14,heat,all-week,early-morning,2030,all-year,R1,0.54600000000,heatpump,6,2032
+2,heat,all-week,early-morning,2022,all-year,R2,0.16800000000,heatpump,6,2032
+3,heat,all-week,early-morning,2024,all-year,R2,0.16800000000,heatpump,6,2032
+4,heat,all-week,early-morning,2026,all-year,R2,0.16800000000,heatpump,6,2032
+5,heat,all-week,early-morning,2028,all-year,R2,0.21000000000,heatpump,6,2032
+6,heat,all-week,early-morning,2030,all-year,R2,0.54600000000,heatpump,6,2032
+10,heat,all-week,early-morning,2022,all-year,R2,0.16800000000,heatpump,6,2032
+11,heat,all-week,early-morning,2024,all-year,R2,0.16800000000,heatpump,6,2032
+12,heat,all-week,early-morning,2026,all-year,R2,0.16800000000,heatpump,6,2032
+13,heat,all-week,early-morning,2028,all-year,R2,0.21000000000,heatpump,6,2032
+14,heat,all-week,early-morning,2030,all-year,R2,0.54600000000,heatpump,6,2032
+2,heat,all-week,late-afternoon,2022,all-year,R1,0.16800000000,heatpump,7,2032
+3,heat,all-week,late-afternoon,2024,all-year,R1,0.16800000000,heatpump,7,2032
+4,heat,all-week,late-afternoon,2026,all-year,R1,0.16800000000,heatpump,7,2032
+5,heat,all-week,late-afternoon,2028,all-year,R1,0.21000000000,heatpump,7,2032
+6,heat,all-week,late-afternoon,2030,all-year,R1,0.54600000000,heatpump,7,2032
+10,heat,all-week,late-afternoon,2022,all-year,R1,0.16800000000,heatpump,7,2032
+11,heat,all-week,late-afternoon,2024,all-year,R1,0.16800000000,heatpump,7,2032
+12,heat,all-week,late-afternoon,2026,all-year,R1,0.16800000000,heatpump,7,2032
+13,heat,all-week,late-afternoon,2028,all-year,R1,0.21000000000,heatpump,7,2032
+14,heat,all-week,late-afternoon,2030,all-year,R1,0.54600000000,heatpump,7,2032
+2,heat,all-week,late-afternoon,2022,all-year,R2,0.16800000000,heatpump,7,2032
+3,heat,all-week,late-afternoon,2024,all-year,R2,0.16800000000,heatpump,7,2032
+4,heat,all-week,late-afternoon,2026,all-year,R2,0.16800000000,heatpump,7,2032
+5,heat,all-week,late-afternoon,2028,all-year,R2,0.21000000000,heatpump,7,2032
+6,heat,all-week,late-afternoon,2030,all-year,R2,0.54600000000,heatpump,7,2032
+10,heat,all-week,late-afternoon,2022,all-year,R2,0.16800000000,heatpump,7,2032
+11,heat,all-week,late-afternoon,2024,all-year,R2,0.16800000000,heatpump,7,2032
+12,heat,all-week,late-afternoon,2026,all-year,R2,0.16800000000,heatpump,7,2032
+13,heat,all-week,late-afternoon,2028,all-year,R2,0.21000000000,heatpump,7,2032
+14,heat,all-week,late-afternoon,2030,all-year,R2,0.54600000000,heatpump,7,2032
+3,heat,all-week,night,2024,all-year,R1,0.08460000000,heatpump,0,2034
+4,heat,all-week,night,2026,all-year,R1,0.08460000000,heatpump,0,2034
+5,heat,all-week,night,2028,all-year,R1,0.10570000000,heatpump,0,2034
+6,heat,all-week,night,2030,all-year,R1,0.27490000000,heatpump,0,2034
+7,heat,all-week,night,2032,all-year,R1,0.12690000000,heatpump,0,2034
+12,heat,all-week,night,2024,all-year,R1,0.08460000000,heatpump,0,2034
+13,heat,all-week,night,2026,all-year,R1,0.08460000000,heatpump,0,2034
+14,heat,all-week,night,2028,all-year,R1,0.10570000000,heatpump,0,2034
+15,heat,all-week,night,2030,all-year,R1,0.27490000000,heatpump,0,2034
+16,heat,all-week,night,2032,all-year,R1,0.12690000000,heatpump,0,2034
+3,heat,all-week,night,2024,all-year,R2,0.08460000000,heatpump,0,2034
+4,heat,all-week,night,2026,all-year,R2,0.08460000000,heatpump,0,2034
+5,heat,all-week,night,2028,all-year,R2,0.10570000000,heatpump,0,2034
+6,heat,all-week,night,2030,all-year,R2,0.27490000000,heatpump,0,2034
+7,heat,all-week,night,2032,all-year,R2,0.12690000000,heatpump,0,2034
+12,heat,all-week,night,2024,all-year,R2,0.08460000000,heatpump,0,2034
+13,heat,all-week,night,2026,all-year,R2,0.08460000000,heatpump,0,2034
+14,heat,all-week,night,2028,all-year,R2,0.10570000000,heatpump,0,2034
+15,heat,all-week,night,2030,all-year,R2,0.27490000000,heatpump,0,2034
+16,heat,all-week,night,2032,all-year,R2,0.12690000000,heatpump,0,2034
+3,heat,all-week,morning,2024,all-year,R1,0.12080000000,heatpump,1,2034
+4,heat,all-week,morning,2026,all-year,R1,0.12080000000,heatpump,1,2034
+5,heat,all-week,morning,2028,all-year,R1,0.15100000000,heatpump,1,2034
+6,heat,all-week,morning,2030,all-year,R1,0.39270000000,heatpump,1,2034
+7,heat,all-week,morning,2032,all-year,R1,0.18120000000,heatpump,1,2034
+12,heat,all-week,morning,2024,all-year,R1,0.12080000000,heatpump,1,2034
+13,heat,all-week,morning,2026,all-year,R1,0.12080000000,heatpump,1,2034
+14,heat,all-week,morning,2028,all-year,R1,0.15100000000,heatpump,1,2034
+15,heat,all-week,morning,2030,all-year,R1,0.39270000000,heatpump,1,2034
+16,heat,all-week,morning,2032,all-year,R1,0.18120000000,heatpump,1,2034
+3,heat,all-week,morning,2024,all-year,R2,0.12080000000,heatpump,1,2034
+4,heat,all-week,morning,2026,all-year,R2,0.12080000000,heatpump,1,2034
+5,heat,all-week,morning,2028,all-year,R2,0.15100000000,heatpump,1,2034
+6,heat,all-week,morning,2030,all-year,R2,0.39270000000,heatpump,1,2034
+7,heat,all-week,morning,2032,all-year,R2,0.18120000000,heatpump,1,2034
+12,heat,all-week,morning,2024,all-year,R2,0.12080000000,heatpump,1,2034
+13,heat,all-week,morning,2026,all-year,R2,0.12080000000,heatpump,1,2034
+14,heat,all-week,morning,2028,all-year,R2,0.15100000000,heatpump,1,2034
+15,heat,all-week,morning,2030,all-year,R2,0.39270000000,heatpump,1,2034
+16,heat,all-week,morning,2032,all-year,R2,0.18120000000,heatpump,1,2034
+3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08460000000,heatpump,2,2034
+4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08460000000,heatpump,2,2034
+5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10570000000,heatpump,2,2034
+6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27490000000,heatpump,2,2034
+7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12690000000,heatpump,2,2034
+12,heat,all-week,mid-afternoon,2024,all-year,R1,0.08460000000,heatpump,2,2034
+13,heat,all-week,mid-afternoon,2026,all-year,R1,0.08460000000,heatpump,2,2034
+14,heat,all-week,mid-afternoon,2028,all-year,R1,0.10570000000,heatpump,2,2034
+15,heat,all-week,mid-afternoon,2030,all-year,R1,0.27490000000,heatpump,2,2034
+16,heat,all-week,mid-afternoon,2032,all-year,R1,0.12690000000,heatpump,2,2034
+3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08460000000,heatpump,2,2034
+4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08460000000,heatpump,2,2034
+5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10570000000,heatpump,2,2034
+6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27490000000,heatpump,2,2034
+7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12690000000,heatpump,2,2034
+12,heat,all-week,mid-afternoon,2024,all-year,R2,0.08460000000,heatpump,2,2034
+13,heat,all-week,mid-afternoon,2026,all-year,R2,0.08460000000,heatpump,2,2034
+14,heat,all-week,mid-afternoon,2028,all-year,R2,0.10570000000,heatpump,2,2034
+15,heat,all-week,mid-afternoon,2030,all-year,R2,0.27490000000,heatpump,2,2034
+16,heat,all-week,mid-afternoon,2032,all-year,R2,0.12690000000,heatpump,2,2034
+3,heat,all-week,early-peak,2024,all-year,R1,0.12080000000,heatpump,3,2034
+4,heat,all-week,early-peak,2026,all-year,R1,0.12080000000,heatpump,3,2034
+5,heat,all-week,early-peak,2028,all-year,R1,0.15100000000,heatpump,3,2034
+6,heat,all-week,early-peak,2030,all-year,R1,0.39270000000,heatpump,3,2034
+7,heat,all-week,early-peak,2032,all-year,R1,0.18120000000,heatpump,3,2034
+12,heat,all-week,early-peak,2024,all-year,R1,0.12080000000,heatpump,3,2034
+13,heat,all-week,early-peak,2026,all-year,R1,0.12080000000,heatpump,3,2034
+14,heat,all-week,early-peak,2028,all-year,R1,0.15100000000,heatpump,3,2034
+15,heat,all-week,early-peak,2030,all-year,R1,0.39270000000,heatpump,3,2034
+16,heat,all-week,early-peak,2032,all-year,R1,0.18120000000,heatpump,3,2034
+3,heat,all-week,early-peak,2024,all-year,R2,0.12080000000,heatpump,3,2034
+4,heat,all-week,early-peak,2026,all-year,R2,0.12080000000,heatpump,3,2034
+5,heat,all-week,early-peak,2028,all-year,R2,0.15100000000,heatpump,3,2034
+6,heat,all-week,early-peak,2030,all-year,R2,0.39270000000,heatpump,3,2034
+7,heat,all-week,early-peak,2032,all-year,R2,0.18120000000,heatpump,3,2034
+12,heat,all-week,early-peak,2024,all-year,R2,0.12080000000,heatpump,3,2034
+13,heat,all-week,early-peak,2026,all-year,R2,0.12080000000,heatpump,3,2034
+14,heat,all-week,early-peak,2028,all-year,R2,0.15100000000,heatpump,3,2034
+15,heat,all-week,early-peak,2030,all-year,R2,0.39270000000,heatpump,3,2034
+16,heat,all-week,early-peak,2032,all-year,R2,0.18120000000,heatpump,3,2034
+3,heat,all-week,late-peak,2024,all-year,R1,0.25370000000,heatpump,4,2034
+4,heat,all-week,late-peak,2026,all-year,R1,0.25370000000,heatpump,4,2034
+5,heat,all-week,late-peak,2028,all-year,R1,0.31720000000,heatpump,4,2034
+6,heat,all-week,late-peak,2030,all-year,R1,0.82470000000,heatpump,4,2034
+7,heat,all-week,late-peak,2032,all-year,R1,0.38060000000,heatpump,4,2034
+12,heat,all-week,late-peak,2024,all-year,R1,0.25370000000,heatpump,4,2034
+13,heat,all-week,late-peak,2026,all-year,R1,0.25370000000,heatpump,4,2034
+14,heat,all-week,late-peak,2028,all-year,R1,0.31720000000,heatpump,4,2034
+15,heat,all-week,late-peak,2030,all-year,R1,0.82470000000,heatpump,4,2034
+16,heat,all-week,late-peak,2032,all-year,R1,0.38060000000,heatpump,4,2034
+3,heat,all-week,late-peak,2024,all-year,R2,0.25370000000,heatpump,4,2034
+4,heat,all-week,late-peak,2026,all-year,R2,0.25370000000,heatpump,4,2034
+5,heat,all-week,late-peak,2028,all-year,R2,0.31720000000,heatpump,4,2034
+6,heat,all-week,late-peak,2030,all-year,R2,0.82470000000,heatpump,4,2034
+7,heat,all-week,late-peak,2032,all-year,R2,0.38060000000,heatpump,4,2034
+12,heat,all-week,late-peak,2024,all-year,R2,0.25370000000,heatpump,4,2034
+13,heat,all-week,late-peak,2026,all-year,R2,0.25370000000,heatpump,4,2034
+14,heat,all-week,late-peak,2028,all-year,R2,0.31720000000,heatpump,4,2034
+15,heat,all-week,late-peak,2030,all-year,R2,0.82470000000,heatpump,4,2034
+16,heat,all-week,late-peak,2032,all-year,R2,0.38060000000,heatpump,4,2034
+3,heat,all-week,evening,2024,all-year,R1,0.16920000000,heatpump,5,2034
+4,heat,all-week,evening,2026,all-year,R1,0.16920000000,heatpump,5,2034
+5,heat,all-week,evening,2028,all-year,R1,0.21150000000,heatpump,5,2034
+6,heat,all-week,evening,2030,all-year,R1,0.54980000000,heatpump,5,2034
+7,heat,all-week,evening,2032,all-year,R1,0.25370000000,heatpump,5,2034
+12,heat,all-week,evening,2024,all-year,R1,0.16920000000,heatpump,5,2034
+13,heat,all-week,evening,2026,all-year,R1,0.16920000000,heatpump,5,2034
+14,heat,all-week,evening,2028,all-year,R1,0.21150000000,heatpump,5,2034
+15,heat,all-week,evening,2030,all-year,R1,0.54980000000,heatpump,5,2034
+16,heat,all-week,evening,2032,all-year,R1,0.25370000000,heatpump,5,2034
+3,heat,all-week,evening,2024,all-year,R2,0.16920000000,heatpump,5,2034
+4,heat,all-week,evening,2026,all-year,R2,0.16920000000,heatpump,5,2034
+5,heat,all-week,evening,2028,all-year,R2,0.21150000000,heatpump,5,2034
+6,heat,all-week,evening,2030,all-year,R2,0.54980000000,heatpump,5,2034
+7,heat,all-week,evening,2032,all-year,R2,0.25370000000,heatpump,5,2034
+12,heat,all-week,evening,2024,all-year,R2,0.16920000000,heatpump,5,2034
+13,heat,all-week,evening,2026,all-year,R2,0.16920000000,heatpump,5,2034
+14,heat,all-week,evening,2028,all-year,R2,0.21150000000,heatpump,5,2034
+15,heat,all-week,evening,2030,all-year,R2,0.54980000000,heatpump,5,2034
+16,heat,all-week,evening,2032,all-year,R2,0.25370000000,heatpump,5,2034
+3,heat,all-week,early-morning,2024,all-year,R1,0.16920000000,heatpump,6,2034
+4,heat,all-week,early-morning,2026,all-year,R1,0.16920000000,heatpump,6,2034
+5,heat,all-week,early-morning,2028,all-year,R1,0.21150000000,heatpump,6,2034
+6,heat,all-week,early-morning,2030,all-year,R1,0.54980000000,heatpump,6,2034
+7,heat,all-week,early-morning,2032,all-year,R1,0.25370000000,heatpump,6,2034
+12,heat,all-week,early-morning,2024,all-year,R1,0.16920000000,heatpump,6,2034
+13,heat,all-week,early-morning,2026,all-year,R1,0.16920000000,heatpump,6,2034
+14,heat,all-week,early-morning,2028,all-year,R1,0.21150000000,heatpump,6,2034
+15,heat,all-week,early-morning,2030,all-year,R1,0.54980000000,heatpump,6,2034
+16,heat,all-week,early-morning,2032,all-year,R1,0.25370000000,heatpump,6,2034
+3,heat,all-week,early-morning,2024,all-year,R2,0.16920000000,heatpump,6,2034
+4,heat,all-week,early-morning,2026,all-year,R2,0.16920000000,heatpump,6,2034
+5,heat,all-week,early-morning,2028,all-year,R2,0.21150000000,heatpump,6,2034
+6,heat,all-week,early-morning,2030,all-year,R2,0.54980000000,heatpump,6,2034
+7,heat,all-week,early-morning,2032,all-year,R2,0.25370000000,heatpump,6,2034
+12,heat,all-week,early-morning,2024,all-year,R2,0.16920000000,heatpump,6,2034
+13,heat,all-week,early-morning,2026,all-year,R2,0.16920000000,heatpump,6,2034
+14,heat,all-week,early-morning,2028,all-year,R2,0.21150000000,heatpump,6,2034
+15,heat,all-week,early-morning,2030,all-year,R2,0.54980000000,heatpump,6,2034
+16,heat,all-week,early-morning,2032,all-year,R2,0.25370000000,heatpump,6,2034
+3,heat,all-week,late-afternoon,2024,all-year,R1,0.16920000000,heatpump,7,2034
+4,heat,all-week,late-afternoon,2026,all-year,R1,0.16920000000,heatpump,7,2034
+5,heat,all-week,late-afternoon,2028,all-year,R1,0.21150000000,heatpump,7,2034
+6,heat,all-week,late-afternoon,2030,all-year,R1,0.54980000000,heatpump,7,2034
+7,heat,all-week,late-afternoon,2032,all-year,R1,0.25370000000,heatpump,7,2034
+12,heat,all-week,late-afternoon,2024,all-year,R1,0.16920000000,heatpump,7,2034
+13,heat,all-week,late-afternoon,2026,all-year,R1,0.16920000000,heatpump,7,2034
+14,heat,all-week,late-afternoon,2028,all-year,R1,0.21150000000,heatpump,7,2034
+15,heat,all-week,late-afternoon,2030,all-year,R1,0.54980000000,heatpump,7,2034
+16,heat,all-week,late-afternoon,2032,all-year,R1,0.25370000000,heatpump,7,2034
+3,heat,all-week,late-afternoon,2024,all-year,R2,0.16920000000,heatpump,7,2034
+4,heat,all-week,late-afternoon,2026,all-year,R2,0.16920000000,heatpump,7,2034
+5,heat,all-week,late-afternoon,2028,all-year,R2,0.21150000000,heatpump,7,2034
+6,heat,all-week,late-afternoon,2030,all-year,R2,0.54980000000,heatpump,7,2034
+7,heat,all-week,late-afternoon,2032,all-year,R2,0.25370000000,heatpump,7,2034
+12,heat,all-week,late-afternoon,2024,all-year,R2,0.16920000000,heatpump,7,2034
+13,heat,all-week,late-afternoon,2026,all-year,R2,0.16920000000,heatpump,7,2034
+14,heat,all-week,late-afternoon,2028,all-year,R2,0.21150000000,heatpump,7,2034
+15,heat,all-week,late-afternoon,2030,all-year,R2,0.54980000000,heatpump,7,2034
+16,heat,all-week,late-afternoon,2032,all-year,R2,0.25370000000,heatpump,7,2034
+4,heat,all-week,night,2026,all-year,R1,0.08510000000,heatpump,0,2036
+5,heat,all-week,night,2028,all-year,R1,0.10640000000,heatpump,0,2036
+6,heat,all-week,night,2030,all-year,R1,0.27660000000,heatpump,0,2036
+7,heat,all-week,night,2032,all-year,R1,0.12760000000,heatpump,0,2036
+8,heat,all-week,night,2034,all-year,R1,0.12760000000,heatpump,0,2036
+14,heat,all-week,night,2026,all-year,R1,0.08510000000,heatpump,0,2036
+15,heat,all-week,night,2028,all-year,R1,0.10640000000,heatpump,0,2036
+16,heat,all-week,night,2030,all-year,R1,0.27660000000,heatpump,0,2036
+17,heat,all-week,night,2032,all-year,R1,0.12760000000,heatpump,0,2036
+18,heat,all-week,night,2034,all-year,R1,0.12760000000,heatpump,0,2036
+4,heat,all-week,night,2026,all-year,R2,0.08510000000,heatpump,0,2036
+5,heat,all-week,night,2028,all-year,R2,0.10640000000,heatpump,0,2036
+6,heat,all-week,night,2030,all-year,R2,0.27660000000,heatpump,0,2036
+7,heat,all-week,night,2032,all-year,R2,0.12760000000,heatpump,0,2036
+8,heat,all-week,night,2034,all-year,R2,0.12760000000,heatpump,0,2036
+14,heat,all-week,night,2026,all-year,R2,0.08510000000,heatpump,0,2036
+15,heat,all-week,night,2028,all-year,R2,0.10640000000,heatpump,0,2036
+16,heat,all-week,night,2030,all-year,R2,0.27660000000,heatpump,0,2036
+17,heat,all-week,night,2032,all-year,R2,0.12760000000,heatpump,0,2036
+18,heat,all-week,night,2034,all-year,R2,0.12760000000,heatpump,0,2036
+4,heat,all-week,morning,2026,all-year,R1,0.12160000000,heatpump,1,2036
+5,heat,all-week,morning,2028,all-year,R1,0.15200000000,heatpump,1,2036
+6,heat,all-week,morning,2030,all-year,R1,0.39510000000,heatpump,1,2036
+7,heat,all-week,morning,2032,all-year,R1,0.18240000000,heatpump,1,2036
+8,heat,all-week,morning,2034,all-year,R1,0.18240000000,heatpump,1,2036
+14,heat,all-week,morning,2026,all-year,R1,0.12160000000,heatpump,1,2036
+15,heat,all-week,morning,2028,all-year,R1,0.15200000000,heatpump,1,2036
+16,heat,all-week,morning,2030,all-year,R1,0.39510000000,heatpump,1,2036
+17,heat,all-week,morning,2032,all-year,R1,0.18240000000,heatpump,1,2036
+18,heat,all-week,morning,2034,all-year,R1,0.18240000000,heatpump,1,2036
+4,heat,all-week,morning,2026,all-year,R2,0.12160000000,heatpump,1,2036
+5,heat,all-week,morning,2028,all-year,R2,0.15200000000,heatpump,1,2036
+6,heat,all-week,morning,2030,all-year,R2,0.39510000000,heatpump,1,2036
+7,heat,all-week,morning,2032,all-year,R2,0.18240000000,heatpump,1,2036
+8,heat,all-week,morning,2034,all-year,R2,0.18240000000,heatpump,1,2036
+14,heat,all-week,morning,2026,all-year,R2,0.12160000000,heatpump,1,2036
+15,heat,all-week,morning,2028,all-year,R2,0.15200000000,heatpump,1,2036
+16,heat,all-week,morning,2030,all-year,R2,0.39510000000,heatpump,1,2036
+17,heat,all-week,morning,2032,all-year,R2,0.18240000000,heatpump,1,2036
+18,heat,all-week,morning,2034,all-year,R2,0.18240000000,heatpump,1,2036
+4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08510000000,heatpump,2,2036
+5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10640000000,heatpump,2,2036
+6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27660000000,heatpump,2,2036
+7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12760000000,heatpump,2,2036
+8,heat,all-week,mid-afternoon,2034,all-year,R1,0.12760000000,heatpump,2,2036
+14,heat,all-week,mid-afternoon,2026,all-year,R1,0.08510000000,heatpump,2,2036
+15,heat,all-week,mid-afternoon,2028,all-year,R1,0.10640000000,heatpump,2,2036
+16,heat,all-week,mid-afternoon,2030,all-year,R1,0.27660000000,heatpump,2,2036
+17,heat,all-week,mid-afternoon,2032,all-year,R1,0.12760000000,heatpump,2,2036
+18,heat,all-week,mid-afternoon,2034,all-year,R1,0.12760000000,heatpump,2,2036
+4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08510000000,heatpump,2,2036
+5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10640000000,heatpump,2,2036
+6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27660000000,heatpump,2,2036
+7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12760000000,heatpump,2,2036
+8,heat,all-week,mid-afternoon,2034,all-year,R2,0.12760000000,heatpump,2,2036
+14,heat,all-week,mid-afternoon,2026,all-year,R2,0.08510000000,heatpump,2,2036
+15,heat,all-week,mid-afternoon,2028,all-year,R2,0.10640000000,heatpump,2,2036
+16,heat,all-week,mid-afternoon,2030,all-year,R2,0.27660000000,heatpump,2,2036
+17,heat,all-week,mid-afternoon,2032,all-year,R2,0.12760000000,heatpump,2,2036
+18,heat,all-week,mid-afternoon,2034,all-year,R2,0.12760000000,heatpump,2,2036
+4,heat,all-week,early-peak,2026,all-year,R1,0.12160000000,heatpump,3,2036
+5,heat,all-week,early-peak,2028,all-year,R1,0.15200000000,heatpump,3,2036
+6,heat,all-week,early-peak,2030,all-year,R1,0.39510000000,heatpump,3,2036
+7,heat,all-week,early-peak,2032,all-year,R1,0.18240000000,heatpump,3,2036
+8,heat,all-week,early-peak,2034,all-year,R1,0.18240000000,heatpump,3,2036
+14,heat,all-week,early-peak,2026,all-year,R1,0.12160000000,heatpump,3,2036
+15,heat,all-week,early-peak,2028,all-year,R1,0.15200000000,heatpump,3,2036
+16,heat,all-week,early-peak,2030,all-year,R1,0.39510000000,heatpump,3,2036
+17,heat,all-week,early-peak,2032,all-year,R1,0.18240000000,heatpump,3,2036
+18,heat,all-week,early-peak,2034,all-year,R1,0.18240000000,heatpump,3,2036
+4,heat,all-week,early-peak,2026,all-year,R2,0.12160000000,heatpump,3,2036
+5,heat,all-week,early-peak,2028,all-year,R2,0.15200000000,heatpump,3,2036
+6,heat,all-week,early-peak,2030,all-year,R2,0.39510000000,heatpump,3,2036
+7,heat,all-week,early-peak,2032,all-year,R2,0.18240000000,heatpump,3,2036
+8,heat,all-week,early-peak,2034,all-year,R2,0.18240000000,heatpump,3,2036
+14,heat,all-week,early-peak,2026,all-year,R2,0.12160000000,heatpump,3,2036
+15,heat,all-week,early-peak,2028,all-year,R2,0.15200000000,heatpump,3,2036
+16,heat,all-week,early-peak,2030,all-year,R2,0.39510000000,heatpump,3,2036
+17,heat,all-week,early-peak,2032,all-year,R2,0.18240000000,heatpump,3,2036
+18,heat,all-week,early-peak,2034,all-year,R2,0.18240000000,heatpump,3,2036
+4,heat,all-week,late-peak,2026,all-year,R1,0.25530000000,heatpump,4,2036
+5,heat,all-week,late-peak,2028,all-year,R1,0.31910000000,heatpump,4,2036
+6,heat,all-week,late-peak,2030,all-year,R1,0.82970000000,heatpump,4,2036
+7,heat,all-week,late-peak,2032,all-year,R1,0.38290000000,heatpump,4,2036
+8,heat,all-week,late-peak,2034,all-year,R1,0.38290000000,heatpump,4,2036
+14,heat,all-week,late-peak,2026,all-year,R1,0.25530000000,heatpump,4,2036
+15,heat,all-week,late-peak,2028,all-year,R1,0.31910000000,heatpump,4,2036
+16,heat,all-week,late-peak,2030,all-year,R1,0.82970000000,heatpump,4,2036
+17,heat,all-week,late-peak,2032,all-year,R1,0.38290000000,heatpump,4,2036
+18,heat,all-week,late-peak,2034,all-year,R1,0.38290000000,heatpump,4,2036
+4,heat,all-week,late-peak,2026,all-year,R2,0.25530000000,heatpump,4,2036
+5,heat,all-week,late-peak,2028,all-year,R2,0.31910000000,heatpump,4,2036
+6,heat,all-week,late-peak,2030,all-year,R2,0.82970000000,heatpump,4,2036
+7,heat,all-week,late-peak,2032,all-year,R2,0.38290000000,heatpump,4,2036
+8,heat,all-week,late-peak,2034,all-year,R2,0.38290000000,heatpump,4,2036
+14,heat,all-week,late-peak,2026,all-year,R2,0.25530000000,heatpump,4,2036
+15,heat,all-week,late-peak,2028,all-year,R2,0.31910000000,heatpump,4,2036
+16,heat,all-week,late-peak,2030,all-year,R2,0.82970000000,heatpump,4,2036
+17,heat,all-week,late-peak,2032,all-year,R2,0.38290000000,heatpump,4,2036
+18,heat,all-week,late-peak,2034,all-year,R2,0.38290000000,heatpump,4,2036
+4,heat,all-week,evening,2026,all-year,R1,0.17020000000,heatpump,5,2036
+5,heat,all-week,evening,2028,all-year,R1,0.21270000000,heatpump,5,2036
+6,heat,all-week,evening,2030,all-year,R1,0.55310000000,heatpump,5,2036
+7,heat,all-week,evening,2032,all-year,R1,0.25530000000,heatpump,5,2036
+8,heat,all-week,evening,2034,all-year,R1,0.25530000000,heatpump,5,2036
+14,heat,all-week,evening,2026,all-year,R1,0.17020000000,heatpump,5,2036
+15,heat,all-week,evening,2028,all-year,R1,0.21270000000,heatpump,5,2036
+16,heat,all-week,evening,2030,all-year,R1,0.55310000000,heatpump,5,2036
+17,heat,all-week,evening,2032,all-year,R1,0.25530000000,heatpump,5,2036
+18,heat,all-week,evening,2034,all-year,R1,0.25530000000,heatpump,5,2036
+4,heat,all-week,evening,2026,all-year,R2,0.17020000000,heatpump,5,2036
+5,heat,all-week,evening,2028,all-year,R2,0.21270000000,heatpump,5,2036
+6,heat,all-week,evening,2030,all-year,R2,0.55310000000,heatpump,5,2036
+7,heat,all-week,evening,2032,all-year,R2,0.25530000000,heatpump,5,2036
+8,heat,all-week,evening,2034,all-year,R2,0.25530000000,heatpump,5,2036
+14,heat,all-week,evening,2026,all-year,R2,0.17020000000,heatpump,5,2036
+15,heat,all-week,evening,2028,all-year,R2,0.21270000000,heatpump,5,2036
+16,heat,all-week,evening,2030,all-year,R2,0.55310000000,heatpump,5,2036
+17,heat,all-week,evening,2032,all-year,R2,0.25530000000,heatpump,5,2036
+18,heat,all-week,evening,2034,all-year,R2,0.25530000000,heatpump,5,2036
+4,heat,all-week,early-morning,2026,all-year,R1,0.17020000000,heatpump,6,2036
+5,heat,all-week,early-morning,2028,all-year,R1,0.21270000000,heatpump,6,2036
+6,heat,all-week,early-morning,2030,all-year,R1,0.55310000000,heatpump,6,2036
+7,heat,all-week,early-morning,2032,all-year,R1,0.25530000000,heatpump,6,2036
+8,heat,all-week,early-morning,2034,all-year,R1,0.25530000000,heatpump,6,2036
+14,heat,all-week,early-morning,2026,all-year,R1,0.17020000000,heatpump,6,2036
+15,heat,all-week,early-morning,2028,all-year,R1,0.21270000000,heatpump,6,2036
+16,heat,all-week,early-morning,2030,all-year,R1,0.55310000000,heatpump,6,2036
+17,heat,all-week,early-morning,2032,all-year,R1,0.25530000000,heatpump,6,2036
+18,heat,all-week,early-morning,2034,all-year,R1,0.25530000000,heatpump,6,2036
+4,heat,all-week,early-morning,2026,all-year,R2,0.17020000000,heatpump,6,2036
+5,heat,all-week,early-morning,2028,all-year,R2,0.21270000000,heatpump,6,2036
+6,heat,all-week,early-morning,2030,all-year,R2,0.55310000000,heatpump,6,2036
+7,heat,all-week,early-morning,2032,all-year,R2,0.25530000000,heatpump,6,2036
+8,heat,all-week,early-morning,2034,all-year,R2,0.25530000000,heatpump,6,2036
+14,heat,all-week,early-morning,2026,all-year,R2,0.17020000000,heatpump,6,2036
+15,heat,all-week,early-morning,2028,all-year,R2,0.21270000000,heatpump,6,2036
+16,heat,all-week,early-morning,2030,all-year,R2,0.55310000000,heatpump,6,2036
+17,heat,all-week,early-morning,2032,all-year,R2,0.25530000000,heatpump,6,2036
+18,heat,all-week,early-morning,2034,all-year,R2,0.25530000000,heatpump,6,2036
+4,heat,all-week,late-afternoon,2026,all-year,R1,0.17020000000,heatpump,7,2036
+5,heat,all-week,late-afternoon,2028,all-year,R1,0.21270000000,heatpump,7,2036
+6,heat,all-week,late-afternoon,2030,all-year,R1,0.55310000000,heatpump,7,2036
+7,heat,all-week,late-afternoon,2032,all-year,R1,0.25530000000,heatpump,7,2036
+8,heat,all-week,late-afternoon,2034,all-year,R1,0.25530000000,heatpump,7,2036
+14,heat,all-week,late-afternoon,2026,all-year,R1,0.17020000000,heatpump,7,2036
+15,heat,all-week,late-afternoon,2028,all-year,R1,0.21270000000,heatpump,7,2036
+16,heat,all-week,late-afternoon,2030,all-year,R1,0.55310000000,heatpump,7,2036
+17,heat,all-week,late-afternoon,2032,all-year,R1,0.25530000000,heatpump,7,2036
+18,heat,all-week,late-afternoon,2034,all-year,R1,0.25530000000,heatpump,7,2036
+4,heat,all-week,late-afternoon,2026,all-year,R2,0.17020000000,heatpump,7,2036
+5,heat,all-week,late-afternoon,2028,all-year,R2,0.21270000000,heatpump,7,2036
+6,heat,all-week,late-afternoon,2030,all-year,R2,0.55310000000,heatpump,7,2036
+7,heat,all-week,late-afternoon,2032,all-year,R2,0.25530000000,heatpump,7,2036
+8,heat,all-week,late-afternoon,2034,all-year,R2,0.25530000000,heatpump,7,2036
+14,heat,all-week,late-afternoon,2026,all-year,R2,0.17020000000,heatpump,7,2036
+15,heat,all-week,late-afternoon,2028,all-year,R2,0.21270000000,heatpump,7,2036
+16,heat,all-week,late-afternoon,2030,all-year,R2,0.55310000000,heatpump,7,2036
+17,heat,all-week,late-afternoon,2032,all-year,R2,0.25530000000,heatpump,7,2036
+18,heat,all-week,late-afternoon,2034,all-year,R2,0.25530000000,heatpump,7,2036
+5,heat,all-week,night,2028,all-year,R1,0.10690000000,heatpump,0,2038
+6,heat,all-week,night,2030,all-year,R1,0.27810000000,heatpump,0,2038
+7,heat,all-week,night,2032,all-year,R1,0.12830000000,heatpump,0,2038
+8,heat,all-week,night,2034,all-year,R1,0.12830000000,heatpump,0,2038
+9,heat,all-week,night,2036,all-year,R1,0.12830000000,heatpump,0,2038
+16,heat,all-week,night,2028,all-year,R1,0.10690000000,heatpump,0,2038
+17,heat,all-week,night,2030,all-year,R1,0.27810000000,heatpump,0,2038
+18,heat,all-week,night,2032,all-year,R1,0.12830000000,heatpump,0,2038
+19,heat,all-week,night,2034,all-year,R1,0.12830000000,heatpump,0,2038
+20,heat,all-week,night,2036,all-year,R1,0.12830000000,heatpump,0,2038
+5,heat,all-week,night,2028,all-year,R2,0.10690000000,heatpump,0,2038
+6,heat,all-week,night,2030,all-year,R2,0.27810000000,heatpump,0,2038
+7,heat,all-week,night,2032,all-year,R2,0.12830000000,heatpump,0,2038
+8,heat,all-week,night,2034,all-year,R2,0.12830000000,heatpump,0,2038
+9,heat,all-week,night,2036,all-year,R2,0.12830000000,heatpump,0,2038
+16,heat,all-week,night,2028,all-year,R2,0.10690000000,heatpump,0,2038
+17,heat,all-week,night,2030,all-year,R2,0.27810000000,heatpump,0,2038
+18,heat,all-week,night,2032,all-year,R2,0.12830000000,heatpump,0,2038
+19,heat,all-week,night,2034,all-year,R2,0.12830000000,heatpump,0,2038
+20,heat,all-week,night,2036,all-year,R2,0.12830000000,heatpump,0,2038
+5,heat,all-week,morning,2028,all-year,R1,0.15280000000,heatpump,1,2038
+6,heat,all-week,morning,2030,all-year,R1,0.39720000000,heatpump,1,2038
+7,heat,all-week,morning,2032,all-year,R1,0.18330000000,heatpump,1,2038
+8,heat,all-week,morning,2034,all-year,R1,0.18330000000,heatpump,1,2038
+9,heat,all-week,morning,2036,all-year,R1,0.18330000000,heatpump,1,2038
+16,heat,all-week,morning,2028,all-year,R1,0.15280000000,heatpump,1,2038
+17,heat,all-week,morning,2030,all-year,R1,0.39720000000,heatpump,1,2038
+18,heat,all-week,morning,2032,all-year,R1,0.18330000000,heatpump,1,2038
+19,heat,all-week,morning,2034,all-year,R1,0.18330000000,heatpump,1,2038
+20,heat,all-week,morning,2036,all-year,R1,0.18330000000,heatpump,1,2038
+5,heat,all-week,morning,2028,all-year,R2,0.15280000000,heatpump,1,2038
+6,heat,all-week,morning,2030,all-year,R2,0.39720000000,heatpump,1,2038
+7,heat,all-week,morning,2032,all-year,R2,0.18330000000,heatpump,1,2038
+8,heat,all-week,morning,2034,all-year,R2,0.18330000000,heatpump,1,2038
+9,heat,all-week,morning,2036,all-year,R2,0.18330000000,heatpump,1,2038
+16,heat,all-week,morning,2028,all-year,R2,0.15280000000,heatpump,1,2038
+17,heat,all-week,morning,2030,all-year,R2,0.39720000000,heatpump,1,2038
+18,heat,all-week,morning,2032,all-year,R2,0.18330000000,heatpump,1,2038
+19,heat,all-week,morning,2034,all-year,R2,0.18330000000,heatpump,1,2038
+20,heat,all-week,morning,2036,all-year,R2,0.18330000000,heatpump,1,2038
+5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10690000000,heatpump,2,2038
+6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27810000000,heatpump,2,2038
+7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12830000000,heatpump,2,2038
+8,heat,all-week,mid-afternoon,2034,all-year,R1,0.12830000000,heatpump,2,2038
+9,heat,all-week,mid-afternoon,2036,all-year,R1,0.12830000000,heatpump,2,2038
+16,heat,all-week,mid-afternoon,2028,all-year,R1,0.10690000000,heatpump,2,2038
+17,heat,all-week,mid-afternoon,2030,all-year,R1,0.27810000000,heatpump,2,2038
+18,heat,all-week,mid-afternoon,2032,all-year,R1,0.12830000000,heatpump,2,2038
+19,heat,all-week,mid-afternoon,2034,all-year,R1,0.12830000000,heatpump,2,2038
+20,heat,all-week,mid-afternoon,2036,all-year,R1,0.12830000000,heatpump,2,2038
+5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10690000000,heatpump,2,2038
+6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27810000000,heatpump,2,2038
+7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12830000000,heatpump,2,2038
+8,heat,all-week,mid-afternoon,2034,all-year,R2,0.12830000000,heatpump,2,2038
+9,heat,all-week,mid-afternoon,2036,all-year,R2,0.12830000000,heatpump,2,2038
+16,heat,all-week,mid-afternoon,2028,all-year,R2,0.10690000000,heatpump,2,2038
+17,heat,all-week,mid-afternoon,2030,all-year,R2,0.27810000000,heatpump,2,2038
+18,heat,all-week,mid-afternoon,2032,all-year,R2,0.12830000000,heatpump,2,2038
+19,heat,all-week,mid-afternoon,2034,all-year,R2,0.12830000000,heatpump,2,2038
+20,heat,all-week,mid-afternoon,2036,all-year,R2,0.12830000000,heatpump,2,2038
+5,heat,all-week,early-peak,2028,all-year,R1,0.15280000000,heatpump,3,2038
+6,heat,all-week,early-peak,2030,all-year,R1,0.39720000000,heatpump,3,2038
+7,heat,all-week,early-peak,2032,all-year,R1,0.18330000000,heatpump,3,2038
+8,heat,all-week,early-peak,2034,all-year,R1,0.18330000000,heatpump,3,2038
+9,heat,all-week,early-peak,2036,all-year,R1,0.18330000000,heatpump,3,2038
+16,heat,all-week,early-peak,2028,all-year,R1,0.15280000000,heatpump,3,2038
+17,heat,all-week,early-peak,2030,all-year,R1,0.39720000000,heatpump,3,2038
+18,heat,all-week,early-peak,2032,all-year,R1,0.18330000000,heatpump,3,2038
+19,heat,all-week,early-peak,2034,all-year,R1,0.18330000000,heatpump,3,2038
+20,heat,all-week,early-peak,2036,all-year,R1,0.18330000000,heatpump,3,2038
+5,heat,all-week,early-peak,2028,all-year,R2,0.15280000000,heatpump,3,2038
+6,heat,all-week,early-peak,2030,all-year,R2,0.39720000000,heatpump,3,2038
+7,heat,all-week,early-peak,2032,all-year,R2,0.18330000000,heatpump,3,2038
+8,heat,all-week,early-peak,2034,all-year,R2,0.18330000000,heatpump,3,2038
+9,heat,all-week,early-peak,2036,all-year,R2,0.18330000000,heatpump,3,2038
+16,heat,all-week,early-peak,2028,all-year,R2,0.15280000000,heatpump,3,2038
+17,heat,all-week,early-peak,2030,all-year,R2,0.39720000000,heatpump,3,2038
+18,heat,all-week,early-peak,2032,all-year,R2,0.18330000000,heatpump,3,2038
+19,heat,all-week,early-peak,2034,all-year,R2,0.18330000000,heatpump,3,2038
+20,heat,all-week,early-peak,2036,all-year,R2,0.18330000000,heatpump,3,2038
+5,heat,all-week,late-peak,2028,all-year,R1,0.32080000000,heatpump,4,2038
+6,heat,all-week,late-peak,2030,all-year,R1,0.83420000000,heatpump,4,2038
+7,heat,all-week,late-peak,2032,all-year,R1,0.38500000000,heatpump,4,2038
+8,heat,all-week,late-peak,2034,all-year,R1,0.38500000000,heatpump,4,2038
+9,heat,all-week,late-peak,2036,all-year,R1,0.38500000000,heatpump,4,2038
+16,heat,all-week,late-peak,2028,all-year,R1,0.32080000000,heatpump,4,2038
+17,heat,all-week,late-peak,2030,all-year,R1,0.83420000000,heatpump,4,2038
+18,heat,all-week,late-peak,2032,all-year,R1,0.38500000000,heatpump,4,2038
+19,heat,all-week,late-peak,2034,all-year,R1,0.38500000000,heatpump,4,2038
+20,heat,all-week,late-peak,2036,all-year,R1,0.38500000000,heatpump,4,2038
+5,heat,all-week,late-peak,2028,all-year,R2,0.32080000000,heatpump,4,2038
+6,heat,all-week,late-peak,2030,all-year,R2,0.83420000000,heatpump,4,2038
+7,heat,all-week,late-peak,2032,all-year,R2,0.38500000000,heatpump,4,2038
+8,heat,all-week,late-peak,2034,all-year,R2,0.38500000000,heatpump,4,2038
+9,heat,all-week,late-peak,2036,all-year,R2,0.38500000000,heatpump,4,2038
+16,heat,all-week,late-peak,2028,all-year,R2,0.32080000000,heatpump,4,2038
+17,heat,all-week,late-peak,2030,all-year,R2,0.83420000000,heatpump,4,2038
+18,heat,all-week,late-peak,2032,all-year,R2,0.38500000000,heatpump,4,2038
+19,heat,all-week,late-peak,2034,all-year,R2,0.38500000000,heatpump,4,2038
+20,heat,all-week,late-peak,2036,all-year,R2,0.38500000000,heatpump,4,2038
+5,heat,all-week,evening,2028,all-year,R1,0.21390000000,heatpump,5,2038
+6,heat,all-week,evening,2030,all-year,R1,0.55610000000,heatpump,5,2038
+7,heat,all-week,evening,2032,all-year,R1,0.25670000000,heatpump,5,2038
+8,heat,all-week,evening,2034,all-year,R1,0.25670000000,heatpump,5,2038
+9,heat,all-week,evening,2036,all-year,R1,0.25670000000,heatpump,5,2038
+16,heat,all-week,evening,2028,all-year,R1,0.21390000000,heatpump,5,2038
+17,heat,all-week,evening,2030,all-year,R1,0.55610000000,heatpump,5,2038
+18,heat,all-week,evening,2032,all-year,R1,0.25670000000,heatpump,5,2038
+19,heat,all-week,evening,2034,all-year,R1,0.25670000000,heatpump,5,2038
+20,heat,all-week,evening,2036,all-year,R1,0.25670000000,heatpump,5,2038
+5,heat,all-week,evening,2028,all-year,R2,0.21390000000,heatpump,5,2038
+6,heat,all-week,evening,2030,all-year,R2,0.55610000000,heatpump,5,2038
+7,heat,all-week,evening,2032,all-year,R2,0.25670000000,heatpump,5,2038
+8,heat,all-week,evening,2034,all-year,R2,0.25670000000,heatpump,5,2038
+9,heat,all-week,evening,2036,all-year,R2,0.25670000000,heatpump,5,2038
+16,heat,all-week,evening,2028,all-year,R2,0.21390000000,heatpump,5,2038
+17,heat,all-week,evening,2030,all-year,R2,0.55610000000,heatpump,5,2038
+18,heat,all-week,evening,2032,all-year,R2,0.25670000000,heatpump,5,2038
+19,heat,all-week,evening,2034,all-year,R2,0.25670000000,heatpump,5,2038
+20,heat,all-week,evening,2036,all-year,R2,0.25670000000,heatpump,5,2038
+5,heat,all-week,early-morning,2028,all-year,R1,0.21390000000,heatpump,6,2038
+6,heat,all-week,early-morning,2030,all-year,R1,0.55610000000,heatpump,6,2038
+7,heat,all-week,early-morning,2032,all-year,R1,0.25670000000,heatpump,6,2038
+8,heat,all-week,early-morning,2034,all-year,R1,0.25670000000,heatpump,6,2038
+9,heat,all-week,early-morning,2036,all-year,R1,0.25670000000,heatpump,6,2038
+16,heat,all-week,early-morning,2028,all-year,R1,0.21390000000,heatpump,6,2038
+17,heat,all-week,early-morning,2030,all-year,R1,0.55610000000,heatpump,6,2038
+18,heat,all-week,early-morning,2032,all-year,R1,0.25670000000,heatpump,6,2038
+19,heat,all-week,early-morning,2034,all-year,R1,0.25670000000,heatpump,6,2038
+20,heat,all-week,early-morning,2036,all-year,R1,0.25670000000,heatpump,6,2038
+5,heat,all-week,early-morning,2028,all-year,R2,0.21390000000,heatpump,6,2038
+6,heat,all-week,early-morning,2030,all-year,R2,0.55610000000,heatpump,6,2038
+7,heat,all-week,early-morning,2032,all-year,R2,0.25670000000,heatpump,6,2038
+8,heat,all-week,early-morning,2034,all-year,R2,0.25670000000,heatpump,6,2038
+9,heat,all-week,early-morning,2036,all-year,R2,0.25670000000,heatpump,6,2038
+16,heat,all-week,early-morning,2028,all-year,R2,0.21390000000,heatpump,6,2038
+17,heat,all-week,early-morning,2030,all-year,R2,0.55610000000,heatpump,6,2038
+18,heat,all-week,early-morning,2032,all-year,R2,0.25670000000,heatpump,6,2038
+19,heat,all-week,early-morning,2034,all-year,R2,0.25670000000,heatpump,6,2038
+20,heat,all-week,early-morning,2036,all-year,R2,0.25670000000,heatpump,6,2038
+5,heat,all-week,late-afternoon,2028,all-year,R1,0.21390000000,heatpump,7,2038
+6,heat,all-week,late-afternoon,2030,all-year,R1,0.55610000000,heatpump,7,2038
+7,heat,all-week,late-afternoon,2032,all-year,R1,0.25670000000,heatpump,7,2038
+8,heat,all-week,late-afternoon,2034,all-year,R1,0.25670000000,heatpump,7,2038
+9,heat,all-week,late-afternoon,2036,all-year,R1,0.25670000000,heatpump,7,2038
+16,heat,all-week,late-afternoon,2028,all-year,R1,0.21390000000,heatpump,7,2038
+17,heat,all-week,late-afternoon,2030,all-year,R1,0.55610000000,heatpump,7,2038
+18,heat,all-week,late-afternoon,2032,all-year,R1,0.25670000000,heatpump,7,2038
+19,heat,all-week,late-afternoon,2034,all-year,R1,0.25670000000,heatpump,7,2038
+20,heat,all-week,late-afternoon,2036,all-year,R1,0.25670000000,heatpump,7,2038
+5,heat,all-week,late-afternoon,2028,all-year,R2,0.21390000000,heatpump,7,2038
+6,heat,all-week,late-afternoon,2030,all-year,R2,0.55610000000,heatpump,7,2038
+7,heat,all-week,late-afternoon,2032,all-year,R2,0.25670000000,heatpump,7,2038
+8,heat,all-week,late-afternoon,2034,all-year,R2,0.25670000000,heatpump,7,2038
+9,heat,all-week,late-afternoon,2036,all-year,R2,0.25670000000,heatpump,7,2038
+16,heat,all-week,late-afternoon,2028,all-year,R2,0.21390000000,heatpump,7,2038
+17,heat,all-week,late-afternoon,2030,all-year,R2,0.55610000000,heatpump,7,2038
+18,heat,all-week,late-afternoon,2032,all-year,R2,0.25670000000,heatpump,7,2038
+19,heat,all-week,late-afternoon,2034,all-year,R2,0.25670000000,heatpump,7,2038
+20,heat,all-week,late-afternoon,2036,all-year,R2,0.25670000000,heatpump,7,2038
+6,heat,all-week,night,2030,all-year,R1,0.27220000000,heatpump,0,2040
+7,heat,all-week,night,2032,all-year,R1,0.12560000000,heatpump,0,2040
+8,heat,all-week,night,2034,all-year,R1,0.12560000000,heatpump,0,2040
+9,heat,all-week,night,2036,all-year,R1,0.12560000000,heatpump,0,2040
+10,heat,all-week,night,2038,all-year,R1,0.16750000000,heatpump,0,2040
+18,heat,all-week,night,2030,all-year,R1,0.27220000000,heatpump,0,2040
+19,heat,all-week,night,2032,all-year,R1,0.12560000000,heatpump,0,2040
+20,heat,all-week,night,2034,all-year,R1,0.12560000000,heatpump,0,2040
+21,heat,all-week,night,2036,all-year,R1,0.12560000000,heatpump,0,2040
+22,heat,all-week,night,2038,all-year,R1,0.16750000000,heatpump,0,2040
+6,heat,all-week,night,2030,all-year,R2,0.27220000000,heatpump,0,2040
+7,heat,all-week,night,2032,all-year,R2,0.12560000000,heatpump,0,2040
+8,heat,all-week,night,2034,all-year,R2,0.12560000000,heatpump,0,2040
+9,heat,all-week,night,2036,all-year,R2,0.12560000000,heatpump,0,2040
+10,heat,all-week,night,2038,all-year,R2,0.16750000000,heatpump,0,2040
+18,heat,all-week,night,2030,all-year,R2,0.27220000000,heatpump,0,2040
+19,heat,all-week,night,2032,all-year,R2,0.12560000000,heatpump,0,2040
+20,heat,all-week,night,2034,all-year,R2,0.12560000000,heatpump,0,2040
+21,heat,all-week,night,2036,all-year,R2,0.12560000000,heatpump,0,2040
+22,heat,all-week,night,2038,all-year,R2,0.16750000000,heatpump,0,2040
+6,heat,all-week,morning,2030,all-year,R1,0.38890000000,heatpump,1,2040
+7,heat,all-week,morning,2032,all-year,R1,0.17950000000,heatpump,1,2040
+8,heat,all-week,morning,2034,all-year,R1,0.17950000000,heatpump,1,2040
+9,heat,all-week,morning,2036,all-year,R1,0.17950000000,heatpump,1,2040
+10,heat,all-week,morning,2038,all-year,R1,0.23930000000,heatpump,1,2040
+18,heat,all-week,morning,2030,all-year,R1,0.38890000000,heatpump,1,2040
+19,heat,all-week,morning,2032,all-year,R1,0.17950000000,heatpump,1,2040
+20,heat,all-week,morning,2034,all-year,R1,0.17950000000,heatpump,1,2040
+21,heat,all-week,morning,2036,all-year,R1,0.17950000000,heatpump,1,2040
+22,heat,all-week,morning,2038,all-year,R1,0.23930000000,heatpump,1,2040
+6,heat,all-week,morning,2030,all-year,R2,0.38890000000,heatpump,1,2040
+7,heat,all-week,morning,2032,all-year,R2,0.17950000000,heatpump,1,2040
+8,heat,all-week,morning,2034,all-year,R2,0.17950000000,heatpump,1,2040
+9,heat,all-week,morning,2036,all-year,R2,0.17950000000,heatpump,1,2040
+10,heat,all-week,morning,2038,all-year,R2,0.23930000000,heatpump,1,2040
+18,heat,all-week,morning,2030,all-year,R2,0.38890000000,heatpump,1,2040
+19,heat,all-week,morning,2032,all-year,R2,0.17950000000,heatpump,1,2040
+20,heat,all-week,morning,2034,all-year,R2,0.17950000000,heatpump,1,2040
+21,heat,all-week,morning,2036,all-year,R2,0.17950000000,heatpump,1,2040
+22,heat,all-week,morning,2038,all-year,R2,0.23930000000,heatpump,1,2040
+6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27220000000,heatpump,2,2040
+7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12560000000,heatpump,2,2040
+8,heat,all-week,mid-afternoon,2034,all-year,R1,0.12560000000,heatpump,2,2040
+9,heat,all-week,mid-afternoon,2036,all-year,R1,0.12560000000,heatpump,2,2040
+10,heat,all-week,mid-afternoon,2038,all-year,R1,0.16750000000,heatpump,2,2040
+18,heat,all-week,mid-afternoon,2030,all-year,R1,0.27220000000,heatpump,2,2040
+19,heat,all-week,mid-afternoon,2032,all-year,R1,0.12560000000,heatpump,2,2040
+20,heat,all-week,mid-afternoon,2034,all-year,R1,0.12560000000,heatpump,2,2040
+21,heat,all-week,mid-afternoon,2036,all-year,R1,0.12560000000,heatpump,2,2040
+22,heat,all-week,mid-afternoon,2038,all-year,R1,0.16750000000,heatpump,2,2040
+6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27220000000,heatpump,2,2040
+7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12560000000,heatpump,2,2040
+8,heat,all-week,mid-afternoon,2034,all-year,R2,0.12560000000,heatpump,2,2040
+9,heat,all-week,mid-afternoon,2036,all-year,R2,0.12560000000,heatpump,2,2040
+10,heat,all-week,mid-afternoon,2038,all-year,R2,0.16750000000,heatpump,2,2040
+18,heat,all-week,mid-afternoon,2030,all-year,R2,0.27220000000,heatpump,2,2040
+19,heat,all-week,mid-afternoon,2032,all-year,R2,0.12560000000,heatpump,2,2040
+20,heat,all-week,mid-afternoon,2034,all-year,R2,0.12560000000,heatpump,2,2040
+21,heat,all-week,mid-afternoon,2036,all-year,R2,0.12560000000,heatpump,2,2040
+22,heat,all-week,mid-afternoon,2038,all-year,R2,0.16750000000,heatpump,2,2040
+6,heat,all-week,early-peak,2030,all-year,R1,0.38890000000,heatpump,3,2040
+7,heat,all-week,early-peak,2032,all-year,R1,0.17950000000,heatpump,3,2040
+8,heat,all-week,early-peak,2034,all-year,R1,0.17950000000,heatpump,3,2040
+9,heat,all-week,early-peak,2036,all-year,R1,0.17950000000,heatpump,3,2040
+10,heat,all-week,early-peak,2038,all-year,R1,0.23930000000,heatpump,3,2040
+18,heat,all-week,early-peak,2030,all-year,R1,0.38890000000,heatpump,3,2040
+19,heat,all-week,early-peak,2032,all-year,R1,0.17950000000,heatpump,3,2040
+20,heat,all-week,early-peak,2034,all-year,R1,0.17950000000,heatpump,3,2040
+21,heat,all-week,early-peak,2036,all-year,R1,0.17950000000,heatpump,3,2040
+22,heat,all-week,early-peak,2038,all-year,R1,0.23930000000,heatpump,3,2040
+6,heat,all-week,early-peak,2030,all-year,R2,0.38890000000,heatpump,3,2040
+7,heat,all-week,early-peak,2032,all-year,R2,0.17950000000,heatpump,3,2040
+8,heat,all-week,early-peak,2034,all-year,R2,0.17950000000,heatpump,3,2040
+9,heat,all-week,early-peak,2036,all-year,R2,0.17950000000,heatpump,3,2040
+10,heat,all-week,early-peak,2038,all-year,R2,0.23930000000,heatpump,3,2040
+18,heat,all-week,early-peak,2030,all-year,R2,0.38890000000,heatpump,3,2040
+19,heat,all-week,early-peak,2032,all-year,R2,0.17950000000,heatpump,3,2040
+20,heat,all-week,early-peak,2034,all-year,R2,0.17950000000,heatpump,3,2040
+21,heat,all-week,early-peak,2036,all-year,R2,0.17950000000,heatpump,3,2040
+22,heat,all-week,early-peak,2038,all-year,R2,0.23930000000,heatpump,3,2040
+6,heat,all-week,late-peak,2030,all-year,R1,0.81670000000,heatpump,4,2040
+7,heat,all-week,late-peak,2032,all-year,R1,0.37690000000,heatpump,4,2040
+8,heat,all-week,late-peak,2034,all-year,R1,0.37690000000,heatpump,4,2040
+9,heat,all-week,late-peak,2036,all-year,R1,0.37690000000,heatpump,4,2040
+10,heat,all-week,late-peak,2038,all-year,R1,0.50260000000,heatpump,4,2040
+18,heat,all-week,late-peak,2030,all-year,R1,0.81670000000,heatpump,4,2040
+19,heat,all-week,late-peak,2032,all-year,R1,0.37690000000,heatpump,4,2040
+20,heat,all-week,late-peak,2034,all-year,R1,0.37690000000,heatpump,4,2040
+21,heat,all-week,late-peak,2036,all-year,R1,0.37690000000,heatpump,4,2040
+22,heat,all-week,late-peak,2038,all-year,R1,0.50260000000,heatpump,4,2040
+6,heat,all-week,late-peak,2030,all-year,R2,0.81670000000,heatpump,4,2040
+7,heat,all-week,late-peak,2032,all-year,R2,0.37690000000,heatpump,4,2040
+8,heat,all-week,late-peak,2034,all-year,R2,0.37690000000,heatpump,4,2040
+9,heat,all-week,late-peak,2036,all-year,R2,0.37690000000,heatpump,4,2040
+10,heat,all-week,late-peak,2038,all-year,R2,0.50260000000,heatpump,4,2040
+18,heat,all-week,late-peak,2030,all-year,R2,0.81670000000,heatpump,4,2040
+19,heat,all-week,late-peak,2032,all-year,R2,0.37690000000,heatpump,4,2040
+20,heat,all-week,late-peak,2034,all-year,R2,0.37690000000,heatpump,4,2040
+21,heat,all-week,late-peak,2036,all-year,R2,0.37690000000,heatpump,4,2040
+22,heat,all-week,late-peak,2038,all-year,R2,0.50260000000,heatpump,4,2040
+6,heat,all-week,evening,2030,all-year,R1,0.54440000000,heatpump,5,2040
+7,heat,all-week,evening,2032,all-year,R1,0.25130000000,heatpump,5,2040
+8,heat,all-week,evening,2034,all-year,R1,0.25130000000,heatpump,5,2040
+9,heat,all-week,evening,2036,all-year,R1,0.25130000000,heatpump,5,2040
+10,heat,all-week,evening,2038,all-year,R1,0.33500000000,heatpump,5,2040
+18,heat,all-week,evening,2030,all-year,R1,0.54440000000,heatpump,5,2040
+19,heat,all-week,evening,2032,all-year,R1,0.25130000000,heatpump,5,2040
+20,heat,all-week,evening,2034,all-year,R1,0.25130000000,heatpump,5,2040
+21,heat,all-week,evening,2036,all-year,R1,0.25130000000,heatpump,5,2040
+22,heat,all-week,evening,2038,all-year,R1,0.33500000000,heatpump,5,2040
+6,heat,all-week,evening,2030,all-year,R2,0.54440000000,heatpump,5,2040
+7,heat,all-week,evening,2032,all-year,R2,0.25130000000,heatpump,5,2040
+8,heat,all-week,evening,2034,all-year,R2,0.25130000000,heatpump,5,2040
+9,heat,all-week,evening,2036,all-year,R2,0.25130000000,heatpump,5,2040
+10,heat,all-week,evening,2038,all-year,R2,0.33500000000,heatpump,5,2040
+18,heat,all-week,evening,2030,all-year,R2,0.54440000000,heatpump,5,2040
+19,heat,all-week,evening,2032,all-year,R2,0.25130000000,heatpump,5,2040
+20,heat,all-week,evening,2034,all-year,R2,0.25130000000,heatpump,5,2040
+21,heat,all-week,evening,2036,all-year,R2,0.25130000000,heatpump,5,2040
+22,heat,all-week,evening,2038,all-year,R2,0.33500000000,heatpump,5,2040
+6,heat,all-week,early-morning,2030,all-year,R1,0.54440000000,heatpump,6,2040
+7,heat,all-week,early-morning,2032,all-year,R1,0.25130000000,heatpump,6,2040
+8,heat,all-week,early-morning,2034,all-year,R1,0.25130000000,heatpump,6,2040
+9,heat,all-week,early-morning,2036,all-year,R1,0.25130000000,heatpump,6,2040
+10,heat,all-week,early-morning,2038,all-year,R1,0.33500000000,heatpump,6,2040
+18,heat,all-week,early-morning,2030,all-year,R1,0.54440000000,heatpump,6,2040
+19,heat,all-week,early-morning,2032,all-year,R1,0.25130000000,heatpump,6,2040
+20,heat,all-week,early-morning,2034,all-year,R1,0.25130000000,heatpump,6,2040
+21,heat,all-week,early-morning,2036,all-year,R1,0.25130000000,heatpump,6,2040
+22,heat,all-week,early-morning,2038,all-year,R1,0.33500000000,heatpump,6,2040
+6,heat,all-week,early-morning,2030,all-year,R2,0.54440000000,heatpump,6,2040
+7,heat,all-week,early-morning,2032,all-year,R2,0.25130000000,heatpump,6,2040
+8,heat,all-week,early-morning,2034,all-year,R2,0.25130000000,heatpump,6,2040
+9,heat,all-week,early-morning,2036,all-year,R2,0.25130000000,heatpump,6,2040
+10,heat,all-week,early-morning,2038,all-year,R2,0.33500000000,heatpump,6,2040
+18,heat,all-week,early-morning,2030,all-year,R2,0.54440000000,heatpump,6,2040
+19,heat,all-week,early-morning,2032,all-year,R2,0.25130000000,heatpump,6,2040
+20,heat,all-week,early-morning,2034,all-year,R2,0.25130000000,heatpump,6,2040
+21,heat,all-week,early-morning,2036,all-year,R2,0.25130000000,heatpump,6,2040
+22,heat,all-week,early-morning,2038,all-year,R2,0.33500000000,heatpump,6,2040
+6,heat,all-week,late-afternoon,2030,all-year,R1,0.54440000000,heatpump,7,2040
+7,heat,all-week,late-afternoon,2032,all-year,R1,0.25130000000,heatpump,7,2040
+8,heat,all-week,late-afternoon,2034,all-year,R1,0.25130000000,heatpump,7,2040
+9,heat,all-week,late-afternoon,2036,all-year,R1,0.25130000000,heatpump,7,2040
+10,heat,all-week,late-afternoon,2038,all-year,R1,0.33500000000,heatpump,7,2040
+18,heat,all-week,late-afternoon,2030,all-year,R1,0.54440000000,heatpump,7,2040
+19,heat,all-week,late-afternoon,2032,all-year,R1,0.25130000000,heatpump,7,2040
+20,heat,all-week,late-afternoon,2034,all-year,R1,0.25130000000,heatpump,7,2040
+21,heat,all-week,late-afternoon,2036,all-year,R1,0.25130000000,heatpump,7,2040
+22,heat,all-week,late-afternoon,2038,all-year,R1,0.33500000000,heatpump,7,2040
+6,heat,all-week,late-afternoon,2030,all-year,R2,0.54440000000,heatpump,7,2040
+7,heat,all-week,late-afternoon,2032,all-year,R2,0.25130000000,heatpump,7,2040
+8,heat,all-week,late-afternoon,2034,all-year,R2,0.25130000000,heatpump,7,2040
+9,heat,all-week,late-afternoon,2036,all-year,R2,0.25130000000,heatpump,7,2040
+10,heat,all-week,late-afternoon,2038,all-year,R2,0.33500000000,heatpump,7,2040
+18,heat,all-week,late-afternoon,2030,all-year,R2,0.54440000000,heatpump,7,2040
+19,heat,all-week,late-afternoon,2032,all-year,R2,0.25130000000,heatpump,7,2040
+20,heat,all-week,late-afternoon,2034,all-year,R2,0.25130000000,heatpump,7,2040
+21,heat,all-week,late-afternoon,2036,all-year,R2,0.25130000000,heatpump,7,2040
+22,heat,all-week,late-afternoon,2038,all-year,R2,0.33500000000,heatpump,7,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 4db35e5d9..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,161 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R1,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
-0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R1,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
-1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R1,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R1,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
-2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R1,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R1,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
-6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
deleted file mode 100644
index 32b8dacd2..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
+++ /dev/null
@@ -1,225 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R1,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
-0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R1,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
-1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R1,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R1,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
-2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R1,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R1,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
-6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
deleted file mode 100644
index 58246c6a7..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
+++ /dev/null
@@ -1,289 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R1,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
-0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R1,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
-1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R1,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R1,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
-2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R1,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R1,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
-6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
deleted file mode 100644
index d85ab2eca..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
+++ /dev/null
@@ -1,353 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R1,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R1,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
-0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R1,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R1,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
-1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R1,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R1,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R1,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R1,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
-2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R1,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R1,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R1,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R1,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
-6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
deleted file mode 100644
index 0c2864a0b..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
+++ /dev/null
@@ -1,353 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R1,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R1,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
-0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R1,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
-1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R1,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R1,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
-2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R1,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R1,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
-6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
deleted file mode 100644
index 765376d65..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R1,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R1,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
deleted file mode 100644
index 6ef5e1284..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R1,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R1,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
-1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
-2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
-6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
deleted file mode 100644
index da5d538de..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R1,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R1,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
-1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
-2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
-6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
deleted file mode 100644
index e0448c28c..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R1,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R1,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
-1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R1,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
-2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R1,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R1,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R1,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R1,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
-6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R1,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R1,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
deleted file mode 100644
index f78f53029..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R1,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R1,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
-1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R1,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
-2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R1,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R1,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R1,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R1,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
-6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R1,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R1,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
deleted file mode 100644
index a196c0ffc..000000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
-0,heat,R1,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R1,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R1,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R1,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R1,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
-0,heat,R2,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R2,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R2,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R2,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R2,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
-1,heat,R1,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R1,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R1,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R1,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R1,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
-1,heat,R2,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R2,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R2,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R2,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R2,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-2,heat,R1,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R1,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R1,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R1,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R1,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-2,heat,R2,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R2,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R2,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R2,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R2,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-3,heat,R1,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R1,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R1,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R1,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R1,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-3,heat,R2,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R2,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R2,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R2,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R2,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-4,heat,R1,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R1,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R1,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R1,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R1,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-4,heat,R2,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R2,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R2,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R2,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R2,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
-5,heat,R1,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R1,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R1,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R1,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R1,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
-5,heat,R2,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R2,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R2,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R2,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R2,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-6,heat,R1,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R1,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R1,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R1,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R1,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-6,heat,R2,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R2,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R2,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R2,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R2,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-7,heat,R1,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R1,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R1,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R1,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R1,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-7,heat,R2,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R2,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R2,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R2,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R2,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 4f511315f..c65fc62b5 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 2  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -85,10 +83,9 @@ demand_share = "standard_demand"
 forecast = 2
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -106,10 +103,9 @@ demand_share = "standard_demand"
 forecast = 2
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..a2a4c0708
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity.csv
@@ -0,0 +1,39 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+1,15.00000000000,2020,R2,gassupply1,2020
+0,31.49320000000,2020,R1,gassupply1,2025
+2,31.49320000000,2020,R2,gassupply1,2025
+0,23.99320000000,2020,R1,gassupply1,2030
+1,10.24680000000,2025,R1,gassupply1,2030
+3,23.99320000000,2020,R2,gassupply1,2030
+4,10.24680000000,2025,R2,gassupply1,2030
+0,16.49320000000,2020,R1,gassupply1,2035
+1,10.24680000000,2025,R1,gassupply1,2035
+2,2.60860000000,2030,R1,gassupply1,2035
+4,16.49320000000,2020,R2,gassupply1,2035
+5,10.24680000000,2025,R2,gassupply1,2035
+6,2.60860000000,2030,R2,gassupply1,2035
+0,16.49320000000,2020,R1,gassupply1,2040
+1,10.24680000000,2025,R1,gassupply1,2040
+2,2.60860000000,2030,R1,gassupply1,2040
+3,4.89140000000,2035,R1,gassupply1,2040
+4,16.49320000000,2020,R2,gassupply1,2040
+5,10.24680000000,2025,R2,gassupply1,2040
+6,2.60860000000,2030,R2,gassupply1,2040
+7,4.89140000000,2035,R2,gassupply1,2040
+0,16.49320000000,2020,R1,gassupply1,2045
+1,10.24680000000,2025,R1,gassupply1,2045
+2,2.60860000000,2030,R1,gassupply1,2045
+3,4.89140000000,2035,R1,gassupply1,2045
+4,16.49320000000,2020,R2,gassupply1,2045
+5,10.24680000000,2025,R2,gassupply1,2045
+6,2.60860000000,2030,R2,gassupply1,2045
+7,4.89140000000,2035,R2,gassupply1,2045
+0,16.49320000000,2020,R1,gassupply1,2050
+1,10.24680000000,2025,R1,gassupply1,2050
+2,2.60860000000,2030,R1,gassupply1,2050
+3,4.89140000000,2035,R1,gassupply1,2050
+4,16.49320000000,2020,R2,gassupply1,2050
+5,10.24680000000,2025,R2,gassupply1,2050
+6,2.60860000000,2030,R2,gassupply1,2050
+7,4.89140000000,2035,R2,gassupply1,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 814ce3ed1..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,31.49320000000
-1,2030,R2,gassupply1,2020,23.99320000000
-1,2035,R2,gassupply1,2020,16.49320000000
-1,2040,R2,gassupply1,2020,16.49320000000
-1,2045,R2,gassupply1,2020,16.49320000000
-1,2050,R2,gassupply1,2020,16.49320000000
-1,2059,R2,gassupply1,2020,16.49320000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index e9d28446c..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2030,R1,gassupply1,2025,10.24680000000
-1,2035,R1,gassupply1,2025,10.24680000000
-1,2040,R1,gassupply1,2025,10.24680000000
-1,2045,R1,gassupply1,2025,10.24680000000
-1,2050,R1,gassupply1,2025,10.24680000000
-1,2059,R1,gassupply1,2025,10.24680000000
-1,2060,R1,gassupply1,2025,10.24680000000
-1,2064,R1,gassupply1,2025,10.24680000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,31.49320000000
-2,2030,R2,gassupply1,2020,23.99320000000
-2,2035,R2,gassupply1,2020,16.49320000000
-2,2040,R2,gassupply1,2020,16.49320000000
-2,2045,R2,gassupply1,2020,16.49320000000
-2,2050,R2,gassupply1,2020,16.49320000000
-2,2059,R2,gassupply1,2020,16.49320000000
-3,2030,R2,gassupply1,2025,10.24680000000
-3,2035,R2,gassupply1,2025,10.24680000000
-3,2040,R2,gassupply1,2025,10.24680000000
-3,2045,R2,gassupply1,2025,10.24680000000
-3,2050,R2,gassupply1,2025,10.24680000000
-3,2059,R2,gassupply1,2025,10.24680000000
-3,2060,R2,gassupply1,2025,10.24680000000
-3,2064,R2,gassupply1,2025,10.24680000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 75cf372b2..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2030,R1,gassupply1,2025,10.24680000000
-1,2035,R1,gassupply1,2025,10.24680000000
-1,2040,R1,gassupply1,2025,10.24680000000
-1,2045,R1,gassupply1,2025,10.24680000000
-1,2050,R1,gassupply1,2025,10.24680000000
-1,2059,R1,gassupply1,2025,10.24680000000
-1,2060,R1,gassupply1,2025,10.24680000000
-1,2064,R1,gassupply1,2025,10.24680000000
-2,2035,R1,gassupply1,2030,2.60860000000
-2,2040,R1,gassupply1,2030,2.60860000000
-2,2045,R1,gassupply1,2030,2.60860000000
-2,2050,R1,gassupply1,2030,2.60860000000
-2,2059,R1,gassupply1,2030,2.60860000000
-2,2060,R1,gassupply1,2030,2.60860000000
-2,2064,R1,gassupply1,2030,2.60860000000
-2,2065,R1,gassupply1,2030,2.60860000000
-2,2069,R1,gassupply1,2030,2.60860000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,31.49320000000
-3,2030,R2,gassupply1,2020,23.99320000000
-3,2035,R2,gassupply1,2020,16.49320000000
-3,2040,R2,gassupply1,2020,16.49320000000
-3,2045,R2,gassupply1,2020,16.49320000000
-3,2050,R2,gassupply1,2020,16.49320000000
-3,2059,R2,gassupply1,2020,16.49320000000
-4,2030,R2,gassupply1,2025,10.24680000000
-4,2035,R2,gassupply1,2025,10.24680000000
-4,2040,R2,gassupply1,2025,10.24680000000
-4,2045,R2,gassupply1,2025,10.24680000000
-4,2050,R2,gassupply1,2025,10.24680000000
-4,2059,R2,gassupply1,2025,10.24680000000
-4,2060,R2,gassupply1,2025,10.24680000000
-4,2064,R2,gassupply1,2025,10.24680000000
-5,2035,R2,gassupply1,2030,2.60860000000
-5,2040,R2,gassupply1,2030,2.60860000000
-5,2045,R2,gassupply1,2030,2.60860000000
-5,2050,R2,gassupply1,2030,2.60860000000
-5,2059,R2,gassupply1,2030,2.60860000000
-5,2060,R2,gassupply1,2030,2.60860000000
-5,2064,R2,gassupply1,2030,2.60860000000
-5,2065,R2,gassupply1,2030,2.60860000000
-5,2069,R2,gassupply1,2030,2.60860000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 5cf3cb27f..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,71 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2030,R1,gassupply1,2025,10.24680000000
-1,2035,R1,gassupply1,2025,10.24680000000
-1,2040,R1,gassupply1,2025,10.24680000000
-1,2045,R1,gassupply1,2025,10.24680000000
-1,2050,R1,gassupply1,2025,10.24680000000
-1,2059,R1,gassupply1,2025,10.24680000000
-1,2060,R1,gassupply1,2025,10.24680000000
-1,2064,R1,gassupply1,2025,10.24680000000
-2,2035,R1,gassupply1,2030,2.60860000000
-2,2040,R1,gassupply1,2030,2.60860000000
-2,2045,R1,gassupply1,2030,2.60860000000
-2,2050,R1,gassupply1,2030,2.60860000000
-2,2059,R1,gassupply1,2030,2.60860000000
-2,2060,R1,gassupply1,2030,2.60860000000
-2,2064,R1,gassupply1,2030,2.60860000000
-2,2065,R1,gassupply1,2030,2.60860000000
-2,2069,R1,gassupply1,2030,2.60860000000
-3,2040,R1,gassupply1,2035,4.89140000000
-3,2045,R1,gassupply1,2035,4.89140000000
-3,2050,R1,gassupply1,2035,4.89140000000
-3,2059,R1,gassupply1,2035,4.89140000000
-3,2060,R1,gassupply1,2035,4.89140000000
-3,2064,R1,gassupply1,2035,4.89140000000
-3,2065,R1,gassupply1,2035,4.89140000000
-3,2069,R1,gassupply1,2035,4.89140000000
-3,2070,R1,gassupply1,2035,4.89140000000
-3,2074,R1,gassupply1,2035,4.89140000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,31.49320000000
-4,2030,R2,gassupply1,2020,23.99320000000
-4,2035,R2,gassupply1,2020,16.49320000000
-4,2040,R2,gassupply1,2020,16.49320000000
-4,2045,R2,gassupply1,2020,16.49320000000
-4,2050,R2,gassupply1,2020,16.49320000000
-4,2059,R2,gassupply1,2020,16.49320000000
-5,2030,R2,gassupply1,2025,10.24680000000
-5,2035,R2,gassupply1,2025,10.24680000000
-5,2040,R2,gassupply1,2025,10.24680000000
-5,2045,R2,gassupply1,2025,10.24680000000
-5,2050,R2,gassupply1,2025,10.24680000000
-5,2059,R2,gassupply1,2025,10.24680000000
-5,2060,R2,gassupply1,2025,10.24680000000
-5,2064,R2,gassupply1,2025,10.24680000000
-6,2035,R2,gassupply1,2030,2.60860000000
-6,2040,R2,gassupply1,2030,2.60860000000
-6,2045,R2,gassupply1,2030,2.60860000000
-6,2050,R2,gassupply1,2030,2.60860000000
-6,2059,R2,gassupply1,2030,2.60860000000
-6,2060,R2,gassupply1,2030,2.60860000000
-6,2064,R2,gassupply1,2030,2.60860000000
-6,2065,R2,gassupply1,2030,2.60860000000
-6,2069,R2,gassupply1,2030,2.60860000000
-7,2040,R2,gassupply1,2035,4.89140000000
-7,2045,R2,gassupply1,2035,4.89140000000
-7,2050,R2,gassupply1,2035,4.89140000000
-7,2059,R2,gassupply1,2035,4.89140000000
-7,2060,R2,gassupply1,2035,4.89140000000
-7,2064,R2,gassupply1,2035,4.89140000000
-7,2065,R2,gassupply1,2035,4.89140000000
-7,2069,R2,gassupply1,2035,4.89140000000
-7,2070,R2,gassupply1,2035,4.89140000000
-7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 5cf3cb27f..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,71 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2030,R1,gassupply1,2025,10.24680000000
-1,2035,R1,gassupply1,2025,10.24680000000
-1,2040,R1,gassupply1,2025,10.24680000000
-1,2045,R1,gassupply1,2025,10.24680000000
-1,2050,R1,gassupply1,2025,10.24680000000
-1,2059,R1,gassupply1,2025,10.24680000000
-1,2060,R1,gassupply1,2025,10.24680000000
-1,2064,R1,gassupply1,2025,10.24680000000
-2,2035,R1,gassupply1,2030,2.60860000000
-2,2040,R1,gassupply1,2030,2.60860000000
-2,2045,R1,gassupply1,2030,2.60860000000
-2,2050,R1,gassupply1,2030,2.60860000000
-2,2059,R1,gassupply1,2030,2.60860000000
-2,2060,R1,gassupply1,2030,2.60860000000
-2,2064,R1,gassupply1,2030,2.60860000000
-2,2065,R1,gassupply1,2030,2.60860000000
-2,2069,R1,gassupply1,2030,2.60860000000
-3,2040,R1,gassupply1,2035,4.89140000000
-3,2045,R1,gassupply1,2035,4.89140000000
-3,2050,R1,gassupply1,2035,4.89140000000
-3,2059,R1,gassupply1,2035,4.89140000000
-3,2060,R1,gassupply1,2035,4.89140000000
-3,2064,R1,gassupply1,2035,4.89140000000
-3,2065,R1,gassupply1,2035,4.89140000000
-3,2069,R1,gassupply1,2035,4.89140000000
-3,2070,R1,gassupply1,2035,4.89140000000
-3,2074,R1,gassupply1,2035,4.89140000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,31.49320000000
-4,2030,R2,gassupply1,2020,23.99320000000
-4,2035,R2,gassupply1,2020,16.49320000000
-4,2040,R2,gassupply1,2020,16.49320000000
-4,2045,R2,gassupply1,2020,16.49320000000
-4,2050,R2,gassupply1,2020,16.49320000000
-4,2059,R2,gassupply1,2020,16.49320000000
-5,2030,R2,gassupply1,2025,10.24680000000
-5,2035,R2,gassupply1,2025,10.24680000000
-5,2040,R2,gassupply1,2025,10.24680000000
-5,2045,R2,gassupply1,2025,10.24680000000
-5,2050,R2,gassupply1,2025,10.24680000000
-5,2059,R2,gassupply1,2025,10.24680000000
-5,2060,R2,gassupply1,2025,10.24680000000
-5,2064,R2,gassupply1,2025,10.24680000000
-6,2035,R2,gassupply1,2030,2.60860000000
-6,2040,R2,gassupply1,2030,2.60860000000
-6,2045,R2,gassupply1,2030,2.60860000000
-6,2050,R2,gassupply1,2030,2.60860000000
-6,2059,R2,gassupply1,2030,2.60860000000
-6,2060,R2,gassupply1,2030,2.60860000000
-6,2064,R2,gassupply1,2030,2.60860000000
-6,2065,R2,gassupply1,2030,2.60860000000
-6,2069,R2,gassupply1,2030,2.60860000000
-7,2040,R2,gassupply1,2035,4.89140000000
-7,2045,R2,gassupply1,2035,4.89140000000
-7,2050,R2,gassupply1,2035,4.89140000000
-7,2059,R2,gassupply1,2035,4.89140000000
-7,2060,R2,gassupply1,2035,4.89140000000
-7,2064,R2,gassupply1,2035,4.89140000000
-7,2065,R2,gassupply1,2035,4.89140000000
-7,2069,R2,gassupply1,2035,4.89140000000
-7,2070,R2,gassupply1,2035,4.89140000000
-7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 5cf3cb27f..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,71 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2030,R1,gassupply1,2025,10.24680000000
-1,2035,R1,gassupply1,2025,10.24680000000
-1,2040,R1,gassupply1,2025,10.24680000000
-1,2045,R1,gassupply1,2025,10.24680000000
-1,2050,R1,gassupply1,2025,10.24680000000
-1,2059,R1,gassupply1,2025,10.24680000000
-1,2060,R1,gassupply1,2025,10.24680000000
-1,2064,R1,gassupply1,2025,10.24680000000
-2,2035,R1,gassupply1,2030,2.60860000000
-2,2040,R1,gassupply1,2030,2.60860000000
-2,2045,R1,gassupply1,2030,2.60860000000
-2,2050,R1,gassupply1,2030,2.60860000000
-2,2059,R1,gassupply1,2030,2.60860000000
-2,2060,R1,gassupply1,2030,2.60860000000
-2,2064,R1,gassupply1,2030,2.60860000000
-2,2065,R1,gassupply1,2030,2.60860000000
-2,2069,R1,gassupply1,2030,2.60860000000
-3,2040,R1,gassupply1,2035,4.89140000000
-3,2045,R1,gassupply1,2035,4.89140000000
-3,2050,R1,gassupply1,2035,4.89140000000
-3,2059,R1,gassupply1,2035,4.89140000000
-3,2060,R1,gassupply1,2035,4.89140000000
-3,2064,R1,gassupply1,2035,4.89140000000
-3,2065,R1,gassupply1,2035,4.89140000000
-3,2069,R1,gassupply1,2035,4.89140000000
-3,2070,R1,gassupply1,2035,4.89140000000
-3,2074,R1,gassupply1,2035,4.89140000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,31.49320000000
-4,2030,R2,gassupply1,2020,23.99320000000
-4,2035,R2,gassupply1,2020,16.49320000000
-4,2040,R2,gassupply1,2020,16.49320000000
-4,2045,R2,gassupply1,2020,16.49320000000
-4,2050,R2,gassupply1,2020,16.49320000000
-4,2059,R2,gassupply1,2020,16.49320000000
-5,2030,R2,gassupply1,2025,10.24680000000
-5,2035,R2,gassupply1,2025,10.24680000000
-5,2040,R2,gassupply1,2025,10.24680000000
-5,2045,R2,gassupply1,2025,10.24680000000
-5,2050,R2,gassupply1,2025,10.24680000000
-5,2059,R2,gassupply1,2025,10.24680000000
-5,2060,R2,gassupply1,2025,10.24680000000
-5,2064,R2,gassupply1,2025,10.24680000000
-6,2035,R2,gassupply1,2030,2.60860000000
-6,2040,R2,gassupply1,2030,2.60860000000
-6,2045,R2,gassupply1,2030,2.60860000000
-6,2050,R2,gassupply1,2030,2.60860000000
-6,2059,R2,gassupply1,2030,2.60860000000
-6,2060,R2,gassupply1,2030,2.60860000000
-6,2064,R2,gassupply1,2030,2.60860000000
-6,2065,R2,gassupply1,2030,2.60860000000
-6,2069,R2,gassupply1,2030,2.60860000000
-7,2040,R2,gassupply1,2035,4.89140000000
-7,2045,R2,gassupply1,2035,4.89140000000
-7,2050,R2,gassupply1,2035,4.89140000000
-7,2059,R2,gassupply1,2035,4.89140000000
-7,2060,R2,gassupply1,2035,4.89140000000
-7,2064,R2,gassupply1,2035,4.89140000000
-7,2065,R2,gassupply1,2035,4.89140000000
-7,2069,R2,gassupply1,2035,4.89140000000
-7,2070,R2,gassupply1,2035,4.89140000000
-7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 5cf3cb27f..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,71 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,31.49320000000
-0,2030,R1,gassupply1,2020,23.99320000000
-0,2035,R1,gassupply1,2020,16.49320000000
-0,2040,R1,gassupply1,2020,16.49320000000
-0,2045,R1,gassupply1,2020,16.49320000000
-0,2050,R1,gassupply1,2020,16.49320000000
-0,2059,R1,gassupply1,2020,16.49320000000
-1,2030,R1,gassupply1,2025,10.24680000000
-1,2035,R1,gassupply1,2025,10.24680000000
-1,2040,R1,gassupply1,2025,10.24680000000
-1,2045,R1,gassupply1,2025,10.24680000000
-1,2050,R1,gassupply1,2025,10.24680000000
-1,2059,R1,gassupply1,2025,10.24680000000
-1,2060,R1,gassupply1,2025,10.24680000000
-1,2064,R1,gassupply1,2025,10.24680000000
-2,2035,R1,gassupply1,2030,2.60860000000
-2,2040,R1,gassupply1,2030,2.60860000000
-2,2045,R1,gassupply1,2030,2.60860000000
-2,2050,R1,gassupply1,2030,2.60860000000
-2,2059,R1,gassupply1,2030,2.60860000000
-2,2060,R1,gassupply1,2030,2.60860000000
-2,2064,R1,gassupply1,2030,2.60860000000
-2,2065,R1,gassupply1,2030,2.60860000000
-2,2069,R1,gassupply1,2030,2.60860000000
-3,2040,R1,gassupply1,2035,4.89140000000
-3,2045,R1,gassupply1,2035,4.89140000000
-3,2050,R1,gassupply1,2035,4.89140000000
-3,2059,R1,gassupply1,2035,4.89140000000
-3,2060,R1,gassupply1,2035,4.89140000000
-3,2064,R1,gassupply1,2035,4.89140000000
-3,2065,R1,gassupply1,2035,4.89140000000
-3,2069,R1,gassupply1,2035,4.89140000000
-3,2070,R1,gassupply1,2035,4.89140000000
-3,2074,R1,gassupply1,2035,4.89140000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,31.49320000000
-4,2030,R2,gassupply1,2020,23.99320000000
-4,2035,R2,gassupply1,2020,16.49320000000
-4,2040,R2,gassupply1,2020,16.49320000000
-4,2045,R2,gassupply1,2020,16.49320000000
-4,2050,R2,gassupply1,2020,16.49320000000
-4,2059,R2,gassupply1,2020,16.49320000000
-5,2030,R2,gassupply1,2025,10.24680000000
-5,2035,R2,gassupply1,2025,10.24680000000
-5,2040,R2,gassupply1,2025,10.24680000000
-5,2045,R2,gassupply1,2025,10.24680000000
-5,2050,R2,gassupply1,2025,10.24680000000
-5,2059,R2,gassupply1,2025,10.24680000000
-5,2060,R2,gassupply1,2025,10.24680000000
-5,2064,R2,gassupply1,2025,10.24680000000
-6,2035,R2,gassupply1,2030,2.60860000000
-6,2040,R2,gassupply1,2030,2.60860000000
-6,2045,R2,gassupply1,2030,2.60860000000
-6,2050,R2,gassupply1,2030,2.60860000000
-6,2059,R2,gassupply1,2030,2.60860000000
-6,2060,R2,gassupply1,2030,2.60860000000
-6,2064,R2,gassupply1,2030,2.60860000000
-6,2065,R2,gassupply1,2030,2.60860000000
-6,2069,R2,gassupply1,2030,2.60860000000
-7,2040,R2,gassupply1,2035,4.89140000000
-7,2045,R2,gassupply1,2035,4.89140000000
-7,2050,R2,gassupply1,2035,4.89140000000
-7,2059,R2,gassupply1,2035,4.89140000000
-7,2060,R2,gassupply1,2035,4.89140000000
-7,2064,R2,gassupply1,2035,4.89140000000
-7,2065,R2,gassupply1,2035,4.89140000000
-7,2069,R2,gassupply1,2035,4.89140000000
-7,2070,R2,gassupply1,2035,4.89140000000
-7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity.csv
new file mode 100644
index 000000000..d5af9690d
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity.csv
@@ -0,0 +1,59 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+2,1.00000000000,2020,R2,gasCCGT,2020
+0,11.00000000000,2020,R1,gasCCGT,2025
+2,9.86820000000,2020,R1,windturbine,2025
+3,11.00000000000,2020,R2,gasCCGT,2025
+5,9.86820000000,2020,R2,windturbine,2025
+0,10.00000000000,2020,R1,gasCCGT,2030
+1,10.50300000000,2025,R1,gasCCGT,2030
+3,9.86820000000,2020,R1,windturbine,2030
+5,10.00000000000,2020,R2,gasCCGT,2030
+6,10.50300000000,2025,R2,gasCCGT,2030
+8,9.86820000000,2020,R2,windturbine,2030
+0,10.00000000000,2020,R1,gasCCGT,2035
+1,10.50300000000,2025,R1,gasCCGT,2035
+2,20.00000000000,2030,R1,solarPV,2035
+3,9.86820000000,2020,R1,windturbine,2035
+4,2.40000000000,2030,R1,windturbine,2035
+5,10.00000000000,2020,R2,gasCCGT,2035
+6,10.50300000000,2025,R2,gasCCGT,2035
+7,20.00000000000,2030,R2,solarPV,2035
+8,9.86820000000,2020,R2,windturbine,2035
+9,2.40000000000,2030,R2,windturbine,2035
+0,10.00000000000,2020,R1,gasCCGT,2040
+1,10.50300000000,2025,R1,gasCCGT,2040
+2,20.00000000000,2030,R1,solarPV,2040
+4,9.86820000000,2020,R1,windturbine,2040
+5,2.40000000000,2030,R1,windturbine,2040
+6,10.00000000000,2020,R2,gasCCGT,2040
+7,10.50300000000,2025,R2,gasCCGT,2040
+8,20.00000000000,2030,R2,solarPV,2040
+10,9.86820000000,2020,R2,windturbine,2040
+11,2.40000000000,2030,R2,windturbine,2040
+0,10.00000000000,2020,R1,gasCCGT,2045
+1,10.50300000000,2025,R1,gasCCGT,2045
+2,20.00000000000,2030,R1,solarPV,2045
+3,11.20000000000,2040,R1,solarPV,2045
+5,9.86820000000,2020,R1,windturbine,2045
+6,2.40000000000,2030,R1,windturbine,2045
+8,10.00000000000,2020,R2,gasCCGT,2045
+9,10.50300000000,2025,R2,gasCCGT,2045
+10,20.00000000000,2030,R2,solarPV,2045
+11,11.20000000000,2040,R2,solarPV,2045
+13,9.86820000000,2020,R2,windturbine,2045
+14,2.40000000000,2030,R2,windturbine,2045
+0,10.00000000000,2020,R1,gasCCGT,2050
+1,10.50300000000,2025,R1,gasCCGT,2050
+2,20.00000000000,2030,R1,solarPV,2050
+3,11.20000000000,2040,R1,solarPV,2050
+4,20.00000000000,2045,R1,solarPV,2050
+6,2.40000000000,2030,R1,windturbine,2050
+7,1.06820000000,2045,R1,windturbine,2050
+8,10.00000000000,2020,R2,gasCCGT,2050
+9,10.50300000000,2025,R2,gasCCGT,2050
+10,20.00000000000,2030,R2,solarPV,2050
+11,11.20000000000,2040,R2,solarPV,2050
+12,20.00000000000,2045,R2,solarPV,2050
+14,2.40000000000,2030,R2,windturbine,2050
+15,1.06820000000,2045,R2,windturbine,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
deleted file mode 100644
index f547e3596..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2025,R1,windturbine,2020,9.86820000000
-1,2030,R1,windturbine,2020,9.86820000000
-1,2035,R1,windturbine,2020,9.86820000000
-1,2040,R1,windturbine,2020,9.86820000000
-1,2045,R1,windturbine,2020,9.86820000000
-1,2049,R1,windturbine,2020,9.86820000000
-2,2020,R2,gasCCGT,2020,1.00000000000
-2,2025,R2,gasCCGT,2020,11.00000000000
-2,2030,R2,gasCCGT,2020,10.00000000000
-2,2035,R2,gasCCGT,2020,10.00000000000
-2,2040,R2,gasCCGT,2020,10.00000000000
-2,2045,R2,gasCCGT,2020,10.00000000000
-2,2049,R2,gasCCGT,2020,10.00000000000
-2,2050,R2,gasCCGT,2020,10.00000000000
-2,2059,R2,gasCCGT,2020,10.00000000000
-3,2025,R2,windturbine,2020,9.86820000000
-3,2030,R2,windturbine,2020,9.86820000000
-3,2035,R2,windturbine,2020,9.86820000000
-3,2040,R2,windturbine,2020,9.86820000000
-3,2045,R2,windturbine,2020,9.86820000000
-3,2049,R2,windturbine,2020,9.86820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
deleted file mode 100644
index e7ac503f1..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2030,R1,gasCCGT,2025,10.50300000000
-1,2035,R1,gasCCGT,2025,10.50300000000
-1,2040,R1,gasCCGT,2025,10.50300000000
-1,2045,R1,gasCCGT,2025,10.50300000000
-1,2049,R1,gasCCGT,2025,10.50300000000
-1,2050,R1,gasCCGT,2025,10.50300000000
-1,2059,R1,gasCCGT,2025,10.50300000000
-1,2060,R1,gasCCGT,2025,10.50300000000
-1,2064,R1,gasCCGT,2025,10.50300000000
-2,2025,R1,windturbine,2020,9.86820000000
-2,2030,R1,windturbine,2020,9.86820000000
-2,2035,R1,windturbine,2020,9.86820000000
-2,2040,R1,windturbine,2020,9.86820000000
-2,2045,R1,windturbine,2020,9.86820000000
-2,2049,R1,windturbine,2020,9.86820000000
-3,2020,R2,gasCCGT,2020,1.00000000000
-3,2025,R2,gasCCGT,2020,11.00000000000
-3,2030,R2,gasCCGT,2020,10.00000000000
-3,2035,R2,gasCCGT,2020,10.00000000000
-3,2040,R2,gasCCGT,2020,10.00000000000
-3,2045,R2,gasCCGT,2020,10.00000000000
-3,2049,R2,gasCCGT,2020,10.00000000000
-3,2050,R2,gasCCGT,2020,10.00000000000
-3,2059,R2,gasCCGT,2020,10.00000000000
-4,2030,R2,gasCCGT,2025,10.50300000000
-4,2035,R2,gasCCGT,2025,10.50300000000
-4,2040,R2,gasCCGT,2025,10.50300000000
-4,2045,R2,gasCCGT,2025,10.50300000000
-4,2049,R2,gasCCGT,2025,10.50300000000
-4,2050,R2,gasCCGT,2025,10.50300000000
-4,2059,R2,gasCCGT,2025,10.50300000000
-4,2060,R2,gasCCGT,2025,10.50300000000
-4,2064,R2,gasCCGT,2025,10.50300000000
-5,2025,R2,windturbine,2020,9.86820000000
-5,2030,R2,windturbine,2020,9.86820000000
-5,2035,R2,windturbine,2020,9.86820000000
-5,2040,R2,windturbine,2020,9.86820000000
-5,2045,R2,windturbine,2020,9.86820000000
-5,2049,R2,windturbine,2020,9.86820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
deleted file mode 100644
index c6a30a365..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2030,R1,gasCCGT,2025,10.50300000000
-1,2035,R1,gasCCGT,2025,10.50300000000
-1,2040,R1,gasCCGT,2025,10.50300000000
-1,2045,R1,gasCCGT,2025,10.50300000000
-1,2049,R1,gasCCGT,2025,10.50300000000
-1,2050,R1,gasCCGT,2025,10.50300000000
-1,2059,R1,gasCCGT,2025,10.50300000000
-1,2060,R1,gasCCGT,2025,10.50300000000
-1,2064,R1,gasCCGT,2025,10.50300000000
-2,2035,R1,solarPV,2030,20.00000000000
-2,2040,R1,solarPV,2030,20.00000000000
-2,2045,R1,solarPV,2030,20.00000000000
-2,2049,R1,solarPV,2030,20.00000000000
-2,2050,R1,solarPV,2030,20.00000000000
-2,2059,R1,solarPV,2030,20.00000000000
-3,2025,R1,windturbine,2020,9.86820000000
-3,2030,R1,windturbine,2020,9.86820000000
-3,2035,R1,windturbine,2020,9.86820000000
-3,2040,R1,windturbine,2020,9.86820000000
-3,2045,R1,windturbine,2020,9.86820000000
-3,2049,R1,windturbine,2020,9.86820000000
-4,2035,R1,windturbine,2030,2.40000000000
-4,2040,R1,windturbine,2030,2.40000000000
-4,2045,R1,windturbine,2030,2.40000000000
-4,2049,R1,windturbine,2030,2.40000000000
-4,2050,R1,windturbine,2030,2.40000000000
-4,2059,R1,windturbine,2030,2.40000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,11.00000000000
-5,2030,R2,gasCCGT,2020,10.00000000000
-5,2035,R2,gasCCGT,2020,10.00000000000
-5,2040,R2,gasCCGT,2020,10.00000000000
-5,2045,R2,gasCCGT,2020,10.00000000000
-5,2049,R2,gasCCGT,2020,10.00000000000
-5,2050,R2,gasCCGT,2020,10.00000000000
-5,2059,R2,gasCCGT,2020,10.00000000000
-6,2030,R2,gasCCGT,2025,10.50300000000
-6,2035,R2,gasCCGT,2025,10.50300000000
-6,2040,R2,gasCCGT,2025,10.50300000000
-6,2045,R2,gasCCGT,2025,10.50300000000
-6,2049,R2,gasCCGT,2025,10.50300000000
-6,2050,R2,gasCCGT,2025,10.50300000000
-6,2059,R2,gasCCGT,2025,10.50300000000
-6,2060,R2,gasCCGT,2025,10.50300000000
-6,2064,R2,gasCCGT,2025,10.50300000000
-7,2035,R2,solarPV,2030,20.00000000000
-7,2040,R2,solarPV,2030,20.00000000000
-7,2045,R2,solarPV,2030,20.00000000000
-7,2049,R2,solarPV,2030,20.00000000000
-7,2050,R2,solarPV,2030,20.00000000000
-7,2059,R2,solarPV,2030,20.00000000000
-8,2025,R2,windturbine,2020,9.86820000000
-8,2030,R2,windturbine,2020,9.86820000000
-8,2035,R2,windturbine,2020,9.86820000000
-8,2040,R2,windturbine,2020,9.86820000000
-8,2045,R2,windturbine,2020,9.86820000000
-8,2049,R2,windturbine,2020,9.86820000000
-9,2035,R2,windturbine,2030,2.40000000000
-9,2040,R2,windturbine,2030,2.40000000000
-9,2045,R2,windturbine,2030,2.40000000000
-9,2049,R2,windturbine,2030,2.40000000000
-9,2050,R2,windturbine,2030,2.40000000000
-9,2059,R2,windturbine,2030,2.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
deleted file mode 100644
index c6a30a365..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2030,R1,gasCCGT,2025,10.50300000000
-1,2035,R1,gasCCGT,2025,10.50300000000
-1,2040,R1,gasCCGT,2025,10.50300000000
-1,2045,R1,gasCCGT,2025,10.50300000000
-1,2049,R1,gasCCGT,2025,10.50300000000
-1,2050,R1,gasCCGT,2025,10.50300000000
-1,2059,R1,gasCCGT,2025,10.50300000000
-1,2060,R1,gasCCGT,2025,10.50300000000
-1,2064,R1,gasCCGT,2025,10.50300000000
-2,2035,R1,solarPV,2030,20.00000000000
-2,2040,R1,solarPV,2030,20.00000000000
-2,2045,R1,solarPV,2030,20.00000000000
-2,2049,R1,solarPV,2030,20.00000000000
-2,2050,R1,solarPV,2030,20.00000000000
-2,2059,R1,solarPV,2030,20.00000000000
-3,2025,R1,windturbine,2020,9.86820000000
-3,2030,R1,windturbine,2020,9.86820000000
-3,2035,R1,windturbine,2020,9.86820000000
-3,2040,R1,windturbine,2020,9.86820000000
-3,2045,R1,windturbine,2020,9.86820000000
-3,2049,R1,windturbine,2020,9.86820000000
-4,2035,R1,windturbine,2030,2.40000000000
-4,2040,R1,windturbine,2030,2.40000000000
-4,2045,R1,windturbine,2030,2.40000000000
-4,2049,R1,windturbine,2030,2.40000000000
-4,2050,R1,windturbine,2030,2.40000000000
-4,2059,R1,windturbine,2030,2.40000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,11.00000000000
-5,2030,R2,gasCCGT,2020,10.00000000000
-5,2035,R2,gasCCGT,2020,10.00000000000
-5,2040,R2,gasCCGT,2020,10.00000000000
-5,2045,R2,gasCCGT,2020,10.00000000000
-5,2049,R2,gasCCGT,2020,10.00000000000
-5,2050,R2,gasCCGT,2020,10.00000000000
-5,2059,R2,gasCCGT,2020,10.00000000000
-6,2030,R2,gasCCGT,2025,10.50300000000
-6,2035,R2,gasCCGT,2025,10.50300000000
-6,2040,R2,gasCCGT,2025,10.50300000000
-6,2045,R2,gasCCGT,2025,10.50300000000
-6,2049,R2,gasCCGT,2025,10.50300000000
-6,2050,R2,gasCCGT,2025,10.50300000000
-6,2059,R2,gasCCGT,2025,10.50300000000
-6,2060,R2,gasCCGT,2025,10.50300000000
-6,2064,R2,gasCCGT,2025,10.50300000000
-7,2035,R2,solarPV,2030,20.00000000000
-7,2040,R2,solarPV,2030,20.00000000000
-7,2045,R2,solarPV,2030,20.00000000000
-7,2049,R2,solarPV,2030,20.00000000000
-7,2050,R2,solarPV,2030,20.00000000000
-7,2059,R2,solarPV,2030,20.00000000000
-8,2025,R2,windturbine,2020,9.86820000000
-8,2030,R2,windturbine,2020,9.86820000000
-8,2035,R2,windturbine,2020,9.86820000000
-8,2040,R2,windturbine,2020,9.86820000000
-8,2045,R2,windturbine,2020,9.86820000000
-8,2049,R2,windturbine,2020,9.86820000000
-9,2035,R2,windturbine,2030,2.40000000000
-9,2040,R2,windturbine,2030,2.40000000000
-9,2045,R2,windturbine,2030,2.40000000000
-9,2049,R2,windturbine,2030,2.40000000000
-9,2050,R2,windturbine,2030,2.40000000000
-9,2059,R2,windturbine,2030,2.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
deleted file mode 100644
index a18b8bbda..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,89 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2030,R1,gasCCGT,2025,10.50300000000
-1,2035,R1,gasCCGT,2025,10.50300000000
-1,2040,R1,gasCCGT,2025,10.50300000000
-1,2045,R1,gasCCGT,2025,10.50300000000
-1,2049,R1,gasCCGT,2025,10.50300000000
-1,2050,R1,gasCCGT,2025,10.50300000000
-1,2059,R1,gasCCGT,2025,10.50300000000
-1,2060,R1,gasCCGT,2025,10.50300000000
-1,2064,R1,gasCCGT,2025,10.50300000000
-2,2035,R1,solarPV,2030,20.00000000000
-2,2040,R1,solarPV,2030,20.00000000000
-2,2045,R1,solarPV,2030,20.00000000000
-2,2049,R1,solarPV,2030,20.00000000000
-2,2050,R1,solarPV,2030,20.00000000000
-2,2059,R1,solarPV,2030,20.00000000000
-3,2045,R1,solarPV,2040,11.20000000000
-3,2049,R1,solarPV,2040,11.20000000000
-3,2050,R1,solarPV,2040,11.20000000000
-3,2059,R1,solarPV,2040,11.20000000000
-3,2060,R1,solarPV,2040,11.20000000000
-3,2064,R1,solarPV,2040,11.20000000000
-3,2065,R1,solarPV,2040,11.20000000000
-3,2069,R1,solarPV,2040,11.20000000000
-4,2025,R1,windturbine,2020,9.86820000000
-4,2030,R1,windturbine,2020,9.86820000000
-4,2035,R1,windturbine,2020,9.86820000000
-4,2040,R1,windturbine,2020,9.86820000000
-4,2045,R1,windturbine,2020,9.86820000000
-4,2049,R1,windturbine,2020,9.86820000000
-5,2035,R1,windturbine,2030,2.40000000000
-5,2040,R1,windturbine,2030,2.40000000000
-5,2045,R1,windturbine,2030,2.40000000000
-5,2049,R1,windturbine,2030,2.40000000000
-5,2050,R1,windturbine,2030,2.40000000000
-5,2059,R1,windturbine,2030,2.40000000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,11.00000000000
-6,2030,R2,gasCCGT,2020,10.00000000000
-6,2035,R2,gasCCGT,2020,10.00000000000
-6,2040,R2,gasCCGT,2020,10.00000000000
-6,2045,R2,gasCCGT,2020,10.00000000000
-6,2049,R2,gasCCGT,2020,10.00000000000
-6,2050,R2,gasCCGT,2020,10.00000000000
-6,2059,R2,gasCCGT,2020,10.00000000000
-7,2030,R2,gasCCGT,2025,10.50300000000
-7,2035,R2,gasCCGT,2025,10.50300000000
-7,2040,R2,gasCCGT,2025,10.50300000000
-7,2045,R2,gasCCGT,2025,10.50300000000
-7,2049,R2,gasCCGT,2025,10.50300000000
-7,2050,R2,gasCCGT,2025,10.50300000000
-7,2059,R2,gasCCGT,2025,10.50300000000
-7,2060,R2,gasCCGT,2025,10.50300000000
-7,2064,R2,gasCCGT,2025,10.50300000000
-8,2035,R2,solarPV,2030,20.00000000000
-8,2040,R2,solarPV,2030,20.00000000000
-8,2045,R2,solarPV,2030,20.00000000000
-8,2049,R2,solarPV,2030,20.00000000000
-8,2050,R2,solarPV,2030,20.00000000000
-8,2059,R2,solarPV,2030,20.00000000000
-9,2045,R2,solarPV,2040,11.20000000000
-9,2049,R2,solarPV,2040,11.20000000000
-9,2050,R2,solarPV,2040,11.20000000000
-9,2059,R2,solarPV,2040,11.20000000000
-9,2060,R2,solarPV,2040,11.20000000000
-9,2064,R2,solarPV,2040,11.20000000000
-9,2065,R2,solarPV,2040,11.20000000000
-9,2069,R2,solarPV,2040,11.20000000000
-10,2025,R2,windturbine,2020,9.86820000000
-10,2030,R2,windturbine,2020,9.86820000000
-10,2035,R2,windturbine,2020,9.86820000000
-10,2040,R2,windturbine,2020,9.86820000000
-10,2045,R2,windturbine,2020,9.86820000000
-10,2049,R2,windturbine,2020,9.86820000000
-11,2035,R2,windturbine,2030,2.40000000000
-11,2040,R2,windturbine,2030,2.40000000000
-11,2045,R2,windturbine,2030,2.40000000000
-11,2049,R2,windturbine,2030,2.40000000000
-11,2050,R2,windturbine,2030,2.40000000000
-11,2059,R2,windturbine,2030,2.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
deleted file mode 100644
index d90d3e8dc..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2030,R1,gasCCGT,2025,10.50300000000
-1,2035,R1,gasCCGT,2025,10.50300000000
-1,2040,R1,gasCCGT,2025,10.50300000000
-1,2045,R1,gasCCGT,2025,10.50300000000
-1,2049,R1,gasCCGT,2025,10.50300000000
-1,2050,R1,gasCCGT,2025,10.50300000000
-1,2059,R1,gasCCGT,2025,10.50300000000
-1,2060,R1,gasCCGT,2025,10.50300000000
-1,2064,R1,gasCCGT,2025,10.50300000000
-2,2035,R1,solarPV,2030,20.00000000000
-2,2040,R1,solarPV,2030,20.00000000000
-2,2045,R1,solarPV,2030,20.00000000000
-2,2049,R1,solarPV,2030,20.00000000000
-2,2050,R1,solarPV,2030,20.00000000000
-2,2059,R1,solarPV,2030,20.00000000000
-3,2045,R1,solarPV,2040,11.20000000000
-3,2049,R1,solarPV,2040,11.20000000000
-3,2050,R1,solarPV,2040,11.20000000000
-3,2059,R1,solarPV,2040,11.20000000000
-3,2060,R1,solarPV,2040,11.20000000000
-3,2064,R1,solarPV,2040,11.20000000000
-3,2065,R1,solarPV,2040,11.20000000000
-3,2069,R1,solarPV,2040,11.20000000000
-4,2050,R1,solarPV,2045,20.00000000000
-4,2059,R1,solarPV,2045,20.00000000000
-4,2060,R1,solarPV,2045,20.00000000000
-4,2064,R1,solarPV,2045,20.00000000000
-4,2065,R1,solarPV,2045,20.00000000000
-4,2069,R1,solarPV,2045,20.00000000000
-4,2070,R1,solarPV,2045,20.00000000000
-4,2074,R1,solarPV,2045,20.00000000000
-5,2025,R1,windturbine,2020,9.86820000000
-5,2030,R1,windturbine,2020,9.86820000000
-5,2035,R1,windturbine,2020,9.86820000000
-5,2040,R1,windturbine,2020,9.86820000000
-5,2045,R1,windturbine,2020,9.86820000000
-5,2049,R1,windturbine,2020,9.86820000000
-6,2035,R1,windturbine,2030,2.40000000000
-6,2040,R1,windturbine,2030,2.40000000000
-6,2045,R1,windturbine,2030,2.40000000000
-6,2049,R1,windturbine,2030,2.40000000000
-6,2050,R1,windturbine,2030,2.40000000000
-6,2059,R1,windturbine,2030,2.40000000000
-7,2050,R1,windturbine,2045,1.06820000000
-7,2059,R1,windturbine,2045,1.06820000000
-7,2060,R1,windturbine,2045,1.06820000000
-7,2064,R1,windturbine,2045,1.06820000000
-7,2065,R1,windturbine,2045,1.06820000000
-7,2069,R1,windturbine,2045,1.06820000000
-7,2070,R1,windturbine,2045,1.06820000000
-7,2074,R1,windturbine,2045,1.06820000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,11.00000000000
-8,2030,R2,gasCCGT,2020,10.00000000000
-8,2035,R2,gasCCGT,2020,10.00000000000
-8,2040,R2,gasCCGT,2020,10.00000000000
-8,2045,R2,gasCCGT,2020,10.00000000000
-8,2049,R2,gasCCGT,2020,10.00000000000
-8,2050,R2,gasCCGT,2020,10.00000000000
-8,2059,R2,gasCCGT,2020,10.00000000000
-9,2030,R2,gasCCGT,2025,10.50300000000
-9,2035,R2,gasCCGT,2025,10.50300000000
-9,2040,R2,gasCCGT,2025,10.50300000000
-9,2045,R2,gasCCGT,2025,10.50300000000
-9,2049,R2,gasCCGT,2025,10.50300000000
-9,2050,R2,gasCCGT,2025,10.50300000000
-9,2059,R2,gasCCGT,2025,10.50300000000
-9,2060,R2,gasCCGT,2025,10.50300000000
-9,2064,R2,gasCCGT,2025,10.50300000000
-10,2035,R2,solarPV,2030,20.00000000000
-10,2040,R2,solarPV,2030,20.00000000000
-10,2045,R2,solarPV,2030,20.00000000000
-10,2049,R2,solarPV,2030,20.00000000000
-10,2050,R2,solarPV,2030,20.00000000000
-10,2059,R2,solarPV,2030,20.00000000000
-11,2045,R2,solarPV,2040,11.20000000000
-11,2049,R2,solarPV,2040,11.20000000000
-11,2050,R2,solarPV,2040,11.20000000000
-11,2059,R2,solarPV,2040,11.20000000000
-11,2060,R2,solarPV,2040,11.20000000000
-11,2064,R2,solarPV,2040,11.20000000000
-11,2065,R2,solarPV,2040,11.20000000000
-11,2069,R2,solarPV,2040,11.20000000000
-12,2050,R2,solarPV,2045,20.00000000000
-12,2059,R2,solarPV,2045,20.00000000000
-12,2060,R2,solarPV,2045,20.00000000000
-12,2064,R2,solarPV,2045,20.00000000000
-12,2065,R2,solarPV,2045,20.00000000000
-12,2069,R2,solarPV,2045,20.00000000000
-12,2070,R2,solarPV,2045,20.00000000000
-12,2074,R2,solarPV,2045,20.00000000000
-13,2025,R2,windturbine,2020,9.86820000000
-13,2030,R2,windturbine,2020,9.86820000000
-13,2035,R2,windturbine,2020,9.86820000000
-13,2040,R2,windturbine,2020,9.86820000000
-13,2045,R2,windturbine,2020,9.86820000000
-13,2049,R2,windturbine,2020,9.86820000000
-14,2035,R2,windturbine,2030,2.40000000000
-14,2040,R2,windturbine,2030,2.40000000000
-14,2045,R2,windturbine,2030,2.40000000000
-14,2049,R2,windturbine,2030,2.40000000000
-14,2050,R2,windturbine,2030,2.40000000000
-14,2059,R2,windturbine,2030,2.40000000000
-15,2050,R2,windturbine,2045,1.06820000000
-15,2059,R2,windturbine,2045,1.06820000000
-15,2060,R2,windturbine,2045,1.06820000000
-15,2064,R2,windturbine,2045,1.06820000000
-15,2065,R2,windturbine,2045,1.06820000000
-15,2069,R2,windturbine,2045,1.06820000000
-15,2070,R2,windturbine,2045,1.06820000000
-15,2074,R2,windturbine,2045,1.06820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
deleted file mode 100644
index d90d3e8dc..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,11.00000000000
-0,2030,R1,gasCCGT,2020,10.00000000000
-0,2035,R1,gasCCGT,2020,10.00000000000
-0,2040,R1,gasCCGT,2020,10.00000000000
-0,2045,R1,gasCCGT,2020,10.00000000000
-0,2049,R1,gasCCGT,2020,10.00000000000
-0,2050,R1,gasCCGT,2020,10.00000000000
-0,2059,R1,gasCCGT,2020,10.00000000000
-1,2030,R1,gasCCGT,2025,10.50300000000
-1,2035,R1,gasCCGT,2025,10.50300000000
-1,2040,R1,gasCCGT,2025,10.50300000000
-1,2045,R1,gasCCGT,2025,10.50300000000
-1,2049,R1,gasCCGT,2025,10.50300000000
-1,2050,R1,gasCCGT,2025,10.50300000000
-1,2059,R1,gasCCGT,2025,10.50300000000
-1,2060,R1,gasCCGT,2025,10.50300000000
-1,2064,R1,gasCCGT,2025,10.50300000000
-2,2035,R1,solarPV,2030,20.00000000000
-2,2040,R1,solarPV,2030,20.00000000000
-2,2045,R1,solarPV,2030,20.00000000000
-2,2049,R1,solarPV,2030,20.00000000000
-2,2050,R1,solarPV,2030,20.00000000000
-2,2059,R1,solarPV,2030,20.00000000000
-3,2045,R1,solarPV,2040,11.20000000000
-3,2049,R1,solarPV,2040,11.20000000000
-3,2050,R1,solarPV,2040,11.20000000000
-3,2059,R1,solarPV,2040,11.20000000000
-3,2060,R1,solarPV,2040,11.20000000000
-3,2064,R1,solarPV,2040,11.20000000000
-3,2065,R1,solarPV,2040,11.20000000000
-3,2069,R1,solarPV,2040,11.20000000000
-4,2050,R1,solarPV,2045,20.00000000000
-4,2059,R1,solarPV,2045,20.00000000000
-4,2060,R1,solarPV,2045,20.00000000000
-4,2064,R1,solarPV,2045,20.00000000000
-4,2065,R1,solarPV,2045,20.00000000000
-4,2069,R1,solarPV,2045,20.00000000000
-4,2070,R1,solarPV,2045,20.00000000000
-4,2074,R1,solarPV,2045,20.00000000000
-5,2025,R1,windturbine,2020,9.86820000000
-5,2030,R1,windturbine,2020,9.86820000000
-5,2035,R1,windturbine,2020,9.86820000000
-5,2040,R1,windturbine,2020,9.86820000000
-5,2045,R1,windturbine,2020,9.86820000000
-5,2049,R1,windturbine,2020,9.86820000000
-6,2035,R1,windturbine,2030,2.40000000000
-6,2040,R1,windturbine,2030,2.40000000000
-6,2045,R1,windturbine,2030,2.40000000000
-6,2049,R1,windturbine,2030,2.40000000000
-6,2050,R1,windturbine,2030,2.40000000000
-6,2059,R1,windturbine,2030,2.40000000000
-7,2050,R1,windturbine,2045,1.06820000000
-7,2059,R1,windturbine,2045,1.06820000000
-7,2060,R1,windturbine,2045,1.06820000000
-7,2064,R1,windturbine,2045,1.06820000000
-7,2065,R1,windturbine,2045,1.06820000000
-7,2069,R1,windturbine,2045,1.06820000000
-7,2070,R1,windturbine,2045,1.06820000000
-7,2074,R1,windturbine,2045,1.06820000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,11.00000000000
-8,2030,R2,gasCCGT,2020,10.00000000000
-8,2035,R2,gasCCGT,2020,10.00000000000
-8,2040,R2,gasCCGT,2020,10.00000000000
-8,2045,R2,gasCCGT,2020,10.00000000000
-8,2049,R2,gasCCGT,2020,10.00000000000
-8,2050,R2,gasCCGT,2020,10.00000000000
-8,2059,R2,gasCCGT,2020,10.00000000000
-9,2030,R2,gasCCGT,2025,10.50300000000
-9,2035,R2,gasCCGT,2025,10.50300000000
-9,2040,R2,gasCCGT,2025,10.50300000000
-9,2045,R2,gasCCGT,2025,10.50300000000
-9,2049,R2,gasCCGT,2025,10.50300000000
-9,2050,R2,gasCCGT,2025,10.50300000000
-9,2059,R2,gasCCGT,2025,10.50300000000
-9,2060,R2,gasCCGT,2025,10.50300000000
-9,2064,R2,gasCCGT,2025,10.50300000000
-10,2035,R2,solarPV,2030,20.00000000000
-10,2040,R2,solarPV,2030,20.00000000000
-10,2045,R2,solarPV,2030,20.00000000000
-10,2049,R2,solarPV,2030,20.00000000000
-10,2050,R2,solarPV,2030,20.00000000000
-10,2059,R2,solarPV,2030,20.00000000000
-11,2045,R2,solarPV,2040,11.20000000000
-11,2049,R2,solarPV,2040,11.20000000000
-11,2050,R2,solarPV,2040,11.20000000000
-11,2059,R2,solarPV,2040,11.20000000000
-11,2060,R2,solarPV,2040,11.20000000000
-11,2064,R2,solarPV,2040,11.20000000000
-11,2065,R2,solarPV,2040,11.20000000000
-11,2069,R2,solarPV,2040,11.20000000000
-12,2050,R2,solarPV,2045,20.00000000000
-12,2059,R2,solarPV,2045,20.00000000000
-12,2060,R2,solarPV,2045,20.00000000000
-12,2064,R2,solarPV,2045,20.00000000000
-12,2065,R2,solarPV,2045,20.00000000000
-12,2069,R2,solarPV,2045,20.00000000000
-12,2070,R2,solarPV,2045,20.00000000000
-12,2074,R2,solarPV,2045,20.00000000000
-13,2025,R2,windturbine,2020,9.86820000000
-13,2030,R2,windturbine,2020,9.86820000000
-13,2035,R2,windturbine,2020,9.86820000000
-13,2040,R2,windturbine,2020,9.86820000000
-13,2045,R2,windturbine,2020,9.86820000000
-13,2049,R2,windturbine,2020,9.86820000000
-14,2035,R2,windturbine,2030,2.40000000000
-14,2040,R2,windturbine,2030,2.40000000000
-14,2045,R2,windturbine,2030,2.40000000000
-14,2049,R2,windturbine,2030,2.40000000000
-14,2050,R2,windturbine,2030,2.40000000000
-14,2059,R2,windturbine,2030,2.40000000000
-15,2050,R2,windturbine,2045,1.06820000000
-15,2059,R2,windturbine,2045,1.06820000000
-15,2060,R2,windturbine,2045,1.06820000000
-15,2064,R2,windturbine,2045,1.06820000000
-15,2065,R2,windturbine,2045,1.06820000000
-15,2069,R2,windturbine,2045,1.06820000000
-15,2070,R2,windturbine,2045,1.06820000000
-15,2074,R2,windturbine,2045,1.06820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..53a46af8f
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity.csv
@@ -0,0 +1,53 @@
+asset,capacity,installed,region,technology,year
+1,10,2020,R1,gas_stove,2020
+2,10,2020,R1,gasboiler,2020
+5,10,2020,R2,gas_stove,2020
+6,10,2020,R2,gasboiler,2020
+0,17,2020,R1,electric_stove,2025
+2,5,2020,R1,gas_stove,2025
+3,5,2020,R1,gasboiler,2025
+4,17,2020,R1,heatpump,2025
+6,17,2020,R2,electric_stove,2025
+8,5,2020,R2,gas_stove,2025
+9,5,2020,R2,gasboiler,2025
+10,17,2020,R2,heatpump,2025
+0,17,2020,R1,electric_stove,2030
+1,11,2025,R1,electric_stove,2030
+5,17,2020,R1,heatpump,2030
+6,11,2025,R1,heatpump,2030
+8,17,2020,R2,electric_stove,2030
+9,11,2025,R2,electric_stove,2030
+13,17,2020,R2,heatpump,2030
+14,11,2025,R2,heatpump,2030
+1,11,2025,R1,electric_stove,2035
+2,22,2030,R1,electric_stove,2035
+7,11,2025,R1,heatpump,2035
+8,22,2030,R1,heatpump,2035
+11,11,2025,R2,electric_stove,2035
+12,22,2030,R2,electric_stove,2035
+17,11,2025,R2,heatpump,2035
+18,22,2030,R2,heatpump,2035
+2,22,2030,R1,electric_stove,2040
+3,17,2035,R1,electric_stove,2040
+9,22,2030,R1,heatpump,2040
+10,17,2035,R1,heatpump,2040
+14,22,2030,R2,electric_stove,2040
+15,17,2035,R2,electric_stove,2040
+21,22,2030,R2,heatpump,2040
+22,17,2035,R2,heatpump,2040
+3,17,2035,R1,electric_stove,2045
+4,27,2040,R1,electric_stove,2045
+11,17,2035,R1,heatpump,2045
+12,27,2040,R1,heatpump,2045
+17,17,2035,R2,electric_stove,2045
+18,27,2040,R2,electric_stove,2045
+25,17,2035,R2,heatpump,2045
+26,27,2040,R2,heatpump,2045
+4,27,2040,R1,electric_stove,2050
+5,23,2045,R1,electric_stove,2050
+13,27,2040,R1,heatpump,2050
+14,23,2045,R1,heatpump,2050
+20,27,2040,R2,electric_stove,2050
+21,23,2045,R2,electric_stove,2050
+29,27,2040,R2,heatpump,2050
+30,23,2045,R2,heatpump,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index ddb9c79e9..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2020,R1,gas_stove,2020,10
-1,2025,R1,gas_stove,2020,5
-2,2020,R1,gasboiler,2020,10
-2,2025,R1,gasboiler,2020,5
-3,2025,R1,heatpump,2020,17
-3,2030,R1,heatpump,2020,17
-3,2034,R1,heatpump,2020,17
-4,2025,R2,electric_stove,2020,17
-4,2030,R2,electric_stove,2020,17
-4,2034,R2,electric_stove,2020,17
-5,2020,R2,gas_stove,2020,10
-5,2025,R2,gas_stove,2020,5
-6,2020,R2,gasboiler,2020,10
-6,2025,R2,gasboiler,2020,5
-7,2025,R2,heatpump,2020,17
-7,2030,R2,heatpump,2020,17
-7,2034,R2,heatpump,2020,17
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 8dc7a8520..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2030,R1,electric_stove,2025,11
-1,2034,R1,electric_stove,2025,11
-1,2035,R1,electric_stove,2025,11
-1,2039,R1,electric_stove,2025,11
-2,2020,R1,gas_stove,2020,10
-2,2025,R1,gas_stove,2020,5
-3,2020,R1,gasboiler,2020,10
-3,2025,R1,gasboiler,2020,5
-4,2025,R1,heatpump,2020,17
-4,2030,R1,heatpump,2020,17
-4,2034,R1,heatpump,2020,17
-5,2030,R1,heatpump,2025,11
-5,2034,R1,heatpump,2025,11
-5,2035,R1,heatpump,2025,11
-5,2039,R1,heatpump,2025,11
-6,2025,R2,electric_stove,2020,17
-6,2030,R2,electric_stove,2020,17
-6,2034,R2,electric_stove,2020,17
-7,2030,R2,electric_stove,2025,11
-7,2034,R2,electric_stove,2025,11
-7,2035,R2,electric_stove,2025,11
-7,2039,R2,electric_stove,2025,11
-8,2020,R2,gas_stove,2020,10
-8,2025,R2,gas_stove,2020,5
-9,2020,R2,gasboiler,2020,10
-9,2025,R2,gasboiler,2020,5
-10,2025,R2,heatpump,2020,17
-10,2030,R2,heatpump,2020,17
-10,2034,R2,heatpump,2020,17
-11,2030,R2,heatpump,2025,11
-11,2034,R2,heatpump,2025,11
-11,2035,R2,heatpump,2025,11
-11,2039,R2,heatpump,2025,11
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 051cbc4ac..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2030,R1,electric_stove,2025,11
-1,2034,R1,electric_stove,2025,11
-1,2035,R1,electric_stove,2025,11
-1,2039,R1,electric_stove,2025,11
-2,2035,R1,electric_stove,2030,22
-2,2039,R1,electric_stove,2030,22
-2,2040,R1,electric_stove,2030,22
-2,2044,R1,electric_stove,2030,22
-3,2020,R1,gas_stove,2020,10
-3,2025,R1,gas_stove,2020,5
-4,2020,R1,gasboiler,2020,10
-4,2025,R1,gasboiler,2020,5
-5,2025,R1,heatpump,2020,17
-5,2030,R1,heatpump,2020,17
-5,2034,R1,heatpump,2020,17
-6,2030,R1,heatpump,2025,11
-6,2034,R1,heatpump,2025,11
-6,2035,R1,heatpump,2025,11
-6,2039,R1,heatpump,2025,11
-7,2035,R1,heatpump,2030,22
-7,2039,R1,heatpump,2030,22
-7,2040,R1,heatpump,2030,22
-7,2044,R1,heatpump,2030,22
-8,2025,R2,electric_stove,2020,17
-8,2030,R2,electric_stove,2020,17
-8,2034,R2,electric_stove,2020,17
-9,2030,R2,electric_stove,2025,11
-9,2034,R2,electric_stove,2025,11
-9,2035,R2,electric_stove,2025,11
-9,2039,R2,electric_stove,2025,11
-10,2035,R2,electric_stove,2030,22
-10,2039,R2,electric_stove,2030,22
-10,2040,R2,electric_stove,2030,22
-10,2044,R2,electric_stove,2030,22
-11,2020,R2,gas_stove,2020,10
-11,2025,R2,gas_stove,2020,5
-12,2020,R2,gasboiler,2020,10
-12,2025,R2,gasboiler,2020,5
-13,2025,R2,heatpump,2020,17
-13,2030,R2,heatpump,2020,17
-13,2034,R2,heatpump,2020,17
-14,2030,R2,heatpump,2025,11
-14,2034,R2,heatpump,2025,11
-14,2035,R2,heatpump,2025,11
-14,2039,R2,heatpump,2025,11
-15,2035,R2,heatpump,2030,22
-15,2039,R2,heatpump,2030,22
-15,2040,R2,heatpump,2030,22
-15,2044,R2,heatpump,2030,22
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index e923c806e..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,69 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2030,R1,electric_stove,2025,11
-1,2034,R1,electric_stove,2025,11
-1,2035,R1,electric_stove,2025,11
-1,2039,R1,electric_stove,2025,11
-2,2035,R1,electric_stove,2030,22
-2,2039,R1,electric_stove,2030,22
-2,2040,R1,electric_stove,2030,22
-2,2044,R1,electric_stove,2030,22
-3,2040,R1,electric_stove,2035,17
-3,2044,R1,electric_stove,2035,17
-3,2045,R1,electric_stove,2035,17
-3,2049,R1,electric_stove,2035,17
-4,2020,R1,gas_stove,2020,10
-4,2025,R1,gas_stove,2020,5
-5,2020,R1,gasboiler,2020,10
-5,2025,R1,gasboiler,2020,5
-6,2025,R1,heatpump,2020,17
-6,2030,R1,heatpump,2020,17
-6,2034,R1,heatpump,2020,17
-7,2030,R1,heatpump,2025,11
-7,2034,R1,heatpump,2025,11
-7,2035,R1,heatpump,2025,11
-7,2039,R1,heatpump,2025,11
-8,2035,R1,heatpump,2030,22
-8,2039,R1,heatpump,2030,22
-8,2040,R1,heatpump,2030,22
-8,2044,R1,heatpump,2030,22
-9,2040,R1,heatpump,2035,17
-9,2044,R1,heatpump,2035,17
-9,2045,R1,heatpump,2035,17
-9,2049,R1,heatpump,2035,17
-10,2025,R2,electric_stove,2020,17
-10,2030,R2,electric_stove,2020,17
-10,2034,R2,electric_stove,2020,17
-11,2030,R2,electric_stove,2025,11
-11,2034,R2,electric_stove,2025,11
-11,2035,R2,electric_stove,2025,11
-11,2039,R2,electric_stove,2025,11
-12,2035,R2,electric_stove,2030,22
-12,2039,R2,electric_stove,2030,22
-12,2040,R2,electric_stove,2030,22
-12,2044,R2,electric_stove,2030,22
-13,2040,R2,electric_stove,2035,17
-13,2044,R2,electric_stove,2035,17
-13,2045,R2,electric_stove,2035,17
-13,2049,R2,electric_stove,2035,17
-14,2020,R2,gas_stove,2020,10
-14,2025,R2,gas_stove,2020,5
-15,2020,R2,gasboiler,2020,10
-15,2025,R2,gasboiler,2020,5
-16,2025,R2,heatpump,2020,17
-16,2030,R2,heatpump,2020,17
-16,2034,R2,heatpump,2020,17
-17,2030,R2,heatpump,2025,11
-17,2034,R2,heatpump,2025,11
-17,2035,R2,heatpump,2025,11
-17,2039,R2,heatpump,2025,11
-18,2035,R2,heatpump,2030,22
-18,2039,R2,heatpump,2030,22
-18,2040,R2,heatpump,2030,22
-18,2044,R2,heatpump,2030,22
-19,2040,R2,heatpump,2035,17
-19,2044,R2,heatpump,2035,17
-19,2045,R2,heatpump,2035,17
-19,2049,R2,heatpump,2035,17
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 29654ee0a..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,85 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2030,R1,electric_stove,2025,11
-1,2034,R1,electric_stove,2025,11
-1,2035,R1,electric_stove,2025,11
-1,2039,R1,electric_stove,2025,11
-2,2035,R1,electric_stove,2030,22
-2,2039,R1,electric_stove,2030,22
-2,2040,R1,electric_stove,2030,22
-2,2044,R1,electric_stove,2030,22
-3,2040,R1,electric_stove,2035,17
-3,2044,R1,electric_stove,2035,17
-3,2045,R1,electric_stove,2035,17
-3,2049,R1,electric_stove,2035,17
-4,2045,R1,electric_stove,2040,27
-4,2049,R1,electric_stove,2040,27
-4,2050,R1,electric_stove,2040,27
-4,2054,R1,electric_stove,2040,27
-5,2020,R1,gas_stove,2020,10
-5,2025,R1,gas_stove,2020,5
-6,2020,R1,gasboiler,2020,10
-6,2025,R1,gasboiler,2020,5
-7,2025,R1,heatpump,2020,17
-7,2030,R1,heatpump,2020,17
-7,2034,R1,heatpump,2020,17
-8,2030,R1,heatpump,2025,11
-8,2034,R1,heatpump,2025,11
-8,2035,R1,heatpump,2025,11
-8,2039,R1,heatpump,2025,11
-9,2035,R1,heatpump,2030,22
-9,2039,R1,heatpump,2030,22
-9,2040,R1,heatpump,2030,22
-9,2044,R1,heatpump,2030,22
-10,2040,R1,heatpump,2035,17
-10,2044,R1,heatpump,2035,17
-10,2045,R1,heatpump,2035,17
-10,2049,R1,heatpump,2035,17
-11,2045,R1,heatpump,2040,27
-11,2049,R1,heatpump,2040,27
-11,2050,R1,heatpump,2040,27
-11,2054,R1,heatpump,2040,27
-12,2025,R2,electric_stove,2020,17
-12,2030,R2,electric_stove,2020,17
-12,2034,R2,electric_stove,2020,17
-13,2030,R2,electric_stove,2025,11
-13,2034,R2,electric_stove,2025,11
-13,2035,R2,electric_stove,2025,11
-13,2039,R2,electric_stove,2025,11
-14,2035,R2,electric_stove,2030,22
-14,2039,R2,electric_stove,2030,22
-14,2040,R2,electric_stove,2030,22
-14,2044,R2,electric_stove,2030,22
-15,2040,R2,electric_stove,2035,17
-15,2044,R2,electric_stove,2035,17
-15,2045,R2,electric_stove,2035,17
-15,2049,R2,electric_stove,2035,17
-16,2045,R2,electric_stove,2040,27
-16,2049,R2,electric_stove,2040,27
-16,2050,R2,electric_stove,2040,27
-16,2054,R2,electric_stove,2040,27
-17,2020,R2,gas_stove,2020,10
-17,2025,R2,gas_stove,2020,5
-18,2020,R2,gasboiler,2020,10
-18,2025,R2,gasboiler,2020,5
-19,2025,R2,heatpump,2020,17
-19,2030,R2,heatpump,2020,17
-19,2034,R2,heatpump,2020,17
-20,2030,R2,heatpump,2025,11
-20,2034,R2,heatpump,2025,11
-20,2035,R2,heatpump,2025,11
-20,2039,R2,heatpump,2025,11
-21,2035,R2,heatpump,2030,22
-21,2039,R2,heatpump,2030,22
-21,2040,R2,heatpump,2030,22
-21,2044,R2,heatpump,2030,22
-22,2040,R2,heatpump,2035,17
-22,2044,R2,heatpump,2035,17
-22,2045,R2,heatpump,2035,17
-22,2049,R2,heatpump,2035,17
-23,2045,R2,heatpump,2040,27
-23,2049,R2,heatpump,2040,27
-23,2050,R2,heatpump,2040,27
-23,2054,R2,heatpump,2040,27
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 7d9e0034e..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2030,R1,electric_stove,2025,11
-1,2034,R1,electric_stove,2025,11
-1,2035,R1,electric_stove,2025,11
-1,2039,R1,electric_stove,2025,11
-2,2035,R1,electric_stove,2030,22
-2,2039,R1,electric_stove,2030,22
-2,2040,R1,electric_stove,2030,22
-2,2044,R1,electric_stove,2030,22
-3,2040,R1,electric_stove,2035,17
-3,2044,R1,electric_stove,2035,17
-3,2045,R1,electric_stove,2035,17
-3,2049,R1,electric_stove,2035,17
-4,2045,R1,electric_stove,2040,27
-4,2049,R1,electric_stove,2040,27
-4,2050,R1,electric_stove,2040,27
-4,2054,R1,electric_stove,2040,27
-5,2050,R1,electric_stove,2045,23
-5,2054,R1,electric_stove,2045,23
-5,2055,R1,electric_stove,2045,23
-5,2059,R1,electric_stove,2045,23
-6,2020,R1,gas_stove,2020,10
-6,2025,R1,gas_stove,2020,5
-7,2020,R1,gasboiler,2020,10
-7,2025,R1,gasboiler,2020,5
-8,2025,R1,heatpump,2020,17
-8,2030,R1,heatpump,2020,17
-8,2034,R1,heatpump,2020,17
-9,2030,R1,heatpump,2025,11
-9,2034,R1,heatpump,2025,11
-9,2035,R1,heatpump,2025,11
-9,2039,R1,heatpump,2025,11
-10,2035,R1,heatpump,2030,22
-10,2039,R1,heatpump,2030,22
-10,2040,R1,heatpump,2030,22
-10,2044,R1,heatpump,2030,22
-11,2040,R1,heatpump,2035,17
-11,2044,R1,heatpump,2035,17
-11,2045,R1,heatpump,2035,17
-11,2049,R1,heatpump,2035,17
-12,2045,R1,heatpump,2040,27
-12,2049,R1,heatpump,2040,27
-12,2050,R1,heatpump,2040,27
-12,2054,R1,heatpump,2040,27
-13,2050,R1,heatpump,2045,23
-13,2054,R1,heatpump,2045,23
-13,2055,R1,heatpump,2045,23
-13,2059,R1,heatpump,2045,23
-14,2025,R2,electric_stove,2020,17
-14,2030,R2,electric_stove,2020,17
-14,2034,R2,electric_stove,2020,17
-15,2030,R2,electric_stove,2025,11
-15,2034,R2,electric_stove,2025,11
-15,2035,R2,electric_stove,2025,11
-15,2039,R2,electric_stove,2025,11
-16,2035,R2,electric_stove,2030,22
-16,2039,R2,electric_stove,2030,22
-16,2040,R2,electric_stove,2030,22
-16,2044,R2,electric_stove,2030,22
-17,2040,R2,electric_stove,2035,17
-17,2044,R2,electric_stove,2035,17
-17,2045,R2,electric_stove,2035,17
-17,2049,R2,electric_stove,2035,17
-18,2045,R2,electric_stove,2040,27
-18,2049,R2,electric_stove,2040,27
-18,2050,R2,electric_stove,2040,27
-18,2054,R2,electric_stove,2040,27
-19,2050,R2,electric_stove,2045,23
-19,2054,R2,electric_stove,2045,23
-19,2055,R2,electric_stove,2045,23
-19,2059,R2,electric_stove,2045,23
-20,2020,R2,gas_stove,2020,10
-20,2025,R2,gas_stove,2020,5
-21,2020,R2,gasboiler,2020,10
-21,2025,R2,gasboiler,2020,5
-22,2025,R2,heatpump,2020,17
-22,2030,R2,heatpump,2020,17
-22,2034,R2,heatpump,2020,17
-23,2030,R2,heatpump,2025,11
-23,2034,R2,heatpump,2025,11
-23,2035,R2,heatpump,2025,11
-23,2039,R2,heatpump,2025,11
-24,2035,R2,heatpump,2030,22
-24,2039,R2,heatpump,2030,22
-24,2040,R2,heatpump,2030,22
-24,2044,R2,heatpump,2030,22
-25,2040,R2,heatpump,2035,17
-25,2044,R2,heatpump,2035,17
-25,2045,R2,heatpump,2035,17
-25,2049,R2,heatpump,2035,17
-26,2045,R2,heatpump,2040,27
-26,2049,R2,heatpump,2040,27
-26,2050,R2,heatpump,2040,27
-26,2054,R2,heatpump,2040,27
-27,2050,R2,heatpump,2045,23
-27,2054,R2,heatpump,2045,23
-27,2055,R2,heatpump,2045,23
-27,2059,R2,heatpump,2045,23
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index aa7394319..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,117 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,electric_stove,2020,17
-0,2030,R1,electric_stove,2020,17
-0,2034,R1,electric_stove,2020,17
-1,2030,R1,electric_stove,2025,11
-1,2034,R1,electric_stove,2025,11
-1,2035,R1,electric_stove,2025,11
-1,2039,R1,electric_stove,2025,11
-2,2035,R1,electric_stove,2030,22
-2,2039,R1,electric_stove,2030,22
-2,2040,R1,electric_stove,2030,22
-2,2044,R1,electric_stove,2030,22
-3,2040,R1,electric_stove,2035,17
-3,2044,R1,electric_stove,2035,17
-3,2045,R1,electric_stove,2035,17
-3,2049,R1,electric_stove,2035,17
-4,2045,R1,electric_stove,2040,27
-4,2049,R1,electric_stove,2040,27
-4,2050,R1,electric_stove,2040,27
-4,2054,R1,electric_stove,2040,27
-5,2050,R1,electric_stove,2045,23
-5,2054,R1,electric_stove,2045,23
-5,2055,R1,electric_stove,2045,23
-5,2059,R1,electric_stove,2045,23
-6,2055,R1,electric_stove,2050,27
-6,2059,R1,electric_stove,2050,27
-6,2060,R1,electric_stove,2050,27
-6,2064,R1,electric_stove,2050,27
-7,2020,R1,gas_stove,2020,10
-7,2025,R1,gas_stove,2020,5
-8,2020,R1,gasboiler,2020,10
-8,2025,R1,gasboiler,2020,5
-9,2025,R1,heatpump,2020,17
-9,2030,R1,heatpump,2020,17
-9,2034,R1,heatpump,2020,17
-10,2030,R1,heatpump,2025,11
-10,2034,R1,heatpump,2025,11
-10,2035,R1,heatpump,2025,11
-10,2039,R1,heatpump,2025,11
-11,2035,R1,heatpump,2030,22
-11,2039,R1,heatpump,2030,22
-11,2040,R1,heatpump,2030,22
-11,2044,R1,heatpump,2030,22
-12,2040,R1,heatpump,2035,17
-12,2044,R1,heatpump,2035,17
-12,2045,R1,heatpump,2035,17
-12,2049,R1,heatpump,2035,17
-13,2045,R1,heatpump,2040,27
-13,2049,R1,heatpump,2040,27
-13,2050,R1,heatpump,2040,27
-13,2054,R1,heatpump,2040,27
-14,2050,R1,heatpump,2045,23
-14,2054,R1,heatpump,2045,23
-14,2055,R1,heatpump,2045,23
-14,2059,R1,heatpump,2045,23
-15,2055,R1,heatpump,2050,27
-15,2059,R1,heatpump,2050,27
-15,2060,R1,heatpump,2050,27
-15,2064,R1,heatpump,2050,27
-16,2025,R2,electric_stove,2020,17
-16,2030,R2,electric_stove,2020,17
-16,2034,R2,electric_stove,2020,17
-17,2030,R2,electric_stove,2025,11
-17,2034,R2,electric_stove,2025,11
-17,2035,R2,electric_stove,2025,11
-17,2039,R2,electric_stove,2025,11
-18,2035,R2,electric_stove,2030,22
-18,2039,R2,electric_stove,2030,22
-18,2040,R2,electric_stove,2030,22
-18,2044,R2,electric_stove,2030,22
-19,2040,R2,electric_stove,2035,17
-19,2044,R2,electric_stove,2035,17
-19,2045,R2,electric_stove,2035,17
-19,2049,R2,electric_stove,2035,17
-20,2045,R2,electric_stove,2040,27
-20,2049,R2,electric_stove,2040,27
-20,2050,R2,electric_stove,2040,27
-20,2054,R2,electric_stove,2040,27
-21,2050,R2,electric_stove,2045,23
-21,2054,R2,electric_stove,2045,23
-21,2055,R2,electric_stove,2045,23
-21,2059,R2,electric_stove,2045,23
-22,2055,R2,electric_stove,2050,27
-22,2059,R2,electric_stove,2050,27
-22,2060,R2,electric_stove,2050,27
-22,2064,R2,electric_stove,2050,27
-23,2020,R2,gas_stove,2020,10
-23,2025,R2,gas_stove,2020,5
-24,2020,R2,gasboiler,2020,10
-24,2025,R2,gasboiler,2020,5
-25,2025,R2,heatpump,2020,17
-25,2030,R2,heatpump,2020,17
-25,2034,R2,heatpump,2020,17
-26,2030,R2,heatpump,2025,11
-26,2034,R2,heatpump,2025,11
-26,2035,R2,heatpump,2025,11
-26,2039,R2,heatpump,2025,11
-27,2035,R2,heatpump,2030,22
-27,2039,R2,heatpump,2030,22
-27,2040,R2,heatpump,2030,22
-27,2044,R2,heatpump,2030,22
-28,2040,R2,heatpump,2035,17
-28,2044,R2,heatpump,2035,17
-28,2045,R2,heatpump,2035,17
-28,2049,R2,heatpump,2035,17
-29,2045,R2,heatpump,2040,27
-29,2049,R2,heatpump,2040,27
-29,2050,R2,heatpump,2040,27
-29,2054,R2,heatpump,2040,27
-30,2050,R2,heatpump,2045,23
-30,2054,R2,heatpump,2045,23
-30,2055,R2,heatpump,2045,23
-30,2059,R2,heatpump,2045,23
-31,2055,R2,heatpump,2050,27
-31,2059,R2,heatpump,2050,27
-31,2060,R2,heatpump,2050,27
-31,2064,R2,heatpump,2050,27
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply.csv
new file mode 100644
index 000000000..7caf36c3b
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply.csv
@@ -0,0 +1,961 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+2,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020
+6,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020
+2,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020
+6,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020
+1,CO2f,all-week,night,2020,all-year,R1,17.50000000000,gas_stove,0,2020
+2,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020
+5,CO2f,all-week,night,2020,all-year,R1,17.50000000000,gas_stove,0,2020
+6,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020
+1,CO2f,all-week,night,2020,all-year,R2,17.50000000000,gas_stove,0,2020
+2,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020
+5,CO2f,all-week,night,2020,all-year,R2,17.50000000000,gas_stove,0,2020
+6,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020
+1,cook,all-week,night,2020,all-year,R1,0.35000000000,gas_stove,0,2020
+5,cook,all-week,night,2020,all-year,R1,0.35000000000,gas_stove,0,2020
+1,cook,all-week,night,2020,all-year,R2,0.35000000000,gas_stove,0,2020
+5,cook,all-week,night,2020,all-year,R2,0.35000000000,gas_stove,0,2020
+2,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020
+6,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020
+2,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020
+6,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020
+1,CO2f,all-week,morning,2020,all-year,R1,25.00000000000,gas_stove,1,2020
+2,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020
+5,CO2f,all-week,morning,2020,all-year,R1,25.00000000000,gas_stove,1,2020
+6,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020
+1,CO2f,all-week,morning,2020,all-year,R2,25.00000000000,gas_stove,1,2020
+2,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020
+5,CO2f,all-week,morning,2020,all-year,R2,25.00000000000,gas_stove,1,2020
+6,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020
+1,cook,all-week,morning,2020,all-year,R1,0.50000000000,gas_stove,1,2020
+5,cook,all-week,morning,2020,all-year,R1,0.50000000000,gas_stove,1,2020
+1,cook,all-week,morning,2020,all-year,R2,0.50000000000,gas_stove,1,2020
+5,cook,all-week,morning,2020,all-year,R2,0.50000000000,gas_stove,1,2020
+2,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020
+6,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020
+2,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020
+6,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020
+1,CO2f,all-week,mid-afternoon,2020,all-year,R1,17.50000000000,gas_stove,2,2020
+2,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020
+5,CO2f,all-week,mid-afternoon,2020,all-year,R1,17.50000000000,gas_stove,2,2020
+6,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020
+1,CO2f,all-week,mid-afternoon,2020,all-year,R2,17.50000000000,gas_stove,2,2020
+2,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020
+5,CO2f,all-week,mid-afternoon,2020,all-year,R2,17.50000000000,gas_stove,2,2020
+6,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020
+1,cook,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gas_stove,2,2020
+5,cook,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gas_stove,2,2020
+1,cook,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gas_stove,2,2020
+5,cook,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gas_stove,2,2020
+2,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020
+6,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020
+2,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020
+6,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020
+1,CO2f,all-week,early-peak,2020,all-year,R1,25.00000000000,gas_stove,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020
+5,CO2f,all-week,early-peak,2020,all-year,R1,25.00000000000,gas_stove,3,2020
+6,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020
+1,CO2f,all-week,early-peak,2020,all-year,R2,25.00000000000,gas_stove,3,2020
+2,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020
+5,CO2f,all-week,early-peak,2020,all-year,R2,25.00000000000,gas_stove,3,2020
+6,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020
+1,cook,all-week,early-peak,2020,all-year,R1,0.50000000000,gas_stove,3,2020
+5,cook,all-week,early-peak,2020,all-year,R1,0.50000000000,gas_stove,3,2020
+1,cook,all-week,early-peak,2020,all-year,R2,0.50000000000,gas_stove,3,2020
+5,cook,all-week,early-peak,2020,all-year,R2,0.50000000000,gas_stove,3,2020
+2,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020
+6,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020
+2,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020
+6,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020
+1,CO2f,all-week,late-peak,2020,all-year,R1,52.50000000000,gas_stove,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020
+5,CO2f,all-week,late-peak,2020,all-year,R1,52.50000000000,gas_stove,4,2020
+6,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020
+1,CO2f,all-week,late-peak,2020,all-year,R2,52.50000000000,gas_stove,4,2020
+2,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020
+5,CO2f,all-week,late-peak,2020,all-year,R2,52.50000000000,gas_stove,4,2020
+6,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020
+1,cook,all-week,late-peak,2020,all-year,R1,1.05000000000,gas_stove,4,2020
+5,cook,all-week,late-peak,2020,all-year,R1,1.05000000000,gas_stove,4,2020
+1,cook,all-week,late-peak,2020,all-year,R2,1.05000000000,gas_stove,4,2020
+5,cook,all-week,late-peak,2020,all-year,R2,1.05000000000,gas_stove,4,2020
+2,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020
+6,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020
+2,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020
+6,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020
+1,CO2f,all-week,evening,2020,all-year,R1,35.00000000000,gas_stove,5,2020
+2,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020
+5,CO2f,all-week,evening,2020,all-year,R1,35.00000000000,gas_stove,5,2020
+6,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020
+1,CO2f,all-week,evening,2020,all-year,R2,35.00000000000,gas_stove,5,2020
+2,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020
+5,CO2f,all-week,evening,2020,all-year,R2,35.00000000000,gas_stove,5,2020
+6,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020
+1,cook,all-week,evening,2020,all-year,R1,0.70000000000,gas_stove,5,2020
+5,cook,all-week,evening,2020,all-year,R1,0.70000000000,gas_stove,5,2020
+1,cook,all-week,evening,2020,all-year,R2,0.70000000000,gas_stove,5,2020
+5,cook,all-week,evening,2020,all-year,R2,0.70000000000,gas_stove,5,2020
+2,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020
+6,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020
+2,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020
+6,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020
+1,CO2f,all-week,early-morning,2020,all-year,R1,35.00000000000,gas_stove,6,2020
+2,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020
+5,CO2f,all-week,early-morning,2020,all-year,R1,35.00000000000,gas_stove,6,2020
+6,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020
+1,CO2f,all-week,early-morning,2020,all-year,R2,35.00000000000,gas_stove,6,2020
+2,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020
+5,CO2f,all-week,early-morning,2020,all-year,R2,35.00000000000,gas_stove,6,2020
+6,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020
+1,cook,all-week,early-morning,2020,all-year,R1,0.70000000000,gas_stove,6,2020
+5,cook,all-week,early-morning,2020,all-year,R1,0.70000000000,gas_stove,6,2020
+1,cook,all-week,early-morning,2020,all-year,R2,0.70000000000,gas_stove,6,2020
+5,cook,all-week,early-morning,2020,all-year,R2,0.70000000000,gas_stove,6,2020
+2,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020
+6,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020
+2,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020
+6,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020
+1,CO2f,all-week,late-afternoon,2020,all-year,R1,35.00000000000,gas_stove,7,2020
+2,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020
+5,CO2f,all-week,late-afternoon,2020,all-year,R1,35.00000000000,gas_stove,7,2020
+6,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020
+1,CO2f,all-week,late-afternoon,2020,all-year,R2,35.00000000000,gas_stove,7,2020
+2,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020
+5,CO2f,all-week,late-afternoon,2020,all-year,R2,35.00000000000,gas_stove,7,2020
+6,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020
+1,cook,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gas_stove,7,2020
+5,cook,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gas_stove,7,2020
+1,cook,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gas_stove,7,2020
+5,cook,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gas_stove,7,2020
+3,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025
+9,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025
+10,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025
+3,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025
+9,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025
+10,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025
+2,CO2f,all-week,night,2020,all-year,R1,5.30300000000,gas_stove,0,2025
+3,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025
+8,CO2f,all-week,night,2020,all-year,R1,5.30300000000,gas_stove,0,2025
+9,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025
+2,CO2f,all-week,night,2020,all-year,R2,5.30300000000,gas_stove,0,2025
+3,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025
+8,CO2f,all-week,night,2020,all-year,R2,5.30300000000,gas_stove,0,2025
+9,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025
+0,cook,all-week,night,2020,all-year,R1,0.36060000000,electric_stove,0,2025
+2,cook,all-week,night,2020,all-year,R1,0.10610000000,gas_stove,0,2025
+6,cook,all-week,night,2020,all-year,R1,0.36060000000,electric_stove,0,2025
+8,cook,all-week,night,2020,all-year,R1,0.10610000000,gas_stove,0,2025
+0,cook,all-week,night,2020,all-year,R2,0.36060000000,electric_stove,0,2025
+2,cook,all-week,night,2020,all-year,R2,0.10610000000,gas_stove,0,2025
+6,cook,all-week,night,2020,all-year,R2,0.36060000000,electric_stove,0,2025
+8,cook,all-week,night,2020,all-year,R2,0.10610000000,gas_stove,0,2025
+3,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025
+9,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025
+10,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025
+3,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025
+9,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025
+10,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025
+2,CO2f,all-week,morning,2020,all-year,R1,7.57580000000,gas_stove,1,2025
+3,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025
+8,CO2f,all-week,morning,2020,all-year,R1,7.57580000000,gas_stove,1,2025
+9,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025
+2,CO2f,all-week,morning,2020,all-year,R2,7.57580000000,gas_stove,1,2025
+3,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025
+8,CO2f,all-week,morning,2020,all-year,R2,7.57580000000,gas_stove,1,2025
+9,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025
+0,cook,all-week,morning,2020,all-year,R1,0.51520000000,electric_stove,1,2025
+2,cook,all-week,morning,2020,all-year,R1,0.15150000000,gas_stove,1,2025
+6,cook,all-week,morning,2020,all-year,R1,0.51520000000,electric_stove,1,2025
+8,cook,all-week,morning,2020,all-year,R1,0.15150000000,gas_stove,1,2025
+0,cook,all-week,morning,2020,all-year,R2,0.51520000000,electric_stove,1,2025
+2,cook,all-week,morning,2020,all-year,R2,0.15150000000,gas_stove,1,2025
+6,cook,all-week,morning,2020,all-year,R2,0.51520000000,electric_stove,1,2025
+8,cook,all-week,morning,2020,all-year,R2,0.15150000000,gas_stove,1,2025
+3,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025
+4,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025
+9,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025
+10,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025
+3,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025
+4,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025
+9,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025
+10,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025
+2,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.30300000000,gas_stove,2,2025
+3,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025
+8,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.30300000000,gas_stove,2,2025
+9,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025
+2,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.30300000000,gas_stove,2,2025
+3,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025
+8,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.30300000000,gas_stove,2,2025
+9,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025
+0,cook,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,electric_stove,2,2025
+2,cook,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gas_stove,2,2025
+6,cook,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,electric_stove,2,2025
+8,cook,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gas_stove,2,2025
+0,cook,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,electric_stove,2,2025
+2,cook,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gas_stove,2,2025
+6,cook,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,electric_stove,2,2025
+8,cook,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gas_stove,2,2025
+3,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025
+9,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025
+10,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025
+3,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025
+9,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025
+10,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025
+2,CO2f,all-week,early-peak,2020,all-year,R1,7.57580000000,gas_stove,3,2025
+3,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025
+8,CO2f,all-week,early-peak,2020,all-year,R1,7.57580000000,gas_stove,3,2025
+9,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025
+2,CO2f,all-week,early-peak,2020,all-year,R2,7.57580000000,gas_stove,3,2025
+3,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025
+8,CO2f,all-week,early-peak,2020,all-year,R2,7.57580000000,gas_stove,3,2025
+9,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025
+0,cook,all-week,early-peak,2020,all-year,R1,0.51520000000,electric_stove,3,2025
+2,cook,all-week,early-peak,2020,all-year,R1,0.15150000000,gas_stove,3,2025
+6,cook,all-week,early-peak,2020,all-year,R1,0.51520000000,electric_stove,3,2025
+8,cook,all-week,early-peak,2020,all-year,R1,0.15150000000,gas_stove,3,2025
+0,cook,all-week,early-peak,2020,all-year,R2,0.51520000000,electric_stove,3,2025
+2,cook,all-week,early-peak,2020,all-year,R2,0.15150000000,gas_stove,3,2025
+6,cook,all-week,early-peak,2020,all-year,R2,0.51520000000,electric_stove,3,2025
+8,cook,all-week,early-peak,2020,all-year,R2,0.15150000000,gas_stove,3,2025
+3,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025
+9,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025
+10,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025
+3,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025
+9,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025
+10,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025
+2,CO2f,all-week,late-peak,2020,all-year,R1,15.90910000000,gas_stove,4,2025
+3,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025
+8,CO2f,all-week,late-peak,2020,all-year,R1,15.90910000000,gas_stove,4,2025
+9,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025
+2,CO2f,all-week,late-peak,2020,all-year,R2,15.90910000000,gas_stove,4,2025
+3,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025
+8,CO2f,all-week,late-peak,2020,all-year,R2,15.90910000000,gas_stove,4,2025
+9,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025
+0,cook,all-week,late-peak,2020,all-year,R1,1.08180000000,electric_stove,4,2025
+2,cook,all-week,late-peak,2020,all-year,R1,0.31820000000,gas_stove,4,2025
+6,cook,all-week,late-peak,2020,all-year,R1,1.08180000000,electric_stove,4,2025
+8,cook,all-week,late-peak,2020,all-year,R1,0.31820000000,gas_stove,4,2025
+0,cook,all-week,late-peak,2020,all-year,R2,1.08180000000,electric_stove,4,2025
+2,cook,all-week,late-peak,2020,all-year,R2,0.31820000000,gas_stove,4,2025
+6,cook,all-week,late-peak,2020,all-year,R2,1.08180000000,electric_stove,4,2025
+8,cook,all-week,late-peak,2020,all-year,R2,0.31820000000,gas_stove,4,2025
+3,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025
+9,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025
+10,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025
+3,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025
+9,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025
+10,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025
+2,CO2f,all-week,evening,2020,all-year,R1,10.60610000000,gas_stove,5,2025
+3,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025
+8,CO2f,all-week,evening,2020,all-year,R1,10.60610000000,gas_stove,5,2025
+9,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025
+2,CO2f,all-week,evening,2020,all-year,R2,10.60610000000,gas_stove,5,2025
+3,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025
+8,CO2f,all-week,evening,2020,all-year,R2,10.60610000000,gas_stove,5,2025
+9,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025
+0,cook,all-week,evening,2020,all-year,R1,0.72120000000,electric_stove,5,2025
+2,cook,all-week,evening,2020,all-year,R1,0.21210000000,gas_stove,5,2025
+6,cook,all-week,evening,2020,all-year,R1,0.72120000000,electric_stove,5,2025
+8,cook,all-week,evening,2020,all-year,R1,0.21210000000,gas_stove,5,2025
+0,cook,all-week,evening,2020,all-year,R2,0.72120000000,electric_stove,5,2025
+2,cook,all-week,evening,2020,all-year,R2,0.21210000000,gas_stove,5,2025
+6,cook,all-week,evening,2020,all-year,R2,0.72120000000,electric_stove,5,2025
+8,cook,all-week,evening,2020,all-year,R2,0.21210000000,gas_stove,5,2025
+3,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025
+4,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025
+9,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025
+10,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025
+3,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025
+4,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025
+9,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025
+10,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025
+2,CO2f,all-week,early-morning,2020,all-year,R1,10.60610000000,gas_stove,6,2025
+3,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025
+8,CO2f,all-week,early-morning,2020,all-year,R1,10.60610000000,gas_stove,6,2025
+9,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025
+2,CO2f,all-week,early-morning,2020,all-year,R2,10.60610000000,gas_stove,6,2025
+3,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025
+8,CO2f,all-week,early-morning,2020,all-year,R2,10.60610000000,gas_stove,6,2025
+9,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025
+0,cook,all-week,early-morning,2020,all-year,R1,0.72120000000,electric_stove,6,2025
+2,cook,all-week,early-morning,2020,all-year,R1,0.21210000000,gas_stove,6,2025
+6,cook,all-week,early-morning,2020,all-year,R1,0.72120000000,electric_stove,6,2025
+8,cook,all-week,early-morning,2020,all-year,R1,0.21210000000,gas_stove,6,2025
+0,cook,all-week,early-morning,2020,all-year,R2,0.72120000000,electric_stove,6,2025
+2,cook,all-week,early-morning,2020,all-year,R2,0.21210000000,gas_stove,6,2025
+6,cook,all-week,early-morning,2020,all-year,R2,0.72120000000,electric_stove,6,2025
+8,cook,all-week,early-morning,2020,all-year,R2,0.21210000000,gas_stove,6,2025
+3,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025
+4,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025
+9,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025
+10,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025
+3,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025
+4,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025
+9,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025
+10,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025
+2,CO2f,all-week,late-afternoon,2020,all-year,R1,10.60610000000,gas_stove,7,2025
+3,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025
+8,CO2f,all-week,late-afternoon,2020,all-year,R1,10.60610000000,gas_stove,7,2025
+9,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025
+2,CO2f,all-week,late-afternoon,2020,all-year,R2,10.60610000000,gas_stove,7,2025
+3,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025
+8,CO2f,all-week,late-afternoon,2020,all-year,R2,10.60610000000,gas_stove,7,2025
+9,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025
+0,cook,all-week,late-afternoon,2020,all-year,R1,0.72120000000,electric_stove,7,2025
+2,cook,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gas_stove,7,2025
+6,cook,all-week,late-afternoon,2020,all-year,R1,0.72120000000,electric_stove,7,2025
+8,cook,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gas_stove,7,2025
+0,cook,all-week,late-afternoon,2020,all-year,R2,0.72120000000,electric_stove,7,2025
+2,cook,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gas_stove,7,2025
+6,cook,all-week,late-afternoon,2020,all-year,R2,0.72120000000,electric_stove,7,2025
+8,cook,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gas_stove,7,2025
+5,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030
+13,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030
+14,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030
+5,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030
+13,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030
+14,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030
+0,cook,all-week,night,2020,all-year,R1,0.35420000000,electric_stove,0,2030
+1,cook,all-week,night,2025,all-year,R1,0.22920000000,electric_stove,0,2030
+8,cook,all-week,night,2020,all-year,R1,0.35420000000,electric_stove,0,2030
+9,cook,all-week,night,2025,all-year,R1,0.22920000000,electric_stove,0,2030
+0,cook,all-week,night,2020,all-year,R2,0.35420000000,electric_stove,0,2030
+1,cook,all-week,night,2025,all-year,R2,0.22920000000,electric_stove,0,2030
+8,cook,all-week,night,2020,all-year,R2,0.35420000000,electric_stove,0,2030
+9,cook,all-week,night,2025,all-year,R2,0.22920000000,electric_stove,0,2030
+5,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030
+13,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030
+14,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030
+5,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030
+13,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030
+14,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030
+0,cook,all-week,morning,2020,all-year,R1,0.50600000000,electric_stove,1,2030
+1,cook,all-week,morning,2025,all-year,R1,0.32740000000,electric_stove,1,2030
+8,cook,all-week,morning,2020,all-year,R1,0.50600000000,electric_stove,1,2030
+9,cook,all-week,morning,2025,all-year,R1,0.32740000000,electric_stove,1,2030
+0,cook,all-week,morning,2020,all-year,R2,0.50600000000,electric_stove,1,2030
+1,cook,all-week,morning,2025,all-year,R2,0.32740000000,electric_stove,1,2030
+8,cook,all-week,morning,2020,all-year,R2,0.50600000000,electric_stove,1,2030
+9,cook,all-week,morning,2025,all-year,R2,0.32740000000,electric_stove,1,2030
+5,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030
+6,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030
+13,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030
+14,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030
+5,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030
+6,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030
+13,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030
+14,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030
+0,cook,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,electric_stove,2,2030
+1,cook,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,electric_stove,2,2030
+8,cook,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,electric_stove,2,2030
+9,cook,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,electric_stove,2,2030
+0,cook,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,electric_stove,2,2030
+1,cook,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,electric_stove,2,2030
+8,cook,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,electric_stove,2,2030
+9,cook,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,electric_stove,2,2030
+5,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030
+13,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030
+14,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030
+5,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030
+13,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030
+14,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030
+0,cook,all-week,early-peak,2020,all-year,R1,0.50600000000,electric_stove,3,2030
+1,cook,all-week,early-peak,2025,all-year,R1,0.32740000000,electric_stove,3,2030
+8,cook,all-week,early-peak,2020,all-year,R1,0.50600000000,electric_stove,3,2030
+9,cook,all-week,early-peak,2025,all-year,R1,0.32740000000,electric_stove,3,2030
+0,cook,all-week,early-peak,2020,all-year,R2,0.50600000000,electric_stove,3,2030
+1,cook,all-week,early-peak,2025,all-year,R2,0.32740000000,electric_stove,3,2030
+8,cook,all-week,early-peak,2020,all-year,R2,0.50600000000,electric_stove,3,2030
+9,cook,all-week,early-peak,2025,all-year,R2,0.32740000000,electric_stove,3,2030
+5,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030
+13,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030
+14,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030
+5,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030
+13,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030
+14,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030
+0,cook,all-week,late-peak,2020,all-year,R1,1.06250000000,electric_stove,4,2030
+1,cook,all-week,late-peak,2025,all-year,R1,0.68750000000,electric_stove,4,2030
+8,cook,all-week,late-peak,2020,all-year,R1,1.06250000000,electric_stove,4,2030
+9,cook,all-week,late-peak,2025,all-year,R1,0.68750000000,electric_stove,4,2030
+0,cook,all-week,late-peak,2020,all-year,R2,1.06250000000,electric_stove,4,2030
+1,cook,all-week,late-peak,2025,all-year,R2,0.68750000000,electric_stove,4,2030
+8,cook,all-week,late-peak,2020,all-year,R2,1.06250000000,electric_stove,4,2030
+9,cook,all-week,late-peak,2025,all-year,R2,0.68750000000,electric_stove,4,2030
+5,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030
+13,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030
+14,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030
+5,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030
+13,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030
+14,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030
+0,cook,all-week,evening,2020,all-year,R1,0.70830000000,electric_stove,5,2030
+1,cook,all-week,evening,2025,all-year,R1,0.45830000000,electric_stove,5,2030
+8,cook,all-week,evening,2020,all-year,R1,0.70830000000,electric_stove,5,2030
+9,cook,all-week,evening,2025,all-year,R1,0.45830000000,electric_stove,5,2030
+0,cook,all-week,evening,2020,all-year,R2,0.70830000000,electric_stove,5,2030
+1,cook,all-week,evening,2025,all-year,R2,0.45830000000,electric_stove,5,2030
+8,cook,all-week,evening,2020,all-year,R2,0.70830000000,electric_stove,5,2030
+9,cook,all-week,evening,2025,all-year,R2,0.45830000000,electric_stove,5,2030
+5,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030
+6,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030
+13,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030
+14,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030
+5,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030
+6,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030
+13,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030
+14,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030
+0,cook,all-week,early-morning,2020,all-year,R1,0.70830000000,electric_stove,6,2030
+1,cook,all-week,early-morning,2025,all-year,R1,0.45830000000,electric_stove,6,2030
+8,cook,all-week,early-morning,2020,all-year,R1,0.70830000000,electric_stove,6,2030
+9,cook,all-week,early-morning,2025,all-year,R1,0.45830000000,electric_stove,6,2030
+0,cook,all-week,early-morning,2020,all-year,R2,0.70830000000,electric_stove,6,2030
+1,cook,all-week,early-morning,2025,all-year,R2,0.45830000000,electric_stove,6,2030
+8,cook,all-week,early-morning,2020,all-year,R2,0.70830000000,electric_stove,6,2030
+9,cook,all-week,early-morning,2025,all-year,R2,0.45830000000,electric_stove,6,2030
+5,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030
+6,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030
+13,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030
+14,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030
+5,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030
+6,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030
+13,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030
+14,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030
+0,cook,all-week,late-afternoon,2020,all-year,R1,0.70830000000,electric_stove,7,2030
+1,cook,all-week,late-afternoon,2025,all-year,R1,0.45830000000,electric_stove,7,2030
+8,cook,all-week,late-afternoon,2020,all-year,R1,0.70830000000,electric_stove,7,2030
+9,cook,all-week,late-afternoon,2025,all-year,R1,0.45830000000,electric_stove,7,2030
+0,cook,all-week,late-afternoon,2020,all-year,R2,0.70830000000,electric_stove,7,2030
+1,cook,all-week,late-afternoon,2025,all-year,R2,0.45830000000,electric_stove,7,2030
+8,cook,all-week,late-afternoon,2020,all-year,R2,0.70830000000,electric_stove,7,2030
+9,cook,all-week,late-afternoon,2025,all-year,R2,0.45830000000,electric_stove,7,2030
+7,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035
+17,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035
+18,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035
+7,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035
+17,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035
+18,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035
+1,cook,all-week,night,2025,all-year,R1,0.23330000000,electric_stove,0,2035
+2,cook,all-week,night,2030,all-year,R1,0.46670000000,electric_stove,0,2035
+11,cook,all-week,night,2025,all-year,R1,0.23330000000,electric_stove,0,2035
+12,cook,all-week,night,2030,all-year,R1,0.46670000000,electric_stove,0,2035
+1,cook,all-week,night,2025,all-year,R2,0.23330000000,electric_stove,0,2035
+2,cook,all-week,night,2030,all-year,R2,0.46670000000,electric_stove,0,2035
+11,cook,all-week,night,2025,all-year,R2,0.23330000000,electric_stove,0,2035
+12,cook,all-week,night,2030,all-year,R2,0.46670000000,electric_stove,0,2035
+7,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035
+17,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035
+18,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035
+7,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035
+17,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035
+18,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035
+1,cook,all-week,morning,2025,all-year,R1,0.33330000000,electric_stove,1,2035
+2,cook,all-week,morning,2030,all-year,R1,0.66670000000,electric_stove,1,2035
+11,cook,all-week,morning,2025,all-year,R1,0.33330000000,electric_stove,1,2035
+12,cook,all-week,morning,2030,all-year,R1,0.66670000000,electric_stove,1,2035
+1,cook,all-week,morning,2025,all-year,R2,0.33330000000,electric_stove,1,2035
+2,cook,all-week,morning,2030,all-year,R2,0.66670000000,electric_stove,1,2035
+11,cook,all-week,morning,2025,all-year,R2,0.33330000000,electric_stove,1,2035
+12,cook,all-week,morning,2030,all-year,R2,0.66670000000,electric_stove,1,2035
+7,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035
+8,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035
+17,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035
+18,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035
+7,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035
+8,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035
+17,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035
+18,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035
+1,cook,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,electric_stove,2,2035
+2,cook,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,electric_stove,2,2035
+11,cook,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,electric_stove,2,2035
+12,cook,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,electric_stove,2,2035
+1,cook,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,electric_stove,2,2035
+2,cook,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,electric_stove,2,2035
+11,cook,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,electric_stove,2,2035
+12,cook,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,electric_stove,2,2035
+7,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035
+17,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035
+18,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035
+7,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035
+17,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035
+18,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035
+1,cook,all-week,early-peak,2025,all-year,R1,0.33330000000,electric_stove,3,2035
+2,cook,all-week,early-peak,2030,all-year,R1,0.66670000000,electric_stove,3,2035
+11,cook,all-week,early-peak,2025,all-year,R1,0.33330000000,electric_stove,3,2035
+12,cook,all-week,early-peak,2030,all-year,R1,0.66670000000,electric_stove,3,2035
+1,cook,all-week,early-peak,2025,all-year,R2,0.33330000000,electric_stove,3,2035
+2,cook,all-week,early-peak,2030,all-year,R2,0.66670000000,electric_stove,3,2035
+11,cook,all-week,early-peak,2025,all-year,R2,0.33330000000,electric_stove,3,2035
+12,cook,all-week,early-peak,2030,all-year,R2,0.66670000000,electric_stove,3,2035
+7,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035
+17,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035
+18,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035
+7,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035
+17,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035
+18,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035
+1,cook,all-week,late-peak,2025,all-year,R1,0.70000000000,electric_stove,4,2035
+2,cook,all-week,late-peak,2030,all-year,R1,1.40000000000,electric_stove,4,2035
+11,cook,all-week,late-peak,2025,all-year,R1,0.70000000000,electric_stove,4,2035
+12,cook,all-week,late-peak,2030,all-year,R1,1.40000000000,electric_stove,4,2035
+1,cook,all-week,late-peak,2025,all-year,R2,0.70000000000,electric_stove,4,2035
+2,cook,all-week,late-peak,2030,all-year,R2,1.40000000000,electric_stove,4,2035
+11,cook,all-week,late-peak,2025,all-year,R2,0.70000000000,electric_stove,4,2035
+12,cook,all-week,late-peak,2030,all-year,R2,1.40000000000,electric_stove,4,2035
+7,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035
+17,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035
+18,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035
+7,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035
+17,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035
+18,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035
+1,cook,all-week,evening,2025,all-year,R1,0.46670000000,electric_stove,5,2035
+2,cook,all-week,evening,2030,all-year,R1,0.93330000000,electric_stove,5,2035
+11,cook,all-week,evening,2025,all-year,R1,0.46670000000,electric_stove,5,2035
+12,cook,all-week,evening,2030,all-year,R1,0.93330000000,electric_stove,5,2035
+1,cook,all-week,evening,2025,all-year,R2,0.46670000000,electric_stove,5,2035
+2,cook,all-week,evening,2030,all-year,R2,0.93330000000,electric_stove,5,2035
+11,cook,all-week,evening,2025,all-year,R2,0.46670000000,electric_stove,5,2035
+12,cook,all-week,evening,2030,all-year,R2,0.93330000000,electric_stove,5,2035
+7,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035
+8,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035
+17,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035
+18,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035
+7,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035
+8,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035
+17,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035
+18,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035
+1,cook,all-week,early-morning,2025,all-year,R1,0.46670000000,electric_stove,6,2035
+2,cook,all-week,early-morning,2030,all-year,R1,0.93330000000,electric_stove,6,2035
+11,cook,all-week,early-morning,2025,all-year,R1,0.46670000000,electric_stove,6,2035
+12,cook,all-week,early-morning,2030,all-year,R1,0.93330000000,electric_stove,6,2035
+1,cook,all-week,early-morning,2025,all-year,R2,0.46670000000,electric_stove,6,2035
+2,cook,all-week,early-morning,2030,all-year,R2,0.93330000000,electric_stove,6,2035
+11,cook,all-week,early-morning,2025,all-year,R2,0.46670000000,electric_stove,6,2035
+12,cook,all-week,early-morning,2030,all-year,R2,0.93330000000,electric_stove,6,2035
+7,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035
+8,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035
+17,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035
+18,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035
+7,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035
+8,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035
+17,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035
+18,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035
+1,cook,all-week,late-afternoon,2025,all-year,R1,0.46670000000,electric_stove,7,2035
+2,cook,all-week,late-afternoon,2030,all-year,R1,0.93330000000,electric_stove,7,2035
+11,cook,all-week,late-afternoon,2025,all-year,R1,0.46670000000,electric_stove,7,2035
+12,cook,all-week,late-afternoon,2030,all-year,R1,0.93330000000,electric_stove,7,2035
+1,cook,all-week,late-afternoon,2025,all-year,R2,0.46670000000,electric_stove,7,2035
+2,cook,all-week,late-afternoon,2030,all-year,R2,0.93330000000,electric_stove,7,2035
+11,cook,all-week,late-afternoon,2025,all-year,R2,0.46670000000,electric_stove,7,2035
+12,cook,all-week,late-afternoon,2030,all-year,R2,0.93330000000,electric_stove,7,2035
+9,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040
+21,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040
+22,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040
+9,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040
+21,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040
+22,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040
+2,cook,all-week,night,2030,all-year,R1,0.46070000000,electric_stove,0,2040
+3,cook,all-week,night,2035,all-year,R1,0.35600000000,electric_stove,0,2040
+14,cook,all-week,night,2030,all-year,R1,0.46070000000,electric_stove,0,2040
+15,cook,all-week,night,2035,all-year,R1,0.35600000000,electric_stove,0,2040
+2,cook,all-week,night,2030,all-year,R2,0.46070000000,electric_stove,0,2040
+3,cook,all-week,night,2035,all-year,R2,0.35600000000,electric_stove,0,2040
+14,cook,all-week,night,2030,all-year,R2,0.46070000000,electric_stove,0,2040
+15,cook,all-week,night,2035,all-year,R2,0.35600000000,electric_stove,0,2040
+9,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040
+21,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040
+22,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040
+9,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040
+21,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040
+22,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040
+2,cook,all-week,morning,2030,all-year,R1,0.65810000000,electric_stove,1,2040
+3,cook,all-week,morning,2035,all-year,R1,0.50850000000,electric_stove,1,2040
+14,cook,all-week,morning,2030,all-year,R1,0.65810000000,electric_stove,1,2040
+15,cook,all-week,morning,2035,all-year,R1,0.50850000000,electric_stove,1,2040
+2,cook,all-week,morning,2030,all-year,R2,0.65810000000,electric_stove,1,2040
+3,cook,all-week,morning,2035,all-year,R2,0.50850000000,electric_stove,1,2040
+14,cook,all-week,morning,2030,all-year,R2,0.65810000000,electric_stove,1,2040
+15,cook,all-week,morning,2035,all-year,R2,0.50850000000,electric_stove,1,2040
+9,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040
+10,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040
+21,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040
+22,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040
+9,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040
+10,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040
+21,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040
+22,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040
+2,cook,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,electric_stove,2,2040
+3,cook,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,electric_stove,2,2040
+14,cook,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,electric_stove,2,2040
+15,cook,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,electric_stove,2,2040
+2,cook,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,electric_stove,2,2040
+3,cook,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,electric_stove,2,2040
+14,cook,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,electric_stove,2,2040
+15,cook,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,electric_stove,2,2040
+9,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040
+21,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040
+22,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040
+9,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040
+21,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040
+22,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040
+2,cook,all-week,early-peak,2030,all-year,R1,0.65810000000,electric_stove,3,2040
+3,cook,all-week,early-peak,2035,all-year,R1,0.50850000000,electric_stove,3,2040
+14,cook,all-week,early-peak,2030,all-year,R1,0.65810000000,electric_stove,3,2040
+15,cook,all-week,early-peak,2035,all-year,R1,0.50850000000,electric_stove,3,2040
+2,cook,all-week,early-peak,2030,all-year,R2,0.65810000000,electric_stove,3,2040
+3,cook,all-week,early-peak,2035,all-year,R2,0.50850000000,electric_stove,3,2040
+14,cook,all-week,early-peak,2030,all-year,R2,0.65810000000,electric_stove,3,2040
+15,cook,all-week,early-peak,2035,all-year,R2,0.50850000000,electric_stove,3,2040
+9,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040
+21,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040
+22,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040
+9,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040
+21,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040
+22,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040
+2,cook,all-week,late-peak,2030,all-year,R1,1.38210000000,electric_stove,4,2040
+3,cook,all-week,late-peak,2035,all-year,R1,1.06790000000,electric_stove,4,2040
+14,cook,all-week,late-peak,2030,all-year,R1,1.38210000000,electric_stove,4,2040
+15,cook,all-week,late-peak,2035,all-year,R1,1.06790000000,electric_stove,4,2040
+2,cook,all-week,late-peak,2030,all-year,R2,1.38210000000,electric_stove,4,2040
+3,cook,all-week,late-peak,2035,all-year,R2,1.06790000000,electric_stove,4,2040
+14,cook,all-week,late-peak,2030,all-year,R2,1.38210000000,electric_stove,4,2040
+15,cook,all-week,late-peak,2035,all-year,R2,1.06790000000,electric_stove,4,2040
+9,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040
+21,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040
+22,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040
+9,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040
+21,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040
+22,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040
+2,cook,all-week,evening,2030,all-year,R1,0.92140000000,electric_stove,5,2040
+3,cook,all-week,evening,2035,all-year,R1,0.71200000000,electric_stove,5,2040
+14,cook,all-week,evening,2030,all-year,R1,0.92140000000,electric_stove,5,2040
+15,cook,all-week,evening,2035,all-year,R1,0.71200000000,electric_stove,5,2040
+2,cook,all-week,evening,2030,all-year,R2,0.92140000000,electric_stove,5,2040
+3,cook,all-week,evening,2035,all-year,R2,0.71200000000,electric_stove,5,2040
+14,cook,all-week,evening,2030,all-year,R2,0.92140000000,electric_stove,5,2040
+15,cook,all-week,evening,2035,all-year,R2,0.71200000000,electric_stove,5,2040
+9,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040
+10,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040
+21,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040
+22,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040
+9,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040
+10,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040
+21,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040
+22,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040
+2,cook,all-week,early-morning,2030,all-year,R1,0.92140000000,electric_stove,6,2040
+3,cook,all-week,early-morning,2035,all-year,R1,0.71200000000,electric_stove,6,2040
+14,cook,all-week,early-morning,2030,all-year,R1,0.92140000000,electric_stove,6,2040
+15,cook,all-week,early-morning,2035,all-year,R1,0.71200000000,electric_stove,6,2040
+2,cook,all-week,early-morning,2030,all-year,R2,0.92140000000,electric_stove,6,2040
+3,cook,all-week,early-morning,2035,all-year,R2,0.71200000000,electric_stove,6,2040
+14,cook,all-week,early-morning,2030,all-year,R2,0.92140000000,electric_stove,6,2040
+15,cook,all-week,early-morning,2035,all-year,R2,0.71200000000,electric_stove,6,2040
+9,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040
+10,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040
+21,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040
+22,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040
+9,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040
+10,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040
+21,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040
+22,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040
+2,cook,all-week,late-afternoon,2030,all-year,R1,0.92140000000,electric_stove,7,2040
+3,cook,all-week,late-afternoon,2035,all-year,R1,0.71200000000,electric_stove,7,2040
+14,cook,all-week,late-afternoon,2030,all-year,R1,0.92140000000,electric_stove,7,2040
+15,cook,all-week,late-afternoon,2035,all-year,R1,0.71200000000,electric_stove,7,2040
+2,cook,all-week,late-afternoon,2030,all-year,R2,0.92140000000,electric_stove,7,2040
+3,cook,all-week,late-afternoon,2035,all-year,R2,0.71200000000,electric_stove,7,2040
+14,cook,all-week,late-afternoon,2030,all-year,R2,0.92140000000,electric_stove,7,2040
+15,cook,all-week,late-afternoon,2035,all-year,R2,0.71200000000,electric_stove,7,2040
+11,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045
+25,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045
+26,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045
+11,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045
+25,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045
+26,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045
+3,cook,all-week,night,2035,all-year,R1,0.36060000000,electric_stove,0,2045
+4,cook,all-week,night,2040,all-year,R1,0.57270000000,electric_stove,0,2045
+17,cook,all-week,night,2035,all-year,R1,0.36060000000,electric_stove,0,2045
+18,cook,all-week,night,2040,all-year,R1,0.57270000000,electric_stove,0,2045
+3,cook,all-week,night,2035,all-year,R2,0.36060000000,electric_stove,0,2045
+4,cook,all-week,night,2040,all-year,R2,0.57270000000,electric_stove,0,2045
+17,cook,all-week,night,2035,all-year,R2,0.36060000000,electric_stove,0,2045
+18,cook,all-week,night,2040,all-year,R2,0.57270000000,electric_stove,0,2045
+11,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045
+25,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045
+26,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045
+11,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045
+25,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045
+26,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045
+3,cook,all-week,morning,2035,all-year,R1,0.51520000000,electric_stove,1,2045
+4,cook,all-week,morning,2040,all-year,R1,0.81820000000,electric_stove,1,2045
+17,cook,all-week,morning,2035,all-year,R1,0.51520000000,electric_stove,1,2045
+18,cook,all-week,morning,2040,all-year,R1,0.81820000000,electric_stove,1,2045
+3,cook,all-week,morning,2035,all-year,R2,0.51520000000,electric_stove,1,2045
+4,cook,all-week,morning,2040,all-year,R2,0.81820000000,electric_stove,1,2045
+17,cook,all-week,morning,2035,all-year,R2,0.51520000000,electric_stove,1,2045
+18,cook,all-week,morning,2040,all-year,R2,0.81820000000,electric_stove,1,2045
+11,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045
+12,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045
+25,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045
+26,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045
+11,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045
+12,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045
+25,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045
+26,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045
+3,cook,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,electric_stove,2,2045
+4,cook,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,electric_stove,2,2045
+17,cook,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,electric_stove,2,2045
+18,cook,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,electric_stove,2,2045
+3,cook,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,electric_stove,2,2045
+4,cook,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,electric_stove,2,2045
+17,cook,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,electric_stove,2,2045
+18,cook,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,electric_stove,2,2045
+11,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045
+25,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045
+26,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045
+11,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045
+25,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045
+26,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045
+3,cook,all-week,early-peak,2035,all-year,R1,0.51520000000,electric_stove,3,2045
+4,cook,all-week,early-peak,2040,all-year,R1,0.81820000000,electric_stove,3,2045
+17,cook,all-week,early-peak,2035,all-year,R1,0.51520000000,electric_stove,3,2045
+18,cook,all-week,early-peak,2040,all-year,R1,0.81820000000,electric_stove,3,2045
+3,cook,all-week,early-peak,2035,all-year,R2,0.51520000000,electric_stove,3,2045
+4,cook,all-week,early-peak,2040,all-year,R2,0.81820000000,electric_stove,3,2045
+17,cook,all-week,early-peak,2035,all-year,R2,0.51520000000,electric_stove,3,2045
+18,cook,all-week,early-peak,2040,all-year,R2,0.81820000000,electric_stove,3,2045
+11,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045
+25,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045
+26,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045
+11,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045
+25,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045
+26,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045
+3,cook,all-week,late-peak,2035,all-year,R1,1.08180000000,electric_stove,4,2045
+4,cook,all-week,late-peak,2040,all-year,R1,1.71820000000,electric_stove,4,2045
+17,cook,all-week,late-peak,2035,all-year,R1,1.08180000000,electric_stove,4,2045
+18,cook,all-week,late-peak,2040,all-year,R1,1.71820000000,electric_stove,4,2045
+3,cook,all-week,late-peak,2035,all-year,R2,1.08180000000,electric_stove,4,2045
+4,cook,all-week,late-peak,2040,all-year,R2,1.71820000000,electric_stove,4,2045
+17,cook,all-week,late-peak,2035,all-year,R2,1.08180000000,electric_stove,4,2045
+18,cook,all-week,late-peak,2040,all-year,R2,1.71820000000,electric_stove,4,2045
+11,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045
+25,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045
+26,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045
+11,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045
+25,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045
+26,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045
+3,cook,all-week,evening,2035,all-year,R1,0.72120000000,electric_stove,5,2045
+4,cook,all-week,evening,2040,all-year,R1,1.14550000000,electric_stove,5,2045
+17,cook,all-week,evening,2035,all-year,R1,0.72120000000,electric_stove,5,2045
+18,cook,all-week,evening,2040,all-year,R1,1.14550000000,electric_stove,5,2045
+3,cook,all-week,evening,2035,all-year,R2,0.72120000000,electric_stove,5,2045
+4,cook,all-week,evening,2040,all-year,R2,1.14550000000,electric_stove,5,2045
+17,cook,all-week,evening,2035,all-year,R2,0.72120000000,electric_stove,5,2045
+18,cook,all-week,evening,2040,all-year,R2,1.14550000000,electric_stove,5,2045
+11,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045
+12,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045
+25,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045
+26,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045
+11,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045
+12,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045
+25,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045
+26,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045
+3,cook,all-week,early-morning,2035,all-year,R1,0.72120000000,electric_stove,6,2045
+4,cook,all-week,early-morning,2040,all-year,R1,1.14550000000,electric_stove,6,2045
+17,cook,all-week,early-morning,2035,all-year,R1,0.72120000000,electric_stove,6,2045
+18,cook,all-week,early-morning,2040,all-year,R1,1.14550000000,electric_stove,6,2045
+3,cook,all-week,early-morning,2035,all-year,R2,0.72120000000,electric_stove,6,2045
+4,cook,all-week,early-morning,2040,all-year,R2,1.14550000000,electric_stove,6,2045
+17,cook,all-week,early-morning,2035,all-year,R2,0.72120000000,electric_stove,6,2045
+18,cook,all-week,early-morning,2040,all-year,R2,1.14550000000,electric_stove,6,2045
+11,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045
+12,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045
+25,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045
+26,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045
+11,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045
+12,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045
+25,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045
+26,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045
+3,cook,all-week,late-afternoon,2035,all-year,R1,0.72120000000,electric_stove,7,2045
+4,cook,all-week,late-afternoon,2040,all-year,R1,1.14550000000,electric_stove,7,2045
+17,cook,all-week,late-afternoon,2035,all-year,R1,0.72120000000,electric_stove,7,2045
+18,cook,all-week,late-afternoon,2040,all-year,R1,1.14550000000,electric_stove,7,2045
+3,cook,all-week,late-afternoon,2035,all-year,R2,0.72120000000,electric_stove,7,2045
+4,cook,all-week,late-afternoon,2040,all-year,R2,1.14550000000,electric_stove,7,2045
+17,cook,all-week,late-afternoon,2035,all-year,R2,0.72120000000,electric_stove,7,2045
+18,cook,all-week,late-afternoon,2040,all-year,R2,1.14550000000,electric_stove,7,2045
+13,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050
+29,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050
+30,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050
+13,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050
+29,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050
+30,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050
+4,cook,all-week,night,2040,all-year,R1,0.56700000000,electric_stove,0,2050
+5,cook,all-week,night,2045,all-year,R1,0.48300000000,electric_stove,0,2050
+20,cook,all-week,night,2040,all-year,R1,0.56700000000,electric_stove,0,2050
+21,cook,all-week,night,2045,all-year,R1,0.48300000000,electric_stove,0,2050
+4,cook,all-week,night,2040,all-year,R2,0.56700000000,electric_stove,0,2050
+5,cook,all-week,night,2045,all-year,R2,0.48300000000,electric_stove,0,2050
+20,cook,all-week,night,2040,all-year,R2,0.56700000000,electric_stove,0,2050
+21,cook,all-week,night,2045,all-year,R2,0.48300000000,electric_stove,0,2050
+13,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050
+29,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050
+30,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050
+13,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050
+29,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050
+30,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050
+4,cook,all-week,morning,2040,all-year,R1,0.81000000000,electric_stove,1,2050
+5,cook,all-week,morning,2045,all-year,R1,0.69000000000,electric_stove,1,2050
+20,cook,all-week,morning,2040,all-year,R1,0.81000000000,electric_stove,1,2050
+21,cook,all-week,morning,2045,all-year,R1,0.69000000000,electric_stove,1,2050
+4,cook,all-week,morning,2040,all-year,R2,0.81000000000,electric_stove,1,2050
+5,cook,all-week,morning,2045,all-year,R2,0.69000000000,electric_stove,1,2050
+20,cook,all-week,morning,2040,all-year,R2,0.81000000000,electric_stove,1,2050
+21,cook,all-week,morning,2045,all-year,R2,0.69000000000,electric_stove,1,2050
+13,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050
+14,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050
+29,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050
+30,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050
+13,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050
+14,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050
+29,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050
+30,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050
+4,cook,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,electric_stove,2,2050
+5,cook,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,electric_stove,2,2050
+20,cook,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,electric_stove,2,2050
+21,cook,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,electric_stove,2,2050
+4,cook,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,electric_stove,2,2050
+5,cook,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,electric_stove,2,2050
+20,cook,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,electric_stove,2,2050
+21,cook,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,electric_stove,2,2050
+13,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050
+29,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050
+30,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050
+13,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050
+29,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050
+30,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050
+4,cook,all-week,early-peak,2040,all-year,R1,0.81000000000,electric_stove,3,2050
+5,cook,all-week,early-peak,2045,all-year,R1,0.69000000000,electric_stove,3,2050
+20,cook,all-week,early-peak,2040,all-year,R1,0.81000000000,electric_stove,3,2050
+21,cook,all-week,early-peak,2045,all-year,R1,0.69000000000,electric_stove,3,2050
+4,cook,all-week,early-peak,2040,all-year,R2,0.81000000000,electric_stove,3,2050
+5,cook,all-week,early-peak,2045,all-year,R2,0.69000000000,electric_stove,3,2050
+20,cook,all-week,early-peak,2040,all-year,R2,0.81000000000,electric_stove,3,2050
+21,cook,all-week,early-peak,2045,all-year,R2,0.69000000000,electric_stove,3,2050
+13,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050
+29,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050
+30,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050
+13,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050
+29,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050
+30,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050
+4,cook,all-week,late-peak,2040,all-year,R1,1.70100000000,electric_stove,4,2050
+5,cook,all-week,late-peak,2045,all-year,R1,1.44900000000,electric_stove,4,2050
+20,cook,all-week,late-peak,2040,all-year,R1,1.70100000000,electric_stove,4,2050
+21,cook,all-week,late-peak,2045,all-year,R1,1.44900000000,electric_stove,4,2050
+4,cook,all-week,late-peak,2040,all-year,R2,1.70100000000,electric_stove,4,2050
+5,cook,all-week,late-peak,2045,all-year,R2,1.44900000000,electric_stove,4,2050
+20,cook,all-week,late-peak,2040,all-year,R2,1.70100000000,electric_stove,4,2050
+21,cook,all-week,late-peak,2045,all-year,R2,1.44900000000,electric_stove,4,2050
+13,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050
+29,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050
+30,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050
+13,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050
+29,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050
+30,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050
+4,cook,all-week,evening,2040,all-year,R1,1.13400000000,electric_stove,5,2050
+5,cook,all-week,evening,2045,all-year,R1,0.96600000000,electric_stove,5,2050
+20,cook,all-week,evening,2040,all-year,R1,1.13400000000,electric_stove,5,2050
+21,cook,all-week,evening,2045,all-year,R1,0.96600000000,electric_stove,5,2050
+4,cook,all-week,evening,2040,all-year,R2,1.13400000000,electric_stove,5,2050
+5,cook,all-week,evening,2045,all-year,R2,0.96600000000,electric_stove,5,2050
+20,cook,all-week,evening,2040,all-year,R2,1.13400000000,electric_stove,5,2050
+21,cook,all-week,evening,2045,all-year,R2,0.96600000000,electric_stove,5,2050
+13,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050
+14,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050
+29,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050
+30,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050
+13,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050
+14,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050
+29,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050
+30,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050
+4,cook,all-week,early-morning,2040,all-year,R1,1.13400000000,electric_stove,6,2050
+5,cook,all-week,early-morning,2045,all-year,R1,0.96600000000,electric_stove,6,2050
+20,cook,all-week,early-morning,2040,all-year,R1,1.13400000000,electric_stove,6,2050
+21,cook,all-week,early-morning,2045,all-year,R1,0.96600000000,electric_stove,6,2050
+4,cook,all-week,early-morning,2040,all-year,R2,1.13400000000,electric_stove,6,2050
+5,cook,all-week,early-morning,2045,all-year,R2,0.96600000000,electric_stove,6,2050
+20,cook,all-week,early-morning,2040,all-year,R2,1.13400000000,electric_stove,6,2050
+21,cook,all-week,early-morning,2045,all-year,R2,0.96600000000,electric_stove,6,2050
+13,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050
+14,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050
+29,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050
+30,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050
+13,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050
+14,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050
+29,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050
+30,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050
+4,cook,all-week,late-afternoon,2040,all-year,R1,1.13400000000,electric_stove,7,2050
+5,cook,all-week,late-afternoon,2045,all-year,R1,0.96600000000,electric_stove,7,2050
+20,cook,all-week,late-afternoon,2040,all-year,R1,1.13400000000,electric_stove,7,2050
+21,cook,all-week,late-afternoon,2045,all-year,R1,0.96600000000,electric_stove,7,2050
+4,cook,all-week,late-afternoon,2040,all-year,R2,1.13400000000,electric_stove,7,2050
+5,cook,all-week,late-afternoon,2045,all-year,R2,0.96600000000,electric_stove,7,2050
+20,cook,all-week,late-afternoon,2040,all-year,R2,1.13400000000,electric_stove,7,2050
+21,cook,all-week,late-afternoon,2045,all-year,R2,0.96600000000,electric_stove,7,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 429eef7e0..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
-0,CO2f,R1,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R1,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R2,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,cook,R1,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R1,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R1,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R2,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,CO2f,R1,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R1,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R2,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,cook,R1,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R1,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R1,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R2,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
-2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,cook,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R1,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,CO2f,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,cook,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R1,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,CO2f,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,cook,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R1,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,CO2f,R1,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R1,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R2,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,cook,R1,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R1,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R1,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R2,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
-6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,CO2f,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,cook,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R1,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,cook,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R1,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
deleted file mode 100644
index c58d9cfac..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,321 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R1,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R1,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
-1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R1,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R1,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R1,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R1,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R1,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R1,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R1,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R1,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R1,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R1,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R1,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R1,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R1,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R1,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
deleted file mode 100644
index 06e46f151..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
-0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R1,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R1,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R1,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R1,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R1,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R1,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R1,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R1,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R1,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R1,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R1,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R1,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R1,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R1,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R1,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R1,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 777ad44dc..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
-0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R1,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R1,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R1,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R1,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R1,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R1,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R1,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R1,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R1,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R1,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R1,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R1,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R1,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R1,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R1,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R1,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 65c91ff45..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
-0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R1,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R1,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R1,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R1,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R1,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R1,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R1,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R1,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R1,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R1,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R1,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R1,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R1,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R1,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R1,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R1,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 870f9f86e..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
-0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R1,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R1,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R1,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R1,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R1,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R1,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R1,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R1,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
deleted file mode 100644
index ab3777083..000000000
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R1,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
-0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
-0,cook,R1,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
-0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
-0,cook,R2,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R1,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
-1,cook,R1,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
-1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
-1,cook,R2,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R1,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-2,cook,R1,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-2,cook,R2,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R1,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-3,cook,R1,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-3,cook,R2,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R1,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-4,cook,R1,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-4,cook,R2,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R1,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
-5,cook,R1,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
-5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
-5,cook,R2,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R1,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-6,cook,R1,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-6,cook,R2,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R1,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-7,cook,R1,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-7,cook,R2,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index 95082ec6d..c6580ca28 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..fd4ccf63c
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity.csv
@@ -0,0 +1,20 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,15.39710000000,2020,R1,gassupply1,2025
+0,7.89710000000,2020,R1,gassupply1,2030
+1,5.10950000000,2025,R1,gassupply1,2030
+0,0.39710000000,2020,R1,gassupply1,2035
+1,5.10950000000,2025,R1,gassupply1,2035
+2,6.35960000000,2030,R1,gassupply1,2035
+0,0.39710000000,2020,R1,gassupply1,2040
+1,5.10950000000,2025,R1,gassupply1,2040
+2,6.35960000000,2030,R1,gassupply1,2040
+3,0.32400000000,2035,R1,gassupply1,2040
+0,0.39710000000,2020,R1,gassupply1,2045
+1,5.10950000000,2025,R1,gassupply1,2045
+2,6.35960000000,2030,R1,gassupply1,2045
+3,0.32400000000,2035,R1,gassupply1,2045
+0,0.39710000000,2020,R1,gassupply1,2050
+1,5.10950000000,2025,R1,gassupply1,2050
+2,6.35960000000,2030,R1,gassupply1,2050
+3,0.32400000000,2035,R1,gassupply1,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 292755468..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 066741d45..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
-1,2030,R1,gassupply1,2025,5.10950000000
-1,2035,R1,gassupply1,2025,5.10950000000
-1,2040,R1,gassupply1,2025,5.10950000000
-1,2045,R1,gassupply1,2025,5.10950000000
-1,2050,R1,gassupply1,2025,5.10950000000
-1,2059,R1,gassupply1,2025,5.10950000000
-1,2060,R1,gassupply1,2025,5.10950000000
-1,2064,R1,gassupply1,2025,5.10950000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 6ef498014..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
-1,2030,R1,gassupply1,2025,5.10950000000
-1,2035,R1,gassupply1,2025,5.10950000000
-1,2040,R1,gassupply1,2025,5.10950000000
-1,2045,R1,gassupply1,2025,5.10950000000
-1,2050,R1,gassupply1,2025,5.10950000000
-1,2059,R1,gassupply1,2025,5.10950000000
-1,2060,R1,gassupply1,2025,5.10950000000
-1,2064,R1,gassupply1,2025,5.10950000000
-2,2035,R1,gassupply1,2030,6.35960000000
-2,2040,R1,gassupply1,2030,6.35960000000
-2,2045,R1,gassupply1,2030,6.35960000000
-2,2050,R1,gassupply1,2030,6.35960000000
-2,2059,R1,gassupply1,2030,6.35960000000
-2,2060,R1,gassupply1,2030,6.35960000000
-2,2064,R1,gassupply1,2030,6.35960000000
-2,2065,R1,gassupply1,2030,6.35960000000
-2,2069,R1,gassupply1,2030,6.35960000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 1dff80016..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
-1,2030,R1,gassupply1,2025,5.10950000000
-1,2035,R1,gassupply1,2025,5.10950000000
-1,2040,R1,gassupply1,2025,5.10950000000
-1,2045,R1,gassupply1,2025,5.10950000000
-1,2050,R1,gassupply1,2025,5.10950000000
-1,2059,R1,gassupply1,2025,5.10950000000
-1,2060,R1,gassupply1,2025,5.10950000000
-1,2064,R1,gassupply1,2025,5.10950000000
-2,2035,R1,gassupply1,2030,6.35960000000
-2,2040,R1,gassupply1,2030,6.35960000000
-2,2045,R1,gassupply1,2030,6.35960000000
-2,2050,R1,gassupply1,2030,6.35960000000
-2,2059,R1,gassupply1,2030,6.35960000000
-2,2060,R1,gassupply1,2030,6.35960000000
-2,2064,R1,gassupply1,2030,6.35960000000
-2,2065,R1,gassupply1,2030,6.35960000000
-2,2069,R1,gassupply1,2030,6.35960000000
-3,2040,R1,gassupply1,2035,0.32400000000
-3,2045,R1,gassupply1,2035,0.32400000000
-3,2050,R1,gassupply1,2035,0.32400000000
-3,2059,R1,gassupply1,2035,0.32400000000
-3,2060,R1,gassupply1,2035,0.32400000000
-3,2064,R1,gassupply1,2035,0.32400000000
-3,2065,R1,gassupply1,2035,0.32400000000
-3,2069,R1,gassupply1,2035,0.32400000000
-3,2070,R1,gassupply1,2035,0.32400000000
-3,2074,R1,gassupply1,2035,0.32400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 1dff80016..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
-1,2030,R1,gassupply1,2025,5.10950000000
-1,2035,R1,gassupply1,2025,5.10950000000
-1,2040,R1,gassupply1,2025,5.10950000000
-1,2045,R1,gassupply1,2025,5.10950000000
-1,2050,R1,gassupply1,2025,5.10950000000
-1,2059,R1,gassupply1,2025,5.10950000000
-1,2060,R1,gassupply1,2025,5.10950000000
-1,2064,R1,gassupply1,2025,5.10950000000
-2,2035,R1,gassupply1,2030,6.35960000000
-2,2040,R1,gassupply1,2030,6.35960000000
-2,2045,R1,gassupply1,2030,6.35960000000
-2,2050,R1,gassupply1,2030,6.35960000000
-2,2059,R1,gassupply1,2030,6.35960000000
-2,2060,R1,gassupply1,2030,6.35960000000
-2,2064,R1,gassupply1,2030,6.35960000000
-2,2065,R1,gassupply1,2030,6.35960000000
-2,2069,R1,gassupply1,2030,6.35960000000
-3,2040,R1,gassupply1,2035,0.32400000000
-3,2045,R1,gassupply1,2035,0.32400000000
-3,2050,R1,gassupply1,2035,0.32400000000
-3,2059,R1,gassupply1,2035,0.32400000000
-3,2060,R1,gassupply1,2035,0.32400000000
-3,2064,R1,gassupply1,2035,0.32400000000
-3,2065,R1,gassupply1,2035,0.32400000000
-3,2069,R1,gassupply1,2035,0.32400000000
-3,2070,R1,gassupply1,2035,0.32400000000
-3,2074,R1,gassupply1,2035,0.32400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 1dff80016..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
-1,2030,R1,gassupply1,2025,5.10950000000
-1,2035,R1,gassupply1,2025,5.10950000000
-1,2040,R1,gassupply1,2025,5.10950000000
-1,2045,R1,gassupply1,2025,5.10950000000
-1,2050,R1,gassupply1,2025,5.10950000000
-1,2059,R1,gassupply1,2025,5.10950000000
-1,2060,R1,gassupply1,2025,5.10950000000
-1,2064,R1,gassupply1,2025,5.10950000000
-2,2035,R1,gassupply1,2030,6.35960000000
-2,2040,R1,gassupply1,2030,6.35960000000
-2,2045,R1,gassupply1,2030,6.35960000000
-2,2050,R1,gassupply1,2030,6.35960000000
-2,2059,R1,gassupply1,2030,6.35960000000
-2,2060,R1,gassupply1,2030,6.35960000000
-2,2064,R1,gassupply1,2030,6.35960000000
-2,2065,R1,gassupply1,2030,6.35960000000
-2,2069,R1,gassupply1,2030,6.35960000000
-3,2040,R1,gassupply1,2035,0.32400000000
-3,2045,R1,gassupply1,2035,0.32400000000
-3,2050,R1,gassupply1,2035,0.32400000000
-3,2059,R1,gassupply1,2035,0.32400000000
-3,2060,R1,gassupply1,2035,0.32400000000
-3,2064,R1,gassupply1,2035,0.32400000000
-3,2065,R1,gassupply1,2035,0.32400000000
-3,2069,R1,gassupply1,2035,0.32400000000
-3,2070,R1,gassupply1,2035,0.32400000000
-3,2074,R1,gassupply1,2035,0.32400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 1dff80016..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.39710000000
-0,2030,R1,gassupply1,2020,7.89710000000
-0,2035,R1,gassupply1,2020,0.39710000000
-0,2040,R1,gassupply1,2020,0.39710000000
-0,2045,R1,gassupply1,2020,0.39710000000
-0,2050,R1,gassupply1,2020,0.39710000000
-0,2059,R1,gassupply1,2020,0.39710000000
-1,2030,R1,gassupply1,2025,5.10950000000
-1,2035,R1,gassupply1,2025,5.10950000000
-1,2040,R1,gassupply1,2025,5.10950000000
-1,2045,R1,gassupply1,2025,5.10950000000
-1,2050,R1,gassupply1,2025,5.10950000000
-1,2059,R1,gassupply1,2025,5.10950000000
-1,2060,R1,gassupply1,2025,5.10950000000
-1,2064,R1,gassupply1,2025,5.10950000000
-2,2035,R1,gassupply1,2030,6.35960000000
-2,2040,R1,gassupply1,2030,6.35960000000
-2,2045,R1,gassupply1,2030,6.35960000000
-2,2050,R1,gassupply1,2030,6.35960000000
-2,2059,R1,gassupply1,2030,6.35960000000
-2,2060,R1,gassupply1,2030,6.35960000000
-2,2064,R1,gassupply1,2030,6.35960000000
-2,2065,R1,gassupply1,2030,6.35960000000
-2,2069,R1,gassupply1,2030,6.35960000000
-3,2040,R1,gassupply1,2035,0.32400000000
-3,2045,R1,gassupply1,2035,0.32400000000
-3,2050,R1,gassupply1,2035,0.32400000000
-3,2059,R1,gassupply1,2035,0.32400000000
-3,2060,R1,gassupply1,2035,0.32400000000
-3,2064,R1,gassupply1,2035,0.32400000000
-3,2065,R1,gassupply1,2035,0.32400000000
-3,2069,R1,gassupply1,2035,0.32400000000
-3,2070,R1,gassupply1,2035,0.32400000000
-3,2074,R1,gassupply1,2035,0.32400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity.csv
new file mode 100644
index 000000000..533832f7f
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity.csv
@@ -0,0 +1,19 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,5,2020,R1,gasCCGT,2025
+0,4,2020,R1,gasCCGT,2030
+1,3,2025,R1,gasCCGT,2030
+0,4,2020,R1,gasCCGT,2035
+1,3,2025,R1,gasCCGT,2035
+2,2,2030,R1,windturbine,2035
+0,4,2020,R1,gasCCGT,2040
+1,3,2025,R1,gasCCGT,2040
+2,2,2030,R1,windturbine,2040
+0,4,2020,R1,gasCCGT,2045
+1,3,2025,R1,gasCCGT,2045
+2,2,2030,R1,windturbine,2045
+4,1,2040,R1,windturbine,2045
+0,4,2020,R1,gasCCGT,2050
+1,3,2025,R1,gasCCGT,2050
+2,2,2030,R1,windturbine,2050
+4,1,2040,R1,windturbine,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 56e18bbde..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 88f1fab6c..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 40480d357..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-2,2035,R1,windturbine,2030,2
-2,2040,R1,windturbine,2030,2
-2,2045,R1,windturbine,2030,2
-2,2050,R1,windturbine,2030,2
-2,2059,R1,windturbine,2030,2
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 40480d357..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-2,2035,R1,windturbine,2030,2
-2,2040,R1,windturbine,2030,2
-2,2045,R1,windturbine,2030,2
-2,2050,R1,windturbine,2030,2
-2,2059,R1,windturbine,2030,2
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 72462f6d1..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-2,2035,R1,windturbine,2030,2
-2,2040,R1,windturbine,2030,2
-2,2045,R1,windturbine,2030,2
-2,2050,R1,windturbine,2030,2
-2,2059,R1,windturbine,2030,2
-4,2045,R1,windturbine,2040,1
-4,2050,R1,windturbine,2040,1
-4,2059,R1,windturbine,2040,1
-4,2060,R1,windturbine,2040,1
-4,2064,R1,windturbine,2040,1
-4,2065,R1,windturbine,2040,1
-4,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 72462f6d1..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-2,2035,R1,windturbine,2030,2
-2,2040,R1,windturbine,2030,2
-2,2045,R1,windturbine,2030,2
-2,2050,R1,windturbine,2030,2
-2,2059,R1,windturbine,2030,2
-4,2045,R1,windturbine,2040,1
-4,2050,R1,windturbine,2040,1
-4,2059,R1,windturbine,2040,1
-4,2060,R1,windturbine,2040,1
-4,2064,R1,windturbine,2040,1
-4,2065,R1,windturbine,2040,1
-4,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
deleted file mode 100644
index a07c6d245..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,5
-0,2030,R1,gasCCGT,2020,4
-0,2035,R1,gasCCGT,2020,4
-0,2040,R1,gasCCGT,2020,4
-0,2045,R1,gasCCGT,2020,4
-0,2050,R1,gasCCGT,2020,4
-0,2055,R1,gasCCGT,2020,4
-0,2059,R1,gasCCGT,2020,4
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2055,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-2,2035,R1,windturbine,2030,2
-2,2040,R1,windturbine,2030,2
-2,2045,R1,windturbine,2030,2
-2,2050,R1,windturbine,2030,2
-2,2055,R1,windturbine,2030,2
-2,2059,R1,windturbine,2030,2
-4,2045,R1,windturbine,2040,1
-4,2050,R1,windturbine,2040,1
-4,2055,R1,windturbine,2040,1
-4,2059,R1,windturbine,2040,1
-4,2060,R1,windturbine,2040,1
-4,2064,R1,windturbine,2040,1
-4,2065,R1,windturbine,2040,1
-4,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..90403d4bd
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,11,2020,R1,heatpump,2025
+1,11,2020,R1,heatpump,2030
+2,6,2025,R1,heatpump,2030
+2,6,2025,R1,heatpump,2035
+3,12,2030,R1,heatpump,2035
+3,12,2030,R1,heatpump,2040
+4,6,2035,R1,heatpump,2040
+4,6,2035,R1,heatpump,2045
+5,12,2040,R1,heatpump,2045
+5,12,2040,R1,heatpump,2050
+6,7,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 618651d39..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 6143c0a9d..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
-2,2030,R1,heatpump,2025,6
-2,2034,R1,heatpump,2025,6
-2,2035,R1,heatpump,2025,6
-2,2039,R1,heatpump,2025,6
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 15a30e922..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
-2,2030,R1,heatpump,2025,6
-2,2034,R1,heatpump,2025,6
-2,2035,R1,heatpump,2025,6
-2,2039,R1,heatpump,2025,6
-3,2035,R1,heatpump,2030,12
-3,2039,R1,heatpump,2030,12
-3,2040,R1,heatpump,2030,12
-3,2044,R1,heatpump,2030,12
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index e7fabd4ed..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
-2,2030,R1,heatpump,2025,6
-2,2034,R1,heatpump,2025,6
-2,2035,R1,heatpump,2025,6
-2,2039,R1,heatpump,2025,6
-3,2035,R1,heatpump,2030,12
-3,2039,R1,heatpump,2030,12
-3,2040,R1,heatpump,2030,12
-3,2044,R1,heatpump,2030,12
-4,2040,R1,heatpump,2035,6
-4,2044,R1,heatpump,2035,6
-4,2045,R1,heatpump,2035,6
-4,2049,R1,heatpump,2035,6
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 634266c23..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
-2,2030,R1,heatpump,2025,6
-2,2034,R1,heatpump,2025,6
-2,2035,R1,heatpump,2025,6
-2,2039,R1,heatpump,2025,6
-3,2035,R1,heatpump,2030,12
-3,2039,R1,heatpump,2030,12
-3,2040,R1,heatpump,2030,12
-3,2044,R1,heatpump,2030,12
-4,2040,R1,heatpump,2035,6
-4,2044,R1,heatpump,2035,6
-4,2045,R1,heatpump,2035,6
-4,2049,R1,heatpump,2035,6
-5,2045,R1,heatpump,2040,12
-5,2049,R1,heatpump,2040,12
-5,2050,R1,heatpump,2040,12
-5,2054,R1,heatpump,2040,12
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 819c5004a..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
-2,2030,R1,heatpump,2025,6
-2,2034,R1,heatpump,2025,6
-2,2035,R1,heatpump,2025,6
-2,2039,R1,heatpump,2025,6
-3,2035,R1,heatpump,2030,12
-3,2039,R1,heatpump,2030,12
-3,2040,R1,heatpump,2030,12
-3,2044,R1,heatpump,2030,12
-4,2040,R1,heatpump,2035,6
-4,2044,R1,heatpump,2035,6
-4,2045,R1,heatpump,2035,6
-4,2049,R1,heatpump,2035,6
-5,2045,R1,heatpump,2040,12
-5,2049,R1,heatpump,2040,12
-5,2050,R1,heatpump,2040,12
-5,2054,R1,heatpump,2040,12
-6,2050,R1,heatpump,2045,7
-6,2054,R1,heatpump,2045,7
-6,2055,R1,heatpump,2045,7
-6,2059,R1,heatpump,2045,7
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 0d6f253d1..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,11
-1,2030,R1,heatpump,2020,11
-1,2034,R1,heatpump,2020,11
-2,2030,R1,heatpump,2025,6
-2,2034,R1,heatpump,2025,6
-2,2035,R1,heatpump,2025,6
-2,2039,R1,heatpump,2025,6
-3,2035,R1,heatpump,2030,12
-3,2039,R1,heatpump,2030,12
-3,2040,R1,heatpump,2030,12
-3,2044,R1,heatpump,2030,12
-4,2040,R1,heatpump,2035,6
-4,2044,R1,heatpump,2035,6
-4,2045,R1,heatpump,2035,6
-4,2049,R1,heatpump,2035,6
-5,2045,R1,heatpump,2040,12
-5,2049,R1,heatpump,2040,12
-5,2050,R1,heatpump,2040,12
-5,2054,R1,heatpump,2040,12
-6,2050,R1,heatpump,2045,7
-6,2054,R1,heatpump,2045,7
-6,2055,R1,heatpump,2045,7
-6,2059,R1,heatpump,2045,7
-7,2055,R1,heatpump,2050,12
-7,2059,R1,heatpump,2050,12
-7,2060,R1,heatpump,2050,12
-7,2064,R1,heatpump,2050,12
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply.csv
new file mode 100644
index 000000000..cb0ae306e
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,0.89580000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,57.96670000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.35000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,87.35830000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,0.89580000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,57.96670000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.35000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,87.35830000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,2.70000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,174.71660000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,1.80420000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,116.74990000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.29140000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,0.64110000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,18.85620000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.43910000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,0.96610000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,28.41710000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.29140000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,0.64110000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,18.85620000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.43910000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,0.96610000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,28.41710000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.87830000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,1.93220000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,56.83430000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.58690000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,1.29120000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,37.97810000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,0.62700000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.34200000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,0.94490000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.51540000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,0.62700000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.34200000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,0.94490000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.51540000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,1.88980000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.03080000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,1.26280000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,0.68880000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.33210000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,0.66420000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.50050000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,1.00100000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.33210000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,0.66420000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.50050000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,1.00100000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.00100000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,2.00190000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,0.66890000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,1.33780000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,0.68230000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.34120000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,1.02830000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,0.51420000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,0.68230000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.34120000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,1.02830000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,0.51420000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,2.05660000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,1.02830000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,1.37430000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,0.68710000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.34700000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,0.69400000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,0.52300000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,1.04590000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.34700000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,0.69400000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,0.52300000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,1.04590000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,1.04590000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,2.09180000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,0.69890000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,1.39780000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,0.66850000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,0.39000000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,1.00750000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,0.58770000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,0.66850000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,0.39000000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,1.00750000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,0.58770000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,2.01500000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,1.17540000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,1.34650000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,0.78540000000,heatpump,5,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 64722c814..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,0.89580000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.29140000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,57.96670000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,18.85620000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.35000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,87.35830000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.89580000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,57.96670000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.35000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,87.35830000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.70000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,174.71660000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,1.80420000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,116.74990000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 0a3b05523..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.29140000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,18.85620000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
deleted file mode 100644
index c25627728..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 7198819b2..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 4e6318ce1..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 07f99b3c6..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
deleted file mode 100644
index c4b1a75d3..000000000
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,0.39260000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,0.67300000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,0.59160000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,1.01420000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39260000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,0.67300000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,0.59160000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,1.01420000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,1.18330000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,2.02850000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,0.79070000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,1.35550000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index b8eef2fdf..f7dcccce2 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..43fc9244a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity.csv
@@ -0,0 +1,8 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,15.42960000000,2020,R1,gassupply1,2025
+0,7.92960000000,2020,R1,gassupply1,2030
+0,0.42960000000,2020,R1,gassupply1,2035
+0,0.42960000000,2020,R1,gassupply1,2040
+0,0.42960000000,2020,R1,gassupply1,2045
+0,0.42960000000,2020,R1,gassupply1,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 33bbbed35..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.42960000000
-0,2030,R1,gassupply1,2020,7.92960000000
-0,2035,R1,gassupply1,2020,0.42960000000
-0,2040,R1,gassupply1,2020,0.42960000000
-0,2045,R1,gassupply1,2020,0.42960000000
-0,2050,R1,gassupply1,2020,0.42960000000
-0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity.csv
new file mode 100644
index 000000000..48c981a8d
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity.csv
@@ -0,0 +1,23 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,1,2020,R1,gasCCGT,2025
+1,1,2020,R1,windturbine,2025
+1,1,2020,R1,windturbine,2030
+2,1,2025,R1,windturbine,2030
+1,1,2020,R1,windturbine,2035
+2,1,2025,R1,windturbine,2035
+3,2,2030,R1,windturbine,2035
+1,1,2020,R1,windturbine,2040
+2,1,2025,R1,windturbine,2040
+3,2,2030,R1,windturbine,2040
+4,2,2035,R1,windturbine,2040
+1,1,2020,R1,windturbine,2045
+2,1,2025,R1,windturbine,2045
+3,2,2030,R1,windturbine,2045
+4,2,2035,R1,windturbine,2045
+5,2,2040,R1,windturbine,2045
+2,1,2025,R1,windturbine,2050
+3,2,2030,R1,windturbine,2050
+4,2,2035,R1,windturbine,2050
+5,2,2040,R1,windturbine,2050
+6,2,2045,R1,windturbine,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 1cdc9617a..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
deleted file mode 100644
index cec6493c1..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 828f0a6cd..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 292616515..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 0eef7b5d9..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
deleted file mode 100644
index e9d250de6..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
-6,2050,R1,windturbine,2045,2
-6,2054,R1,windturbine,2045,2
-6,2055,R1,windturbine,2045,2
-6,2059,R1,windturbine,2045,2
-6,2060,R1,windturbine,2045,2
-6,2064,R1,windturbine,2045,2
-6,2065,R1,windturbine,2045,2
-6,2069,R1,windturbine,2045,2
-6,2070,R1,windturbine,2045,2
-6,2074,R1,windturbine,2045,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 3105095e1..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,63 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
-6,2050,R1,windturbine,2045,2
-6,2054,R1,windturbine,2045,2
-6,2055,R1,windturbine,2045,2
-6,2059,R1,windturbine,2045,2
-6,2060,R1,windturbine,2045,2
-6,2064,R1,windturbine,2045,2
-6,2065,R1,windturbine,2045,2
-6,2069,R1,windturbine,2045,2
-6,2070,R1,windturbine,2045,2
-6,2074,R1,windturbine,2045,2
-7,2055,R1,windturbine,2050,2
-7,2059,R1,windturbine,2050,2
-7,2060,R1,windturbine,2050,2
-7,2064,R1,windturbine,2050,2
-7,2065,R1,windturbine,2050,2
-7,2069,R1,windturbine,2050,2
-7,2070,R1,windturbine,2050,2
-7,2074,R1,windturbine,2050,2
-7,2075,R1,windturbine,2050,2
-7,2079,R1,windturbine,2050,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv
new file mode 100644
index 000000000..6dd1abdec
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv
@@ -0,0 +1,143 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020
+0,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020
+0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020
+0,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020
+0,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020
+0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020
+0,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2025
+1,electricity,all-week,night,2020,all-year,R1,0.22220000000,windturbine,0,2025
+0,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2025
+1,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2025
+0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025
+0,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2025
+1,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2025
+0,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2025
+1,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2025
+0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025
+1,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030
+2,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030
+1,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030
+2,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030
+1,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030
+2,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030
+1,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030
+2,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030
+1,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030
+2,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030
+1,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030
+2,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030
+1,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035
+2,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035
+3,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035
+1,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035
+2,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035
+3,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035
+1,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035
+2,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035
+3,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035
+1,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035
+2,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035
+3,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035
+1,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035
+2,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035
+3,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035
+1,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035
+2,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035
+3,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035
+1,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040
+2,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040
+3,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040
+4,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040
+1,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040
+2,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040
+3,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040
+4,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040
+1,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040
+2,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040
+3,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040
+4,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040
+1,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040
+2,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040
+3,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040
+4,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040
+1,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040
+2,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040
+3,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040
+4,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040
+1,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040
+2,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040
+3,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040
+4,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040
+1,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045
+2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045
+3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045
+4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045
+5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045
+1,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045
+2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045
+3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045
+4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045
+5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045
+1,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045
+2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045
+3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045
+4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045
+5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045
+1,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045
+2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045
+3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045
+4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045
+5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045
+1,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045
+2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045
+3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045
+4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045
+5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045
+1,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045
+2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045
+3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045
+4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045
+5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045
+2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050
+3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050
+4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050
+5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050
+6,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050
+2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050
+3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050
+4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050
+5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050
+6,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050
+2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050
+3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050
+4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050
+5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050
+6,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050
+2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050
+3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050
+4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050
+5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050
+6,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050
+2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050
+3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050
+4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050
+5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050
+6,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050
+2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050
+3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050
+4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050
+5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050
+6,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
deleted file mode 100644
index aa3821f8d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,0,2020,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-0,0,2020,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
-1,0,2020,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-1,0,2020,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-2,0,2020,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-2,0,2020,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-3,0,2020,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-3,0,2020,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-4,0,2020,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-4,0,2020,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-5,0,2020,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-5,0,2020,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
deleted file mode 100644
index 03bd216bb..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
deleted file mode 100644
index 4a52d7f1d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
deleted file mode 100644
index def4be3b7..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
deleted file mode 100644
index f5d07646e..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
deleted file mode 100644
index dce17b90d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
deleted file mode 100644
index df173a2f6..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..d5cf558f0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index d6edd96cb..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 677048eca..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 95b724d9d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 33e9c12a5..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 21be03137..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index d02c2c7f1..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 8c8e12067..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply.csv
new file mode 100644
index 000000000..520869501
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 729d406d6..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
deleted file mode 100644
index afe86e122..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 83daf7f18..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 7bda24630..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
deleted file mode 100644
index c535c6798..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 9abfcded8..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 945f522bd..e8299741f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -66,15 +66,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -95,15 +93,13 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.drop = ["comm_usage", "units_prices"]
 
@@ -122,10 +118,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity.csv
new file mode 100644
index 000000000..2e9b0ada4
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity.csv
@@ -0,0 +1,8 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,20.54670000000,2020,R1,gassupply1,2025
+0,13.04670000000,2020,R1,gassupply1,2030
+0,5.54670000000,2020,R1,gassupply1,2035
+0,5.54670000000,2020,R1,gassupply1,2040
+0,5.54670000000,2020,R1,gassupply1,2045
+0,5.54670000000,2020,R1,gassupply1,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index bb34a24d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,20.54670000000
-0,2030,R1,gassupply1,2020,13.04670000000
-0,2035,R1,gassupply1,2020,5.54670000000
-0,2040,R1,gassupply1,2020,5.54670000000
-0,2045,R1,gassupply1,2020,5.54670000000
-0,2050,R1,gassupply1,2020,5.54670000000
-0,2059,R1,gassupply1,2020,5.54670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity.csv
new file mode 100644
index 000000000..f7ca7b390
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity.csv
@@ -0,0 +1,18 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,1,2020,R1,gasCCGT,2025
+4,1,2025,R1,windturbine,2030
+5,1,2025,R1,windturbine,2035
+6,1,2030,R1,windturbine,2035
+6,1,2025,R1,windturbine,2040
+7,1,2030,R1,windturbine,2040
+8,1,2035,R1,windturbine,2040
+7,1,2025,R1,windturbine,2045
+8,1,2030,R1,windturbine,2045
+9,1,2035,R1,windturbine,2045
+10,2,2040,R1,windturbine,2045
+8,1,2025,R1,windturbine,2050
+9,1,2030,R1,windturbine,2050
+10,1,2035,R1,windturbine,2050
+11,2,2040,R1,windturbine,2050
+12,2,2045,R1,windturbine,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
deleted file mode 100644
index c4df69fe1..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 124d57007..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-3,2030,R1,windturbine,2025,1
-3,2035,R1,windturbine,2025,1
-3,2040,R1,windturbine,2025,1
-3,2045,R1,windturbine,2025,1
-3,2049,R1,windturbine,2025,1
-3,2050,R1,windturbine,2025,1
-3,2054,R1,windturbine,2025,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 2fb46add7..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-4,2030,R1,windturbine,2025,1
-4,2035,R1,windturbine,2025,1
-4,2040,R1,windturbine,2025,1
-4,2045,R1,windturbine,2025,1
-4,2049,R1,windturbine,2025,1
-4,2050,R1,windturbine,2025,1
-4,2054,R1,windturbine,2025,1
-5,2035,R1,windturbine,2030,1
-5,2040,R1,windturbine,2030,1
-5,2045,R1,windturbine,2030,1
-5,2049,R1,windturbine,2030,1
-5,2050,R1,windturbine,2030,1
-5,2054,R1,windturbine,2030,1
-5,2055,R1,windturbine,2030,1
-5,2059,R1,windturbine,2030,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
deleted file mode 100644
index ff9768e71..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-5,2030,R1,windturbine,2025,1
-5,2035,R1,windturbine,2025,1
-5,2040,R1,windturbine,2025,1
-5,2045,R1,windturbine,2025,1
-5,2049,R1,windturbine,2025,1
-5,2050,R1,windturbine,2025,1
-5,2054,R1,windturbine,2025,1
-6,2035,R1,windturbine,2030,1
-6,2040,R1,windturbine,2030,1
-6,2045,R1,windturbine,2030,1
-6,2049,R1,windturbine,2030,1
-6,2050,R1,windturbine,2030,1
-6,2054,R1,windturbine,2030,1
-6,2055,R1,windturbine,2030,1
-6,2059,R1,windturbine,2030,1
-7,2040,R1,windturbine,2035,1
-7,2045,R1,windturbine,2035,1
-7,2049,R1,windturbine,2035,1
-7,2050,R1,windturbine,2035,1
-7,2054,R1,windturbine,2035,1
-7,2055,R1,windturbine,2035,1
-7,2059,R1,windturbine,2035,1
-7,2060,R1,windturbine,2035,1
-7,2064,R1,windturbine,2035,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
deleted file mode 100644
index aeb13e4de..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-6,2030,R1,windturbine,2025,1
-6,2035,R1,windturbine,2025,1
-6,2040,R1,windturbine,2025,1
-6,2045,R1,windturbine,2025,1
-6,2049,R1,windturbine,2025,1
-6,2050,R1,windturbine,2025,1
-6,2054,R1,windturbine,2025,1
-7,2035,R1,windturbine,2030,1
-7,2040,R1,windturbine,2030,1
-7,2045,R1,windturbine,2030,1
-7,2049,R1,windturbine,2030,1
-7,2050,R1,windturbine,2030,1
-7,2054,R1,windturbine,2030,1
-7,2055,R1,windturbine,2030,1
-7,2059,R1,windturbine,2030,1
-8,2040,R1,windturbine,2035,1
-8,2045,R1,windturbine,2035,1
-8,2049,R1,windturbine,2035,1
-8,2050,R1,windturbine,2035,1
-8,2054,R1,windturbine,2035,1
-8,2055,R1,windturbine,2035,1
-8,2059,R1,windturbine,2035,1
-8,2060,R1,windturbine,2035,1
-8,2064,R1,windturbine,2035,1
-9,2045,R1,windturbine,2040,2
-9,2049,R1,windturbine,2040,2
-9,2050,R1,windturbine,2040,2
-9,2054,R1,windturbine,2040,2
-9,2055,R1,windturbine,2040,2
-9,2059,R1,windturbine,2040,2
-9,2060,R1,windturbine,2040,2
-9,2064,R1,windturbine,2040,2
-9,2065,R1,windturbine,2040,2
-9,2069,R1,windturbine,2040,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 4bae2ba10..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,47 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-7,2030,R1,windturbine,2025,1
-7,2035,R1,windturbine,2025,1
-7,2040,R1,windturbine,2025,1
-7,2045,R1,windturbine,2025,1
-7,2049,R1,windturbine,2025,1
-7,2050,R1,windturbine,2025,1
-7,2054,R1,windturbine,2025,1
-8,2035,R1,windturbine,2030,1
-8,2040,R1,windturbine,2030,1
-8,2045,R1,windturbine,2030,1
-8,2049,R1,windturbine,2030,1
-8,2050,R1,windturbine,2030,1
-8,2054,R1,windturbine,2030,1
-8,2055,R1,windturbine,2030,1
-8,2059,R1,windturbine,2030,1
-9,2040,R1,windturbine,2035,1
-9,2045,R1,windturbine,2035,1
-9,2049,R1,windturbine,2035,1
-9,2050,R1,windturbine,2035,1
-9,2054,R1,windturbine,2035,1
-9,2055,R1,windturbine,2035,1
-9,2059,R1,windturbine,2035,1
-9,2060,R1,windturbine,2035,1
-9,2064,R1,windturbine,2035,1
-10,2045,R1,windturbine,2040,2
-10,2049,R1,windturbine,2040,2
-10,2050,R1,windturbine,2040,2
-10,2054,R1,windturbine,2040,2
-10,2055,R1,windturbine,2040,2
-10,2059,R1,windturbine,2040,2
-10,2060,R1,windturbine,2040,2
-10,2064,R1,windturbine,2040,2
-10,2065,R1,windturbine,2040,2
-10,2069,R1,windturbine,2040,2
-11,2050,R1,windturbine,2045,2
-11,2054,R1,windturbine,2045,2
-11,2055,R1,windturbine,2045,2
-11,2059,R1,windturbine,2045,2
-11,2060,R1,windturbine,2045,2
-11,2064,R1,windturbine,2045,2
-11,2065,R1,windturbine,2045,2
-11,2069,R1,windturbine,2045,2
-11,2070,R1,windturbine,2045,2
-11,2074,R1,windturbine,2045,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 33008623a..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,57 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-8,2030,R1,windturbine,2025,1
-8,2035,R1,windturbine,2025,1
-8,2040,R1,windturbine,2025,1
-8,2045,R1,windturbine,2025,1
-8,2049,R1,windturbine,2025,1
-8,2050,R1,windturbine,2025,1
-8,2054,R1,windturbine,2025,1
-9,2035,R1,windturbine,2030,1
-9,2040,R1,windturbine,2030,1
-9,2045,R1,windturbine,2030,1
-9,2049,R1,windturbine,2030,1
-9,2050,R1,windturbine,2030,1
-9,2054,R1,windturbine,2030,1
-9,2055,R1,windturbine,2030,1
-9,2059,R1,windturbine,2030,1
-10,2040,R1,windturbine,2035,1
-10,2045,R1,windturbine,2035,1
-10,2049,R1,windturbine,2035,1
-10,2050,R1,windturbine,2035,1
-10,2054,R1,windturbine,2035,1
-10,2055,R1,windturbine,2035,1
-10,2059,R1,windturbine,2035,1
-10,2060,R1,windturbine,2035,1
-10,2064,R1,windturbine,2035,1
-11,2045,R1,windturbine,2040,2
-11,2049,R1,windturbine,2040,2
-11,2050,R1,windturbine,2040,2
-11,2054,R1,windturbine,2040,2
-11,2055,R1,windturbine,2040,2
-11,2059,R1,windturbine,2040,2
-11,2060,R1,windturbine,2040,2
-11,2064,R1,windturbine,2040,2
-11,2065,R1,windturbine,2040,2
-11,2069,R1,windturbine,2040,2
-12,2050,R1,windturbine,2045,2
-12,2054,R1,windturbine,2045,2
-12,2055,R1,windturbine,2045,2
-12,2059,R1,windturbine,2045,2
-12,2060,R1,windturbine,2045,2
-12,2064,R1,windturbine,2045,2
-12,2065,R1,windturbine,2045,2
-12,2069,R1,windturbine,2045,2
-12,2070,R1,windturbine,2045,2
-12,2074,R1,windturbine,2045,2
-13,2055,R1,windturbine,2050,2
-13,2059,R1,windturbine,2050,2
-13,2060,R1,windturbine,2050,2
-13,2064,R1,windturbine,2050,2
-13,2065,R1,windturbine,2050,2
-13,2069,R1,windturbine,2050,2
-13,2070,R1,windturbine,2050,2
-13,2074,R1,windturbine,2050,2
-13,2075,R1,windturbine,2050,2
-13,2079,R1,windturbine,2050,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv
new file mode 100644
index 000000000..8c3edee1d
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv
@@ -0,0 +1,115 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020
+0,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020
+0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020
+0,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020
+0,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020
+0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020
+0,electricity,all-week,night,2020,all-year,R1,0.42220000000,gasCCGT,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,38.70510000000,gasCCGT,0,2025
+0,electricity,all-week,morning,2020,all-year,R1,0.63330000000,gasCCGT,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,58.05770000000,gasCCGT,1,2025
+0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025
+0,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,gasCCGT,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,58.05770000000,gasCCGT,3,2025
+0,electricity,all-week,late-peak,2020,all-year,R1,1.26670000000,gasCCGT,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,116.11530000000,gasCCGT,4,2025
+0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025
+4,electricity,all-week,night,2025,all-year,R1,0.66670000000,windturbine,0,2030
+4,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030
+4,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,windturbine,2,2030
+4,electricity,all-week,early-peak,2025,all-year,R1,1.00000000000,windturbine,3,2030
+4,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030
+4,electricity,all-week,evening,2025,all-year,R1,1.00000000000,windturbine,5,2030
+5,electricity,all-week,night,2025,all-year,R1,0.40000000000,windturbine,0,2035
+6,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035
+5,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2035
+6,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,2035
+5,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,windturbine,2,2035
+6,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035
+5,electricity,all-week,early-peak,2025,all-year,R1,0.60000000000,windturbine,3,2035
+6,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035
+5,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2035
+6,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,2035
+5,electricity,all-week,evening,2025,all-year,R1,0.80000000000,windturbine,5,2035
+6,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035
+6,electricity,all-week,night,2025,all-year,R1,0.31110000000,windturbine,0,2040
+7,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040
+8,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040
+6,electricity,all-week,morning,2025,all-year,R1,0.46670000000,windturbine,1,2040
+7,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040
+8,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040
+6,electricity,all-week,afternoon,2025,all-year,R1,0.31110000000,windturbine,2,2040
+7,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040
+8,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040
+6,electricity,all-week,early-peak,2025,all-year,R1,0.46670000000,windturbine,3,2040
+7,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040
+8,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040
+6,electricity,all-week,late-peak,2025,all-year,R1,0.93330000000,windturbine,4,2040
+7,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040
+8,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040
+6,electricity,all-week,evening,2025,all-year,R1,0.62220000000,windturbine,5,2040
+7,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040
+8,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040
+7,electricity,all-week,night,2025,all-year,R1,0.21330000000,windturbine,0,2045
+8,electricity,all-week,night,2030,all-year,R1,0.21330000000,windturbine,0,2045
+9,electricity,all-week,night,2035,all-year,R1,0.21330000000,windturbine,0,2045
+10,electricity,all-week,night,2040,all-year,R1,0.42670000000,windturbine,0,2045
+7,electricity,all-week,morning,2025,all-year,R1,0.32000000000,windturbine,1,2045
+8,electricity,all-week,morning,2030,all-year,R1,0.32000000000,windturbine,1,2045
+9,electricity,all-week,morning,2035,all-year,R1,0.32000000000,windturbine,1,2045
+10,electricity,all-week,morning,2040,all-year,R1,0.64000000000,windturbine,1,2045
+7,electricity,all-week,afternoon,2025,all-year,R1,0.21330000000,windturbine,2,2045
+8,electricity,all-week,afternoon,2030,all-year,R1,0.21330000000,windturbine,2,2045
+9,electricity,all-week,afternoon,2035,all-year,R1,0.21330000000,windturbine,2,2045
+10,electricity,all-week,afternoon,2040,all-year,R1,0.42670000000,windturbine,2,2045
+7,electricity,all-week,early-peak,2025,all-year,R1,0.32000000000,windturbine,3,2045
+8,electricity,all-week,early-peak,2030,all-year,R1,0.32000000000,windturbine,3,2045
+9,electricity,all-week,early-peak,2035,all-year,R1,0.32000000000,windturbine,3,2045
+10,electricity,all-week,early-peak,2040,all-year,R1,0.64000000000,windturbine,3,2045
+7,electricity,all-week,late-peak,2025,all-year,R1,0.64000000000,windturbine,4,2045
+8,electricity,all-week,late-peak,2030,all-year,R1,0.64000000000,windturbine,4,2045
+9,electricity,all-week,late-peak,2035,all-year,R1,0.64000000000,windturbine,4,2045
+10,electricity,all-week,late-peak,2040,all-year,R1,1.28000000000,windturbine,4,2045
+7,electricity,all-week,evening,2025,all-year,R1,0.42670000000,windturbine,5,2045
+8,electricity,all-week,evening,2030,all-year,R1,0.42670000000,windturbine,5,2045
+9,electricity,all-week,evening,2035,all-year,R1,0.42670000000,windturbine,5,2045
+10,electricity,all-week,evening,2040,all-year,R1,0.85330000000,windturbine,5,2045
+8,electricity,all-week,night,2025,all-year,R1,0.17140000000,windturbine,0,2050
+9,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050
+10,electricity,all-week,night,2035,all-year,R1,0.17140000000,windturbine,0,2050
+11,electricity,all-week,night,2040,all-year,R1,0.34290000000,windturbine,0,2050
+12,electricity,all-week,night,2045,all-year,R1,0.34290000000,windturbine,0,2050
+8,electricity,all-week,morning,2025,all-year,R1,0.25710000000,windturbine,1,2050
+9,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050
+10,electricity,all-week,morning,2035,all-year,R1,0.25710000000,windturbine,1,2050
+11,electricity,all-week,morning,2040,all-year,R1,0.51430000000,windturbine,1,2050
+12,electricity,all-week,morning,2045,all-year,R1,0.51430000000,windturbine,1,2050
+8,electricity,all-week,afternoon,2025,all-year,R1,0.17140000000,windturbine,2,2050
+9,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050
+10,electricity,all-week,afternoon,2035,all-year,R1,0.17140000000,windturbine,2,2050
+11,electricity,all-week,afternoon,2040,all-year,R1,0.34290000000,windturbine,2,2050
+12,electricity,all-week,afternoon,2045,all-year,R1,0.34290000000,windturbine,2,2050
+8,electricity,all-week,early-peak,2025,all-year,R1,0.25710000000,windturbine,3,2050
+9,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050
+10,electricity,all-week,early-peak,2035,all-year,R1,0.25710000000,windturbine,3,2050
+11,electricity,all-week,early-peak,2040,all-year,R1,0.51430000000,windturbine,3,2050
+12,electricity,all-week,early-peak,2045,all-year,R1,0.51430000000,windturbine,3,2050
+8,electricity,all-week,late-peak,2025,all-year,R1,0.51430000000,windturbine,4,2050
+9,electricity,all-week,late-peak,2030,all-year,R1,0.51430000000,windturbine,4,2050
+10,electricity,all-week,late-peak,2035,all-year,R1,0.51430000000,windturbine,4,2050
+11,electricity,all-week,late-peak,2040,all-year,R1,1.02860000000,windturbine,4,2050
+12,electricity,all-week,late-peak,2045,all-year,R1,1.02860000000,windturbine,4,2050
+8,electricity,all-week,evening,2025,all-year,R1,0.34290000000,windturbine,5,2050
+9,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050
+10,electricity,all-week,evening,2035,all-year,R1,0.34290000000,windturbine,5,2050
+11,electricity,all-week,evening,2040,all-year,R1,0.68570000000,windturbine,5,2050
+12,electricity,all-week,evening,2045,all-year,R1,0.68570000000,windturbine,5,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
deleted file mode 100644
index ce642a34e..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,0,2020,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-0,0,2020,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
-1,0,2020,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-1,0,2020,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
-2,0,2020,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-2,0,2020,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-3,0,2020,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-3,0,2020,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
-4,0,2020,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-4,0,2020,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
-5,0,2020,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-5,0,2020,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
deleted file mode 100644
index eb7cf7665..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
-0,3,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
-1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
-1,3,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-2,3,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
-3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
-3,3,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
-4,3,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-5,3,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
deleted file mode 100644
index 3b5b32fb0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,4,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
-0,4,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
-0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-1,4,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,4,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
-2,4,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
-2,4,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
-2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-3,4,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,4,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
-3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-4,4,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,4,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
-5,4,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,4,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
-5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
deleted file mode 100644
index eca7c9ebb..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
-0,5,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
-0,6,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,5,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
-1,6,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
-1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
-2,5,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
-2,6,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
-3,5,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
-3,6,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,5,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
-4,6,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
-4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
-5,5,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
-5,6,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
deleted file mode 100644
index b71f068d0..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
-0,6,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
-0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
-0,8,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
-0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
-1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
-1,6,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
-1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
-1,8,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
-1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
-2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
-2,6,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
-2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
-2,8,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
-2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
-3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
-3,6,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
-3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
-3,8,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
-3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
-4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
-4,6,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
-4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
-4,8,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
-4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
-5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
-5,6,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
-5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
-5,8,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
-5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
deleted file mode 100644
index bbbec4497..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
-0,7,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
-0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
-0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
-0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
-0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
-0,10,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
-0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
-0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
-1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
-1,7,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
-1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
-1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
-1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
-1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
-1,10,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
-1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
-1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
-2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
-2,7,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
-2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
-2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
-2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
-2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
-2,10,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
-2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
-2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
-3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
-3,7,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
-3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
-3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
-3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
-3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
-3,10,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
-3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
-3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
-4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
-4,7,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
-4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
-4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
-4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
-4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
-4,10,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
-4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
-4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
-5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
-5,7,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
-5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
-5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
-5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
-5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
-5,10,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
-5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
-5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
deleted file mode 100644
index ceb22ad2b..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
-0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
-0,9,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.15000000000
-0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
-0,10,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.15000000000
-0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
-0,11,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.30000000000
-0,12,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
-0,12,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.30000000000
-0,13,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.30000000000
-1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
-1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
-1,9,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.22500000000
-1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
-1,10,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.22500000000
-1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
-1,11,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.45000000000
-1,12,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
-1,12,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.45000000000
-1,13,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.45000000000
-2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
-2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
-2,9,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.15000000000
-2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
-2,10,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.15000000000
-2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
-2,11,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.30000000000
-2,12,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
-2,12,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.30000000000
-2,13,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.30000000000
-3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
-3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
-3,9,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.22500000000
-3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
-3,10,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.22500000000
-3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
-3,11,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.45000000000
-3,12,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
-3,12,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.45000000000
-3,13,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.45000000000
-4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
-4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
-4,9,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.45000000000
-4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
-4,10,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.45000000000
-4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
-4,11,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.90000000000
-4,12,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
-4,12,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.90000000000
-4,13,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.90000000000
-5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
-5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
-5,9,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.30000000000
-5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
-5,10,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.30000000000
-5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
-5,11,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.60000000000
-5,12,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
-5,12,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.60000000000
-5,13,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.60000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity.csv
new file mode 100644
index 000000000..d5cf558f0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index d6edd96cb..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 677048eca..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 95b724d9d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 33e9c12a5..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 21be03137..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index d02c2c7f1..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 8c8e12067..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply.csv
new file mode 100644
index 000000000..520869501
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 729d406d6..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
deleted file mode 100644
index afe86e122..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 83daf7f18..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 7bda24630..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
deleted file mode 100644
index c535c6798..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 9abfcded8..000000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 945f522bd..e8299741f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -66,15 +66,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -95,15 +93,13 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.drop = ["comm_usage", "units_prices"]
 
@@ -122,10 +118,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
index 65735a0f6..ebb3127e2 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
@@ -36,7 +36,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply = pd.read_csv(\"2-max-constraint/Results/Power/Supply/2025.csv\")\n",
+    "power_supply = pd.read_csv(\"2-max-constraint/Results/Power/Supply.csv\")\n",
     "\n",
     "sns.lineplot(\n",
     "    data=power_supply[\n",
@@ -50,6 +50,13 @@
     "\n",
     "plt.ylim(0, 10)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
index 688e71b94..24d43265a 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
@@ -36,12 +36,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2020 = pd.read_csv(\"1-min-constraint/Results/Power/Supply/2020.csv\")\n",
+    "power_supply = pd.read_csv(\"1-min-constraint/Results/Power/Supply.csv\")\n",
     "\n",
     "sns.lineplot(\n",
-    "    data=power_supply_2020[\n",
-    "        (power_supply_2020.commodity == \"electricity\")\n",
-    "        & (power_supply_2020.year == 2025)\n",
+    "    data=power_supply[\n",
+    "        (power_supply.commodity == \"electricity\") & (power_supply.year == 2025)\n",
     "    ],\n",
     "    hue=\"technology\",\n",
     "    x=\"timeslice\",\n",
@@ -58,22 +57,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pathlib import Path\n",
-    "\n",
-    "path = \"1-min-constraint/Results/Residential/Capacity/\"\n",
-    "\n",
-    "all_files = Path(path).glob(\"*.csv\")\n",
-    "\n",
-    "li = []\n",
-    "\n",
-    "for filename in all_files:\n",
-    "    df = pd.read_csv(filename, index_col=None, header=0)\n",
-    "    year_needed = filename.stem\n",
-    "    filtered_year = df[df.year == int(year_needed)]\n",
-    "    li.append(filtered_year)\n",
+    "residential_capacity = pd.read_csv(\"1-min-constraint/Results/Residential/Capacity.csv\")\n",
+    "grouped_by = (\n",
+    "    residential_capacity.groupby([\"year\", \"technology\", \"region\"]).sum().reset_index()\n",
+    ")\n",
     "\n",
-    "frame = pd.concat(li, axis=0, ignore_index=True)\n",
-    "frame"
+    "g = sns.FacetGrid(data=grouped_by, row=\"region\")\n",
+    "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "g.add_legend()"
    ]
   },
   {
@@ -81,13 +72,7 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-   "source": [
-    "grouped_by = frame.groupby([\"year\", \"technology\", \"region\"]).sum().reset_index()\n",
-    "\n",
-    "g = sns.FacetGrid(data=grouped_by, row=\"region\")\n",
-    "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
-    "g.add_legend()"
-   ]
+   "source": []
   }
  ],
  "metadata": {
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index abb60fbd1..1f5a950d9 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -101,14 +101,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2020 = pd.read_csv(\n",
-    "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv\"\n",
+    "power_supply = pd.read_csv(\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv\"\n",
     ")\n",
     "gassCCGT_electricity_supply_2020 = (\n",
-    "    power_supply_2020[\n",
-    "        (power_supply_2020.technology == \"gasCCGT\")\n",
-    "        & (power_supply_2020.commodity == \"electricity\")\n",
-    "        & (power_supply_2020.year == 2020)\n",
+    "    power_supply[\n",
+    "        (power_supply.technology == \"gasCCGT\")\n",
+    "        & (power_supply.commodity == \"electricity\")\n",
+    "        & (power_supply.year == 2020)\n",
     "    ]\n",
     "    .groupby([\"timeslice\", \"technology\"])\n",
     "    .sum()\n",
@@ -174,14 +174,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2030 = pd.read_csv(\n",
-    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv\"\n",
+    "power_supply = pd.read_csv(\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv\"\n",
     ")\n",
     "windturbine_electricity_supply_2030 = (\n",
-    "    power_supply_2030[\n",
-    "        (power_supply_2030.technology == \"windturbine\")\n",
-    "        & (power_supply_2030.commodity == \"electricity\")\n",
-    "        & (power_supply_2030.year == 2030)\n",
+    "    power_supply[\n",
+    "        (power_supply.technology == \"windturbine\")\n",
+    "        & (power_supply.commodity == \"electricity\")\n",
+    "        & (power_supply.year == 2030)\n",
     "    ]\n",
     "    .groupby([\"timeslice\", \"technology\"])\n",
     "    .sum()\n",
@@ -230,7 +230,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.12.4"
   },
   "vscode": {
    "interpreter": {
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 29306d1c9..9d851f603 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -84,10 +82,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.gas]
 type = 'default'
@@ -104,10 +101,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index 1b8c9eb6b..f17da5dee 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -56,15 +56,13 @@ demand_share = "new_and_retro"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -88,10 +86,9 @@ lpsolver = "scipy"
 demand_share = "new_and_retro"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
@@ -112,10 +109,9 @@ lpsolver = "scipy"
 demand_share = "new_and_retro"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index 945f522bd..e8299741f 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -66,15 +66,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
@@ -95,15 +93,13 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.drop = ["comm_usage", "units_prices"]
 
@@ -122,10 +118,9 @@ lpsolver = "scipy"
 demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 2f4a35eb7..06a656e8f 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -56,15 +56,13 @@ demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.industry.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 
 [[sectors.industry.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
-overwrite = true
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
+sink = 'aggregate'
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
index 335eb44da..e2c16c428 100644
--- a/src/muse/data/example/trade/settings.toml
+++ b/src/muse/data/example/trade/settings.toml
@@ -63,10 +63,9 @@ forecast = 5
 asset_threshold = 1e-4
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 columns = ["asset", "year", "region", "technology", "installed", "capacity"]
 
 [[sectors.residential.interactions]]
@@ -102,10 +101,9 @@ forecast = 5
 asset_threshold = 1e-4
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 columns = [
     "dst_region",
     "year",
@@ -145,10 +143,9 @@ forecast = 5
 asset_threshold = 1e-4
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv'
 quantity = "capacity"
-sink = 'csv'
-overwrite = true
+sink = 'aggregate'
 columns = [
     "dst_region",
     "year",
diff --git a/tests/example_outputs/default/Gas/Capacity.csv b/tests/example_outputs/default/Gas/Capacity.csv
new file mode 100644
index 000000000..b8b8c36a0
--- /dev/null
+++ b/tests/example_outputs/default/Gas/Capacity.csv
@@ -0,0 +1,18 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,16.73530000000,2020,R1,gassupply1,2025
+0,9.23530000000,2020,R1,gassupply1,2030
+1,9.28910000000,2025,R1,gassupply1,2030
+0,1.73530000000,2020,R1,gassupply1,2035
+1,9.28910000000,2025,R1,gassupply1,2035
+2,7.47410000000,2030,R1,gassupply1,2035
+0,1.73530000000,2020,R1,gassupply1,2040
+1,9.28910000000,2025,R1,gassupply1,2040
+2,7.47410000000,2030,R1,gassupply1,2040
+0,1.73530000000,2020,R1,gassupply1,2045
+1,9.28910000000,2025,R1,gassupply1,2045
+2,7.47410000000,2030,R1,gassupply1,2045
+0,1.73530000000,2020,R1,gassupply1,2050
+1,9.28910000000,2025,R1,gassupply1,2050
+2,7.47410000000,2030,R1,gassupply1,2050
+3,0.30680000000,2045,R1,gassupply1,2050
diff --git a/tests/example_outputs/default/Gas/Capacity/2020.csv b/tests/example_outputs/default/Gas/Capacity/2020.csv
deleted file mode 100644
index d37dcfe1e..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2025.csv b/tests/example_outputs/default/Gas/Capacity/2025.csv
deleted file mode 100644
index 5e2e13dc7..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2030.csv b/tests/example_outputs/default/Gas/Capacity/2030.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2035.csv b/tests/example_outputs/default/Gas/Capacity/2035.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2040.csv b/tests/example_outputs/default/Gas/Capacity/2040.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2045.csv b/tests/example_outputs/default/Gas/Capacity/2045.csv
deleted file mode 100644
index c102c566d..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
-3,2050,R1,gassupply1,2045,0.30680000000
-3,2059,R1,gassupply1,2045,0.30680000000
-3,2060,R1,gassupply1,2045,0.30680000000
-3,2064,R1,gassupply1,2045,0.30680000000
-3,2065,R1,gassupply1,2045,0.30680000000
-3,2069,R1,gassupply1,2045,0.30680000000
-3,2070,R1,gassupply1,2045,0.30680000000
-3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2050.csv b/tests/example_outputs/default/Gas/Capacity/2050.csv
deleted file mode 100644
index c102c566d..000000000
--- a/tests/example_outputs/default/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
-3,2050,R1,gassupply1,2045,0.30680000000
-3,2059,R1,gassupply1,2045,0.30680000000
-3,2060,R1,gassupply1,2045,0.30680000000
-3,2064,R1,gassupply1,2045,0.30680000000
-3,2065,R1,gassupply1,2045,0.30680000000
-3,2069,R1,gassupply1,2045,0.30680000000
-3,2070,R1,gassupply1,2045,0.30680000000
-3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/default/Power/Capacity.csv b/tests/example_outputs/default/Power/Capacity.csv
new file mode 100644
index 000000000..847c7f8b4
--- /dev/null
+++ b/tests/example_outputs/default/Power/Capacity.csv
@@ -0,0 +1,28 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,6,2020,R1,gasCCGT,2025
+2,5,2020,R1,windturbine,2025
+0,5,2020,R1,gasCCGT,2030
+1,6,2025,R1,gasCCGT,2030
+2,5,2020,R1,windturbine,2030
+0,5,2020,R1,gasCCGT,2035
+1,6,2025,R1,gasCCGT,2035
+2,5,2020,R1,windturbine,2035
+3,6,2030,R1,windturbine,2035
+0,5,2020,R1,gasCCGT,2040
+1,6,2025,R1,gasCCGT,2040
+2,5,2020,R1,windturbine,2040
+3,6,2030,R1,windturbine,2040
+4,6,2035,R1,windturbine,2040
+0,5,2020,R1,gasCCGT,2045
+1,6,2025,R1,gasCCGT,2045
+3,5,2020,R1,windturbine,2045
+4,6,2030,R1,windturbine,2045
+5,6,2035,R1,windturbine,2045
+6,6,2040,R1,windturbine,2045
+0,5,2020,R1,gasCCGT,2050
+1,6,2025,R1,gasCCGT,2050
+4,6,2030,R1,windturbine,2050
+5,6,2035,R1,windturbine,2050
+6,6,2040,R1,windturbine,2050
+7,10,2045,R1,windturbine,2050
diff --git a/tests/example_outputs/default/Power/Capacity/2020.csv b/tests/example_outputs/default/Power/Capacity/2020.csv
deleted file mode 100644
index 36b5025eb..000000000
--- a/tests/example_outputs/default/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2025,R1,windturbine,2020,5
-1,2030,R1,windturbine,2020,5
-1,2035,R1,windturbine,2020,5
-1,2040,R1,windturbine,2020,5
-1,2045,R1,windturbine,2020,5
-1,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/default/Power/Capacity/2025.csv b/tests/example_outputs/default/Power/Capacity/2025.csv
deleted file mode 100644
index b130fe08f..000000000
--- a/tests/example_outputs/default/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/default/Power/Capacity/2030.csv b/tests/example_outputs/default/Power/Capacity/2030.csv
deleted file mode 100644
index bfe651083..000000000
--- a/tests/example_outputs/default/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
-3,2035,R1,windturbine,2030,6
-3,2040,R1,windturbine,2030,6
-3,2045,R1,windturbine,2030,6
-3,2049,R1,windturbine,2030,6
-3,2050,R1,windturbine,2030,6
-3,2059,R1,windturbine,2030,6
diff --git a/tests/example_outputs/default/Power/Capacity/2035.csv b/tests/example_outputs/default/Power/Capacity/2035.csv
deleted file mode 100644
index a33320a72..000000000
--- a/tests/example_outputs/default/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,38 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
-3,2035,R1,windturbine,2030,6
-3,2040,R1,windturbine,2030,6
-3,2045,R1,windturbine,2030,6
-3,2049,R1,windturbine,2030,6
-3,2050,R1,windturbine,2030,6
-3,2059,R1,windturbine,2030,6
-4,2040,R1,windturbine,2035,6
-4,2045,R1,windturbine,2035,6
-4,2049,R1,windturbine,2035,6
-4,2050,R1,windturbine,2035,6
-4,2059,R1,windturbine,2035,6
-4,2060,R1,windturbine,2035,6
-4,2064,R1,windturbine,2035,6
diff --git a/tests/example_outputs/default/Power/Capacity/2040.csv b/tests/example_outputs/default/Power/Capacity/2040.csv
deleted file mode 100644
index 658cdb8e0..000000000
--- a/tests/example_outputs/default/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
-3,2035,R1,windturbine,2030,6
-3,2040,R1,windturbine,2030,6
-3,2045,R1,windturbine,2030,6
-3,2049,R1,windturbine,2030,6
-3,2050,R1,windturbine,2030,6
-3,2059,R1,windturbine,2030,6
-4,2040,R1,windturbine,2035,6
-4,2045,R1,windturbine,2035,6
-4,2049,R1,windturbine,2035,6
-4,2050,R1,windturbine,2035,6
-4,2059,R1,windturbine,2035,6
-4,2060,R1,windturbine,2035,6
-4,2064,R1,windturbine,2035,6
-5,2045,R1,windturbine,2040,6
-5,2049,R1,windturbine,2040,6
-5,2050,R1,windturbine,2040,6
-5,2059,R1,windturbine,2040,6
-5,2060,R1,windturbine,2040,6
-5,2064,R1,windturbine,2040,6
-5,2065,R1,windturbine,2040,6
-5,2069,R1,windturbine,2040,6
diff --git a/tests/example_outputs/default/Power/Capacity/2045.csv b/tests/example_outputs/default/Power/Capacity/2045.csv
deleted file mode 100644
index f021634a2..000000000
--- a/tests/example_outputs/default/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,54 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-3,2025,R1,windturbine,2020,5
-3,2030,R1,windturbine,2020,5
-3,2035,R1,windturbine,2020,5
-3,2040,R1,windturbine,2020,5
-3,2045,R1,windturbine,2020,5
-3,2049,R1,windturbine,2020,5
-4,2035,R1,windturbine,2030,6
-4,2040,R1,windturbine,2030,6
-4,2045,R1,windturbine,2030,6
-4,2049,R1,windturbine,2030,6
-4,2050,R1,windturbine,2030,6
-4,2059,R1,windturbine,2030,6
-5,2040,R1,windturbine,2035,6
-5,2045,R1,windturbine,2035,6
-5,2049,R1,windturbine,2035,6
-5,2050,R1,windturbine,2035,6
-5,2059,R1,windturbine,2035,6
-5,2060,R1,windturbine,2035,6
-5,2064,R1,windturbine,2035,6
-6,2045,R1,windturbine,2040,6
-6,2049,R1,windturbine,2040,6
-6,2050,R1,windturbine,2040,6
-6,2059,R1,windturbine,2040,6
-6,2060,R1,windturbine,2040,6
-6,2064,R1,windturbine,2040,6
-6,2065,R1,windturbine,2040,6
-6,2069,R1,windturbine,2040,6
-7,2050,R1,windturbine,2045,10
-7,2059,R1,windturbine,2045,10
-7,2060,R1,windturbine,2045,10
-7,2064,R1,windturbine,2045,10
-7,2065,R1,windturbine,2045,10
-7,2069,R1,windturbine,2045,10
-7,2070,R1,windturbine,2045,10
-7,2074,R1,windturbine,2045,10
diff --git a/tests/example_outputs/default/Power/Capacity/2050.csv b/tests/example_outputs/default/Power/Capacity/2050.csv
deleted file mode 100644
index 54bbf73ac..000000000
--- a/tests/example_outputs/default/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,70 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2055,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-3,2025,R1,windturbine,2020,5
-3,2030,R1,windturbine,2020,5
-3,2035,R1,windturbine,2020,5
-3,2040,R1,windturbine,2020,5
-3,2045,R1,windturbine,2020,5
-3,2049,R1,windturbine,2020,5
-4,2035,R1,windturbine,2030,6
-4,2040,R1,windturbine,2030,6
-4,2045,R1,windturbine,2030,6
-4,2049,R1,windturbine,2030,6
-4,2050,R1,windturbine,2030,6
-4,2055,R1,windturbine,2030,6
-4,2059,R1,windturbine,2030,6
-5,2040,R1,windturbine,2035,6
-5,2045,R1,windturbine,2035,6
-5,2049,R1,windturbine,2035,6
-5,2050,R1,windturbine,2035,6
-5,2055,R1,windturbine,2035,6
-5,2059,R1,windturbine,2035,6
-5,2060,R1,windturbine,2035,6
-5,2064,R1,windturbine,2035,6
-6,2045,R1,windturbine,2040,6
-6,2049,R1,windturbine,2040,6
-6,2050,R1,windturbine,2040,6
-6,2055,R1,windturbine,2040,6
-6,2059,R1,windturbine,2040,6
-6,2060,R1,windturbine,2040,6
-6,2064,R1,windturbine,2040,6
-6,2065,R1,windturbine,2040,6
-6,2069,R1,windturbine,2040,6
-7,2050,R1,windturbine,2045,10
-7,2055,R1,windturbine,2045,10
-7,2059,R1,windturbine,2045,10
-7,2060,R1,windturbine,2045,10
-7,2064,R1,windturbine,2045,10
-7,2065,R1,windturbine,2045,10
-7,2069,R1,windturbine,2045,10
-7,2070,R1,windturbine,2045,10
-7,2074,R1,windturbine,2045,10
-8,2055,R1,windturbine,2050,1
-8,2059,R1,windturbine,2050,1
-8,2060,R1,windturbine,2050,1
-8,2064,R1,windturbine,2050,1
-8,2065,R1,windturbine,2050,1
-8,2069,R1,windturbine,2050,1
-8,2070,R1,windturbine,2050,1
-8,2074,R1,windturbine,2050,1
-8,2075,R1,windturbine,2050,1
-8,2079,R1,windturbine,2050,1
diff --git a/tests/example_outputs/default/Residential/Capacity.csv b/tests/example_outputs/default/Residential/Capacity.csv
new file mode 100644
index 000000000..d5cf558f0
--- /dev/null
+++ b/tests/example_outputs/default/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
diff --git a/tests/example_outputs/default/Residential/Capacity/2020.csv b/tests/example_outputs/default/Residential/Capacity/2020.csv
deleted file mode 100644
index d6edd96cb..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
diff --git a/tests/example_outputs/default/Residential/Capacity/2025.csv b/tests/example_outputs/default/Residential/Capacity/2025.csv
deleted file mode 100644
index 677048eca..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
diff --git a/tests/example_outputs/default/Residential/Capacity/2030.csv b/tests/example_outputs/default/Residential/Capacity/2030.csv
deleted file mode 100644
index 95b724d9d..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
diff --git a/tests/example_outputs/default/Residential/Capacity/2035.csv b/tests/example_outputs/default/Residential/Capacity/2035.csv
deleted file mode 100644
index 33e9c12a5..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
diff --git a/tests/example_outputs/default/Residential/Capacity/2040.csv b/tests/example_outputs/default/Residential/Capacity/2040.csv
deleted file mode 100644
index 21be03137..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
diff --git a/tests/example_outputs/default/Residential/Capacity/2045.csv b/tests/example_outputs/default/Residential/Capacity/2045.csv
deleted file mode 100644
index d02c2c7f1..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
diff --git a/tests/example_outputs/default/Residential/Capacity/2050.csv b/tests/example_outputs/default/Residential/Capacity/2050.csv
deleted file mode 100644
index 8c8e12067..000000000
--- a/tests/example_outputs/default/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
diff --git a/tests/example_outputs/default/Residential/Supply.csv b/tests/example_outputs/default/Residential/Supply.csv
new file mode 100644
index 000000000..520869501
--- /dev/null
+++ b/tests/example_outputs/default/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050
diff --git a/tests/example_outputs/default/Residential/Supply/2020.csv b/tests/example_outputs/default/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/tests/example_outputs/default/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default/Residential/Supply/2025.csv b/tests/example_outputs/default/Residential/Supply/2025.csv
deleted file mode 100644
index 729d406d6..000000000
--- a/tests/example_outputs/default/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default/Residential/Supply/2030.csv b/tests/example_outputs/default/Residential/Supply/2030.csv
deleted file mode 100644
index afe86e122..000000000
--- a/tests/example_outputs/default/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default/Residential/Supply/2035.csv b/tests/example_outputs/default/Residential/Supply/2035.csv
deleted file mode 100644
index 83daf7f18..000000000
--- a/tests/example_outputs/default/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default/Residential/Supply/2040.csv b/tests/example_outputs/default/Residential/Supply/2040.csv
deleted file mode 100644
index 7bda24630..000000000
--- a/tests/example_outputs/default/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default/Residential/Supply/2045.csv b/tests/example_outputs/default/Residential/Supply/2045.csv
deleted file mode 100644
index c535c6798..000000000
--- a/tests/example_outputs/default/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default/Residential/Supply/2050.csv b/tests/example_outputs/default/Residential/Supply/2050.csv
deleted file mode 100644
index 9abfcded8..000000000
--- a/tests/example_outputs/default/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity.csv b/tests/example_outputs/default_retro/Gas/Capacity.csv
new file mode 100644
index 000000000..22ed483ce
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity.csv
@@ -0,0 +1,17 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,16.46440000000,2020,R1,gassupply1,2025
+0,8.96440000000,2020,R1,gassupply1,2030
+1,11.46130000000,2025,R1,gassupply1,2030
+0,1.46440000000,2020,R1,gassupply1,2035
+1,11.46130000000,2025,R1,gassupply1,2035
+2,7.50000000000,2030,R1,gassupply1,2035
+0,1.46440000000,2020,R1,gassupply1,2040
+1,11.46130000000,2025,R1,gassupply1,2040
+2,7.50000000000,2030,R1,gassupply1,2040
+0,1.46440000000,2020,R1,gassupply1,2045
+1,11.46130000000,2025,R1,gassupply1,2045
+2,7.50000000000,2030,R1,gassupply1,2045
+0,1.46440000000,2020,R1,gassupply1,2050
+1,11.46130000000,2025,R1,gassupply1,2050
+2,7.50000000000,2030,R1,gassupply1,2050
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2020.csv b/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
deleted file mode 100644
index 4346aa17f..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2025.csv b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
deleted file mode 100644
index 89b0e0fe6..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gassupply1,2020,16.46440000000
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,11.46130000000
-1,2035,R1,gassupply1,2025,11.46130000000
-1,2040,R1,gassupply1,2025,11.46130000000
-1,2045,R1,gassupply1,2025,11.46130000000
-1,2050,R1,gassupply1,2025,11.46130000000
-1,2059,R1,gassupply1,2025,11.46130000000
-1,2060,R1,gassupply1,2025,11.46130000000
-1,2064,R1,gassupply1,2025,11.46130000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2030.csv b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
deleted file mode 100644
index 9ea725176..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,8.96440000000
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2030,R1,gassupply1,2025,11.46130000000
-1,2035,R1,gassupply1,2025,11.46130000000
-1,2040,R1,gassupply1,2025,11.46130000000
-1,2045,R1,gassupply1,2025,11.46130000000
-1,2050,R1,gassupply1,2025,11.46130000000
-1,2059,R1,gassupply1,2025,11.46130000000
-1,2060,R1,gassupply1,2025,11.46130000000
-1,2064,R1,gassupply1,2025,11.46130000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2035.csv b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
deleted file mode 100644
index 0a85b3561..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gassupply1,2020,1.46440000000
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2035,R1,gassupply1,2025,11.46130000000
-1,2040,R1,gassupply1,2025,11.46130000000
-1,2045,R1,gassupply1,2025,11.46130000000
-1,2050,R1,gassupply1,2025,11.46130000000
-1,2059,R1,gassupply1,2025,11.46130000000
-1,2060,R1,gassupply1,2025,11.46130000000
-1,2064,R1,gassupply1,2025,11.46130000000
-2,2035,R1,gassupply1,2030,7.50000000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2040.csv b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
deleted file mode 100644
index 4d449355c..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gassupply1,2020,1.46440000000
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2040,R1,gassupply1,2025,11.46130000000
-1,2045,R1,gassupply1,2025,11.46130000000
-1,2050,R1,gassupply1,2025,11.46130000000
-1,2059,R1,gassupply1,2025,11.46130000000
-1,2060,R1,gassupply1,2025,11.46130000000
-1,2064,R1,gassupply1,2025,11.46130000000
-2,2040,R1,gassupply1,2030,7.50000000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2045.csv b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
deleted file mode 100644
index 41ad0a7e9..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gassupply1,2020,1.46440000000
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2045,R1,gassupply1,2025,11.46130000000
-1,2050,R1,gassupply1,2025,11.46130000000
-1,2059,R1,gassupply1,2025,11.46130000000
-1,2060,R1,gassupply1,2025,11.46130000000
-1,2064,R1,gassupply1,2025,11.46130000000
-2,2045,R1,gassupply1,2030,7.50000000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2050.csv b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
deleted file mode 100644
index 5716d7be2..000000000
--- a/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2050,R1,gassupply1,2020,1.46440000000
-0,2055,R1,gassupply1,2020,1.46440000000
-0,2059,R1,gassupply1,2020,1.46440000000
-1,2050,R1,gassupply1,2025,11.46130000000
-1,2055,R1,gassupply1,2025,11.46130000000
-1,2059,R1,gassupply1,2025,11.46130000000
-1,2060,R1,gassupply1,2025,11.46130000000
-1,2064,R1,gassupply1,2025,11.46130000000
-2,2050,R1,gassupply1,2030,7.50000000000
-2,2055,R1,gassupply1,2030,7.50000000000
-2,2059,R1,gassupply1,2030,7.50000000000
-2,2060,R1,gassupply1,2030,7.50000000000
-2,2064,R1,gassupply1,2030,7.50000000000
-2,2065,R1,gassupply1,2030,7.50000000000
-2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity.csv b/tests/example_outputs/default_retro/Power/Capacity.csv
new file mode 100644
index 000000000..f49a1fd5f
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity.csv
@@ -0,0 +1,28 @@
+asset,capacity,installed,region,technology,year
+0,1.00000000000,2020,R1,gasCCGT,2020
+0,6.00000000000,2020,R1,gasCCGT,2025
+2,5.50000000000,2020,R1,windturbine,2025
+0,5.00000000000,2020,R1,gasCCGT,2030
+1,4.06670000000,2025,R1,gasCCGT,2030
+2,5.50000000000,2020,R1,windturbine,2030
+0,5.00000000000,2020,R1,gasCCGT,2035
+1,4.06670000000,2025,R1,gasCCGT,2035
+2,5.50000000000,2020,R1,windturbine,2035
+3,6.00000000000,2030,R1,windturbine,2035
+0,5.00000000000,2020,R1,gasCCGT,2040
+1,4.06670000000,2025,R1,gasCCGT,2040
+2,5.50000000000,2020,R1,windturbine,2040
+3,6.00000000000,2030,R1,windturbine,2040
+4,9.19000000000,2035,R1,windturbine,2040
+0,5.00000000000,2020,R1,gasCCGT,2045
+1,4.06670000000,2025,R1,gasCCGT,2045
+2,5.50000000000,2020,R1,windturbine,2045
+3,6.00000000000,2030,R1,windturbine,2045
+4,9.19000000000,2035,R1,windturbine,2045
+5,6.00000000000,2040,R1,windturbine,2045
+0,5.00000000000,2020,R1,gasCCGT,2050
+1,4.06670000000,2025,R1,gasCCGT,2050
+3,6.00000000000,2030,R1,windturbine,2050
+4,9.19000000000,2035,R1,windturbine,2050
+5,6.00000000000,2040,R1,windturbine,2050
+6,12.41000000000,2045,R1,windturbine,2050
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2020.csv b/tests/example_outputs/default_retro/Power/Capacity/2020.csv
deleted file mode 100644
index 4d6c24fb4..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2025,R1,windturbine,2020,5.50000000000
-1,2030,R1,windturbine,2020,5.50000000000
-1,2035,R1,windturbine,2020,5.50000000000
-1,2040,R1,windturbine,2020,5.50000000000
-1,2045,R1,windturbine,2020,5.50000000000
-1,2049,R1,windturbine,2020,5.50000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2025.csv b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
deleted file mode 100644
index b067ded0c..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasCCGT,2020,6.00000000000
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,4.06670000000
-1,2035,R1,gasCCGT,2025,4.06670000000
-1,2040,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2059,R1,gasCCGT,2025,4.06670000000
-1,2060,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2025,R1,windturbine,2020,5.50000000000
-2,2030,R1,windturbine,2020,5.50000000000
-2,2035,R1,windturbine,2020,5.50000000000
-2,2040,R1,windturbine,2020,5.50000000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2030.csv b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
deleted file mode 100644
index d36bb98ea..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasCCGT,2020,5.00000000000
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2030,R1,gasCCGT,2025,4.06670000000
-1,2035,R1,gasCCGT,2025,4.06670000000
-1,2040,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2059,R1,gasCCGT,2025,4.06670000000
-1,2060,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2030,R1,windturbine,2020,5.50000000000
-2,2035,R1,windturbine,2020,5.50000000000
-2,2040,R1,windturbine,2020,5.50000000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
-3,2035,R1,windturbine,2030,6.00000000000
-3,2040,R1,windturbine,2030,6.00000000000
-3,2045,R1,windturbine,2030,6.00000000000
-3,2049,R1,windturbine,2030,6.00000000000
-3,2050,R1,windturbine,2030,6.00000000000
-3,2059,R1,windturbine,2030,6.00000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2035.csv b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
deleted file mode 100644
index 0dd90cd63..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,32 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasCCGT,2020,5.00000000000
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2035,R1,gasCCGT,2025,4.06670000000
-1,2040,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2059,R1,gasCCGT,2025,4.06670000000
-1,2060,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2035,R1,windturbine,2020,5.50000000000
-2,2040,R1,windturbine,2020,5.50000000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
-3,2035,R1,windturbine,2030,6.00000000000
-3,2040,R1,windturbine,2030,6.00000000000
-3,2045,R1,windturbine,2030,6.00000000000
-3,2049,R1,windturbine,2030,6.00000000000
-3,2050,R1,windturbine,2030,6.00000000000
-3,2059,R1,windturbine,2030,6.00000000000
-4,2040,R1,windturbine,2035,9.19000000000
-4,2045,R1,windturbine,2035,9.19000000000
-4,2049,R1,windturbine,2035,9.19000000000
-4,2050,R1,windturbine,2035,9.19000000000
-4,2059,R1,windturbine,2035,9.19000000000
-4,2060,R1,windturbine,2035,9.19000000000
-4,2064,R1,windturbine,2035,9.19000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2040.csv b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
deleted file mode 100644
index 46153eb50..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasCCGT,2020,5.00000000000
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2040,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2059,R1,gasCCGT,2025,4.06670000000
-1,2060,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2040,R1,windturbine,2020,5.50000000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
-3,2040,R1,windturbine,2030,6.00000000000
-3,2045,R1,windturbine,2030,6.00000000000
-3,2049,R1,windturbine,2030,6.00000000000
-3,2050,R1,windturbine,2030,6.00000000000
-3,2059,R1,windturbine,2030,6.00000000000
-4,2040,R1,windturbine,2035,9.19000000000
-4,2045,R1,windturbine,2035,9.19000000000
-4,2049,R1,windturbine,2035,9.19000000000
-4,2050,R1,windturbine,2035,9.19000000000
-4,2059,R1,windturbine,2035,9.19000000000
-4,2060,R1,windturbine,2035,9.19000000000
-4,2064,R1,windturbine,2035,9.19000000000
-5,2045,R1,windturbine,2040,6.00000000000
-5,2049,R1,windturbine,2040,6.00000000000
-5,2050,R1,windturbine,2040,6.00000000000
-5,2059,R1,windturbine,2040,6.00000000000
-5,2060,R1,windturbine,2040,6.00000000000
-5,2064,R1,windturbine,2040,6.00000000000
-5,2065,R1,windturbine,2040,6.00000000000
-5,2069,R1,windturbine,2040,6.00000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2045.csv b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
deleted file mode 100644
index d6eead3c6..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,39 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2020,5.00000000000
-0,2049,R1,gasCCGT,2020,5.00000000000
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2059,R1,gasCCGT,2025,4.06670000000
-1,2060,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2045,R1,windturbine,2020,5.50000000000
-2,2049,R1,windturbine,2020,5.50000000000
-3,2045,R1,windturbine,2030,6.00000000000
-3,2049,R1,windturbine,2030,6.00000000000
-3,2050,R1,windturbine,2030,6.00000000000
-3,2059,R1,windturbine,2030,6.00000000000
-4,2045,R1,windturbine,2035,9.19000000000
-4,2049,R1,windturbine,2035,9.19000000000
-4,2050,R1,windturbine,2035,9.19000000000
-4,2059,R1,windturbine,2035,9.19000000000
-4,2060,R1,windturbine,2035,9.19000000000
-4,2064,R1,windturbine,2035,9.19000000000
-5,2045,R1,windturbine,2040,6.00000000000
-5,2049,R1,windturbine,2040,6.00000000000
-5,2050,R1,windturbine,2040,6.00000000000
-5,2059,R1,windturbine,2040,6.00000000000
-5,2060,R1,windturbine,2040,6.00000000000
-5,2064,R1,windturbine,2040,6.00000000000
-5,2065,R1,windturbine,2040,6.00000000000
-5,2069,R1,windturbine,2040,6.00000000000
-6,2050,R1,windturbine,2045,12.41000000000
-6,2059,R1,windturbine,2045,12.41000000000
-6,2060,R1,windturbine,2045,12.41000000000
-6,2064,R1,windturbine,2045,12.41000000000
-6,2065,R1,windturbine,2045,12.41000000000
-6,2069,R1,windturbine,2045,12.41000000000
-6,2070,R1,windturbine,2045,12.41000000000
-6,2074,R1,windturbine,2045,12.41000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2050.csv b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
deleted file mode 100644
index 3169f2d7e..000000000
--- a/tests/example_outputs/default_retro/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2050,R1,gasCCGT,2020,5.00000000000
-0,2055,R1,gasCCGT,2020,5.00000000000
-0,2059,R1,gasCCGT,2020,5.00000000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2055,R1,gasCCGT,2025,4.06670000000
-1,2059,R1,gasCCGT,2025,4.06670000000
-1,2060,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-3,2050,R1,windturbine,2030,6.00000000000
-3,2055,R1,windturbine,2030,6.00000000000
-3,2059,R1,windturbine,2030,6.00000000000
-4,2050,R1,windturbine,2035,9.19000000000
-4,2055,R1,windturbine,2035,9.19000000000
-4,2059,R1,windturbine,2035,9.19000000000
-4,2060,R1,windturbine,2035,9.19000000000
-4,2064,R1,windturbine,2035,9.19000000000
-5,2050,R1,windturbine,2040,6.00000000000
-5,2055,R1,windturbine,2040,6.00000000000
-5,2059,R1,windturbine,2040,6.00000000000
-5,2060,R1,windturbine,2040,6.00000000000
-5,2064,R1,windturbine,2040,6.00000000000
-5,2065,R1,windturbine,2040,6.00000000000
-5,2069,R1,windturbine,2040,6.00000000000
-6,2050,R1,windturbine,2045,12.41000000000
-6,2055,R1,windturbine,2045,12.41000000000
-6,2059,R1,windturbine,2045,12.41000000000
-6,2060,R1,windturbine,2045,12.41000000000
-6,2064,R1,windturbine,2045,12.41000000000
-6,2065,R1,windturbine,2045,12.41000000000
-6,2069,R1,windturbine,2045,12.41000000000
-6,2070,R1,windturbine,2045,12.41000000000
-6,2074,R1,windturbine,2045,12.41000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity.csv b/tests/example_outputs/default_retro/Residential/Capacity.csv
new file mode 100644
index 000000000..afb9f4183
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity.csv
@@ -0,0 +1,18 @@
+asset,capacity,installed,region,technology,year
+0,10.00000000000,2020,R1,gasboiler,2020
+0,5.00000000000,2020,R1,gasboiler,2025
+2,19.00000000000,2020,R1,heatpump,2025
+0,4.10000000000,2025,R1,gasboiler,2030
+1,19.00000000000,2020,R1,heatpump,2030
+2,6.90000000000,2025,R1,heatpump,2030
+0,4.10000000000,2025,R1,gasboiler,2035
+2,6.90000000000,2025,R1,heatpump,2035
+3,25.00000000000,2030,R1,heatpump,2035
+0,0.91000000000,2035,R1,gasboiler,2040
+1,25.00000000000,2030,R1,heatpump,2040
+2,16.09000000000,2035,R1,heatpump,2040
+0,0.91000000000,2035,R1,gasboiler,2045
+1,16.09000000000,2035,R1,heatpump,2045
+2,31.00000000000,2040,R1,heatpump,2045
+2,31.00000000000,2040,R1,heatpump,2050
+3,23.00000000000,2045,R1,heatpump,2050
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2020.csv b/tests/example_outputs/default_retro/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c6..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2025.csv b/tests/example_outputs/default_retro/Residential/Capacity/2025.csv
deleted file mode 100644
index 2eb0ec153..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2030.csv b/tests/example_outputs/default_retro/Residential/Capacity/2030.csv
deleted file mode 100644
index 22334ba59..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2035.csv b/tests/example_outputs/default_retro/Residential/Capacity/2035.csv
deleted file mode 100644
index 452c6c8a9..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2040.csv b/tests/example_outputs/default_retro/Residential/Capacity/2040.csv
deleted file mode 100644
index e3ecc1d09..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2045.csv b/tests/example_outputs/default_retro/Residential/Capacity/2045.csv
deleted file mode 100644
index 82b22d9b8..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-2,2050,R1,heatpump,2040,31.00000000000
-2,2054,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2045,23.00000000000
-3,2054,R1,heatpump,2045,23.00000000000
-3,2055,R1,heatpump,2045,23.00000000000
-3,2059,R1,heatpump,2045,23.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2050.csv b/tests/example_outputs/default_retro/Residential/Capacity/2050.csv
deleted file mode 100644
index 42f4be20c..000000000
--- a/tests/example_outputs/default_retro/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-2,2050,R1,heatpump,2040,31.00000000000
-2,2054,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2045,23.00000000000
-3,2054,R1,heatpump,2045,23.00000000000
-3,2055,R1,heatpump,2045,23.00000000000
-3,2059,R1,heatpump,2045,23.00000000000
-4,2055,R1,heatpump,2050,31.00000000000
-4,2059,R1,heatpump,2050,31.00000000000
-4,2060,R1,heatpump,2050,31.00000000000
-4,2064,R1,heatpump,2050,31.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply.csv b/tests/example_outputs/default_retro/Residential/Supply.csv
new file mode 100644
index 000000000..f65b3e310
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply.csv
@@ -0,0 +1,139 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+2,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+2,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+2,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+2,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+2,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+2,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+0,heat,all-week,night,2025,all-year,R1,0.22780000000,gasboiler,0,2030
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.38330000000,heatpump,0,2030
+0,CO2f,all-week,night,2025,all-year,R1,14.73950000000,gasboiler,0,2030
+0,heat,all-week,morning,2025,all-year,R1,0.34170000000,gasboiler,1,2030
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.57500000000,heatpump,1,2030
+0,CO2f,all-week,morning,2025,all-year,R1,22.10920000000,gasboiler,1,2030
+0,heat,all-week,afternoon,2025,all-year,R1,0.22780000000,gasboiler,2,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.38330000000,heatpump,2,2030
+0,CO2f,all-week,afternoon,2025,all-year,R1,14.73950000000,gasboiler,2,2030
+0,heat,all-week,early-peak,2025,all-year,R1,0.34170000000,gasboiler,3,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.57500000000,heatpump,3,2030
+0,CO2f,all-week,early-peak,2025,all-year,R1,22.10920000000,gasboiler,3,2030
+0,heat,all-week,late-peak,2025,all-year,R1,0.68330000000,gasboiler,4,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.15000000000,heatpump,4,2030
+0,CO2f,all-week,late-peak,2025,all-year,R1,44.21850000000,gasboiler,4,2030
+0,heat,all-week,evening,2025,all-year,R1,0.45560000000,gasboiler,5,2030
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,0.76670000000,heatpump,5,2030
+0,CO2f,all-week,evening,2025,all-year,R1,29.47900000000,gasboiler,5,2030
+0,heat,all-week,night,2025,all-year,R1,0.22780000000,gasboiler,0,2035
+2,heat,all-week,night,2025,all-year,R1,0.38330000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2035
+0,CO2f,all-week,night,2025,all-year,R1,14.73950000000,gasboiler,0,2035
+0,heat,all-week,morning,2025,all-year,R1,0.34170000000,gasboiler,1,2035
+2,heat,all-week,morning,2025,all-year,R1,0.57500000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2035
+0,CO2f,all-week,morning,2025,all-year,R1,22.10920000000,gasboiler,1,2035
+0,heat,all-week,afternoon,2025,all-year,R1,0.22780000000,gasboiler,2,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.38330000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2035
+0,CO2f,all-week,afternoon,2025,all-year,R1,14.73950000000,gasboiler,2,2035
+0,heat,all-week,early-peak,2025,all-year,R1,0.34170000000,gasboiler,3,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.57500000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2035
+0,CO2f,all-week,early-peak,2025,all-year,R1,22.10920000000,gasboiler,3,2035
+0,heat,all-week,late-peak,2025,all-year,R1,0.68330000000,gasboiler,4,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.15000000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2035
+0,CO2f,all-week,late-peak,2025,all-year,R1,44.21850000000,gasboiler,4,2035
+0,heat,all-week,evening,2025,all-year,R1,0.45560000000,gasboiler,5,2035
+2,heat,all-week,evening,2025,all-year,R1,0.76670000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2035
+0,CO2f,all-week,evening,2025,all-year,R1,29.47900000000,gasboiler,5,2035
+0,heat,all-week,night,2035,all-year,R1,0.05060000000,gasboiler,0,2040
+1,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2040
+2,heat,all-week,night,2035,all-year,R1,0.89390000000,heatpump,0,2040
+0,CO2f,all-week,night,2035,all-year,R1,3.27140000000,gasboiler,0,2040
+0,heat,all-week,morning,2035,all-year,R1,0.07580000000,gasboiler,1,2040
+1,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2040
+2,heat,all-week,morning,2035,all-year,R1,1.34080000000,heatpump,1,2040
+0,CO2f,all-week,morning,2035,all-year,R1,4.90720000000,gasboiler,1,2040
+0,heat,all-week,afternoon,2035,all-year,R1,0.05060000000,gasboiler,2,2040
+1,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2040
+2,heat,all-week,afternoon,2035,all-year,R1,0.89390000000,heatpump,2,2040
+0,CO2f,all-week,afternoon,2035,all-year,R1,3.27140000000,gasboiler,2,2040
+0,heat,all-week,early-peak,2035,all-year,R1,0.07580000000,gasboiler,3,2040
+1,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2040
+2,heat,all-week,early-peak,2035,all-year,R1,1.34080000000,heatpump,3,2040
+0,CO2f,all-week,early-peak,2035,all-year,R1,4.90720000000,gasboiler,3,2040
+0,heat,all-week,late-peak,2035,all-year,R1,0.15170000000,gasboiler,4,2040
+1,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2040
+2,heat,all-week,late-peak,2035,all-year,R1,2.68170000000,heatpump,4,2040
+0,CO2f,all-week,late-peak,2035,all-year,R1,9.81430000000,gasboiler,4,2040
+0,heat,all-week,evening,2035,all-year,R1,0.10110000000,gasboiler,5,2040
+1,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2040
+2,heat,all-week,evening,2035,all-year,R1,1.78780000000,heatpump,5,2040
+0,CO2f,all-week,evening,2035,all-year,R1,6.54290000000,gasboiler,5,2040
+0,heat,all-week,night,2035,all-year,R1,0.05060000000,gasboiler,0,2045
+1,heat,all-week,night,2035,all-year,R1,0.89390000000,heatpump,0,2045
+2,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2045
+0,CO2f,all-week,night,2035,all-year,R1,3.27140000000,gasboiler,0,2045
+0,heat,all-week,morning,2035,all-year,R1,0.07580000000,gasboiler,1,2045
+1,heat,all-week,morning,2035,all-year,R1,1.34080000000,heatpump,1,2045
+2,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2045
+0,CO2f,all-week,morning,2035,all-year,R1,4.90720000000,gasboiler,1,2045
+0,heat,all-week,afternoon,2035,all-year,R1,0.05060000000,gasboiler,2,2045
+1,heat,all-week,afternoon,2035,all-year,R1,0.89390000000,heatpump,2,2045
+2,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2045
+0,CO2f,all-week,afternoon,2035,all-year,R1,3.27140000000,gasboiler,2,2045
+0,heat,all-week,early-peak,2035,all-year,R1,0.07580000000,gasboiler,3,2045
+1,heat,all-week,early-peak,2035,all-year,R1,1.34080000000,heatpump,3,2045
+2,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2045
+0,CO2f,all-week,early-peak,2035,all-year,R1,4.90720000000,gasboiler,3,2045
+0,heat,all-week,late-peak,2035,all-year,R1,0.15170000000,gasboiler,4,2045
+1,heat,all-week,late-peak,2035,all-year,R1,2.68170000000,heatpump,4,2045
+2,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2045
+0,CO2f,all-week,late-peak,2035,all-year,R1,9.81430000000,gasboiler,4,2045
+0,heat,all-week,evening,2035,all-year,R1,0.10110000000,gasboiler,5,2045
+1,heat,all-week,evening,2035,all-year,R1,1.78780000000,heatpump,5,2045
+2,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2045
+0,CO2f,all-week,evening,2035,all-year,R1,6.54290000000,gasboiler,5,2045
+2,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2050
+3,heat,all-week,night,2045,all-year,R1,1.27780000000,heatpump,0,2050
+2,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2050
+3,heat,all-week,morning,2045,all-year,R1,1.91670000000,heatpump,1,2050
+2,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2050
+3,heat,all-week,afternoon,2045,all-year,R1,1.27780000000,heatpump,2,2050
+2,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2050
+3,heat,all-week,early-peak,2045,all-year,R1,1.91670000000,heatpump,3,2050
+2,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2050
+3,heat,all-week,late-peak,2045,all-year,R1,3.83330000000,heatpump,4,2050
+2,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2050
+3,heat,all-week,evening,2045,all-year,R1,2.55560000000,heatpump,5,2050
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2020.csv b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2025.csv b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
deleted file mode 100644
index bfe116d0b..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2030.csv b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
deleted file mode 100644
index 82873caab..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
-0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2035.csv b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
deleted file mode 100644
index 741ea3c65..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
-5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2040.csv b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
deleted file mode 100644
index c802f3409..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
-0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
-5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2045.csv b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
deleted file mode 100644
index c7be86b20..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
-0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2050.csv b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
deleted file mode 100644
index 8c1871538..000000000
--- a/tests/example_outputs/default_retro/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity.csv b/tests/example_outputs/default_timeslice/Gas/Capacity.csv
new file mode 100644
index 000000000..b53fa2b48
--- /dev/null
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity.csv
@@ -0,0 +1,4 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,15.00000000000,2020,R1,gassupply1,2025
+0,7.50000000000,2020,R1,gassupply1,2030
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
deleted file mode 100644
index d1ee882b2..000000000
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity.csv b/tests/example_outputs/default_timeslice/Power/Capacity.csv
new file mode 100644
index 000000000..48c981a8d
--- /dev/null
+++ b/tests/example_outputs/default_timeslice/Power/Capacity.csv
@@ -0,0 +1,23 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,1,2020,R1,gasCCGT,2025
+1,1,2020,R1,windturbine,2025
+1,1,2020,R1,windturbine,2030
+2,1,2025,R1,windturbine,2030
+1,1,2020,R1,windturbine,2035
+2,1,2025,R1,windturbine,2035
+3,2,2030,R1,windturbine,2035
+1,1,2020,R1,windturbine,2040
+2,1,2025,R1,windturbine,2040
+3,2,2030,R1,windturbine,2040
+4,2,2035,R1,windturbine,2040
+1,1,2020,R1,windturbine,2045
+2,1,2025,R1,windturbine,2045
+3,2,2030,R1,windturbine,2045
+4,2,2035,R1,windturbine,2045
+5,2,2040,R1,windturbine,2045
+2,1,2025,R1,windturbine,2050
+3,2,2030,R1,windturbine,2050
+4,2,2035,R1,windturbine,2050
+5,2,2040,R1,windturbine,2050
+6,2,2045,R1,windturbine,2050
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv
deleted file mode 100644
index 1cdc9617a..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv
deleted file mode 100644
index cec6493c1..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv
deleted file mode 100644
index 828f0a6cd..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv
deleted file mode 100644
index 292616515..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv
deleted file mode 100644
index 0eef7b5d9..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv
deleted file mode 100644
index e9d250de6..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
-6,2050,R1,windturbine,2045,2
-6,2054,R1,windturbine,2045,2
-6,2055,R1,windturbine,2045,2
-6,2059,R1,windturbine,2045,2
-6,2060,R1,windturbine,2045,2
-6,2064,R1,windturbine,2045,2
-6,2065,R1,windturbine,2045,2
-6,2069,R1,windturbine,2045,2
-6,2070,R1,windturbine,2045,2
-6,2074,R1,windturbine,2045,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
deleted file mode 100644
index 3105095e1..000000000
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,63 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,1
-2,2035,R1,windturbine,2025,1
-2,2040,R1,windturbine,2025,1
-2,2045,R1,windturbine,2025,1
-2,2049,R1,windturbine,2025,1
-2,2050,R1,windturbine,2025,1
-2,2054,R1,windturbine,2025,1
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
-6,2050,R1,windturbine,2045,2
-6,2054,R1,windturbine,2045,2
-6,2055,R1,windturbine,2045,2
-6,2059,R1,windturbine,2045,2
-6,2060,R1,windturbine,2045,2
-6,2064,R1,windturbine,2045,2
-6,2065,R1,windturbine,2045,2
-6,2069,R1,windturbine,2045,2
-6,2070,R1,windturbine,2045,2
-6,2074,R1,windturbine,2045,2
-7,2055,R1,windturbine,2050,2
-7,2059,R1,windturbine,2050,2
-7,2060,R1,windturbine,2050,2
-7,2064,R1,windturbine,2050,2
-7,2065,R1,windturbine,2050,2
-7,2069,R1,windturbine,2050,2
-7,2070,R1,windturbine,2050,2
-7,2074,R1,windturbine,2050,2
-7,2075,R1,windturbine,2050,2
-7,2079,R1,windturbine,2050,2
diff --git a/tests/example_outputs/default_timeslice/Power/Supply.csv b/tests/example_outputs/default_timeslice/Power/Supply.csv
new file mode 100644
index 000000000..cc5f768bc
--- /dev/null
+++ b/tests/example_outputs/default_timeslice/Power/Supply.csv
@@ -0,0 +1,123 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+1,electricity,all-week,night,2020,all-year,R1,0.42220000000,windturbine,0,2025
+1,electricity,all-week,morning,2020,all-year,R1,0.63330000000,windturbine,1,2025
+1,electricity,all-week,afternoon,2020,all-year,R1,0.42220000000,windturbine,2,2025
+1,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,windturbine,3,2025
+0,electricity,all-week,late-peak,2020,all-year,R1,0.26670000000,gasCCGT,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,24.44530000000,gasCCGT,4,2025
+1,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2025
+1,electricity,all-week,evening,2020,all-year,R1,0.84440000000,windturbine,5,2025
+1,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030
+2,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030
+1,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030
+2,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030
+1,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030
+2,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030
+1,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030
+2,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030
+1,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030
+2,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030
+1,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030
+2,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030
+1,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035
+2,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035
+3,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035
+1,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035
+2,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035
+3,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035
+1,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035
+2,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035
+3,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035
+1,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035
+2,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035
+3,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035
+1,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035
+2,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035
+3,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035
+1,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035
+2,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035
+3,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035
+1,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040
+2,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040
+3,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040
+4,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040
+1,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040
+2,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040
+3,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040
+4,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040
+1,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040
+2,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040
+3,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040
+4,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040
+1,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040
+2,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040
+3,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040
+4,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040
+1,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040
+2,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040
+3,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040
+4,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040
+1,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040
+2,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040
+3,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040
+4,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040
+1,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045
+2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045
+3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045
+4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045
+5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045
+1,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045
+2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045
+3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045
+4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045
+5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045
+1,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045
+2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045
+3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045
+4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045
+5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045
+1,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045
+2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045
+3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045
+4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045
+5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045
+1,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045
+2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045
+3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045
+4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045
+5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045
+1,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045
+2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045
+3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045
+4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045
+5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045
+2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050
+3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050
+4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050
+5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050
+6,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050
+2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050
+3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050
+4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050
+5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050
+6,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050
+2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050
+3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050
+4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050
+5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050
+6,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050
+2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050
+3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050
+4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050
+5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050
+6,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050
+2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050
+3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050
+4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050
+5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050
+6,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050
+2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050
+3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050
+4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050
+5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050
+6,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
deleted file mode 100644
index 00b3f8100..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
-2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
deleted file mode 100644
index 51182e94e..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
deleted file mode 100644
index 4a52d7f1d..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
deleted file mode 100644
index def4be3b7..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
deleted file mode 100644
index f5d07646e..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
deleted file mode 100644
index dce17b90d..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
deleted file mode 100644
index df173a2f6..000000000
--- a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity.csv b/tests/example_outputs/default_timeslice/Residential/Capacity.csv
new file mode 100644
index 000000000..d5cf558f0
--- /dev/null
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+0,5,2020,R1,gasboiler,2025
+1,19,2020,R1,heatpump,2025
+1,19,2020,R1,heatpump,2030
+2,10,2025,R1,heatpump,2030
+2,10,2025,R1,heatpump,2035
+3,26,2030,R1,heatpump,2035
+3,26,2030,R1,heatpump,2040
+4,16,2035,R1,heatpump,2040
+4,16,2035,R1,heatpump,2045
+5,32,2040,R1,heatpump,2045
+5,32,2040,R1,heatpump,2050
+6,22,2045,R1,heatpump,2050
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv
deleted file mode 100644
index d6edd96cb..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv
deleted file mode 100644
index 677048eca..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv
deleted file mode 100644
index 95b724d9d..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv
deleted file mode 100644
index 33e9c12a5..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv
deleted file mode 100644
index 21be03137..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv
deleted file mode 100644
index d02c2c7f1..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
deleted file mode 100644
index 8c8e12067..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply.csv b/tests/example_outputs/default_timeslice/Residential/Supply.csv
new file mode 100644
index 000000000..520869501
--- /dev/null
+++ b/tests/example_outputs/default_timeslice/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
deleted file mode 100644
index 729d406d6..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
deleted file mode 100644
index afe86e122..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
deleted file mode 100644
index 83daf7f18..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
deleted file mode 100644
index 7bda24630..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
deleted file mode 100644
index c535c6798..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
deleted file mode 100644
index 9abfcded8..000000000
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/medium/Gas/Capacity.csv b/tests/example_outputs/medium/Gas/Capacity.csv
new file mode 100644
index 000000000..0f21ffbf8
--- /dev/null
+++ b/tests/example_outputs/medium/Gas/Capacity.csv
@@ -0,0 +1,18 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,26.63810000000,2020,R1,gassupply1,2025
+0,19.13810000000,2020,R1,gassupply1,2030
+1,12.51020000000,2025,R1,gassupply1,2030
+0,11.63810000000,2020,R1,gassupply1,2035
+1,12.51020000000,2025,R1,gassupply1,2035
+2,10.02210000000,2030,R1,gassupply1,2035
+0,11.63810000000,2020,R1,gassupply1,2040
+1,12.51020000000,2025,R1,gassupply1,2040
+2,10.02210000000,2030,R1,gassupply1,2040
+0,11.63810000000,2020,R1,gassupply1,2045
+1,12.51020000000,2025,R1,gassupply1,2045
+2,10.02210000000,2030,R1,gassupply1,2045
+0,11.63810000000,2020,R1,gassupply1,2050
+1,12.51020000000,2025,R1,gassupply1,2050
+2,10.02210000000,2030,R1,gassupply1,2050
+3,0.88640000000,2045,R1,gassupply1,2050
diff --git a/tests/example_outputs/medium/Gas/Capacity/2020.csv b/tests/example_outputs/medium/Gas/Capacity/2020.csv
deleted file mode 100644
index 8a8b3f8a1..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2025.csv b/tests/example_outputs/medium/Gas/Capacity/2025.csv
deleted file mode 100644
index db744d49d..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
-1,2030,R1,gassupply1,2025,12.51020000000
-1,2035,R1,gassupply1,2025,12.51020000000
-1,2040,R1,gassupply1,2025,12.51020000000
-1,2045,R1,gassupply1,2025,12.51020000000
-1,2050,R1,gassupply1,2025,12.51020000000
-1,2059,R1,gassupply1,2025,12.51020000000
-1,2060,R1,gassupply1,2025,12.51020000000
-1,2064,R1,gassupply1,2025,12.51020000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2030.csv b/tests/example_outputs/medium/Gas/Capacity/2030.csv
deleted file mode 100644
index acc1a01a8..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
-1,2030,R1,gassupply1,2025,12.51020000000
-1,2035,R1,gassupply1,2025,12.51020000000
-1,2040,R1,gassupply1,2025,12.51020000000
-1,2045,R1,gassupply1,2025,12.51020000000
-1,2050,R1,gassupply1,2025,12.51020000000
-1,2059,R1,gassupply1,2025,12.51020000000
-1,2060,R1,gassupply1,2025,12.51020000000
-1,2064,R1,gassupply1,2025,12.51020000000
-2,2035,R1,gassupply1,2030,10.02210000000
-2,2040,R1,gassupply1,2030,10.02210000000
-2,2045,R1,gassupply1,2030,10.02210000000
-2,2050,R1,gassupply1,2030,10.02210000000
-2,2059,R1,gassupply1,2030,10.02210000000
-2,2060,R1,gassupply1,2030,10.02210000000
-2,2064,R1,gassupply1,2030,10.02210000000
-2,2065,R1,gassupply1,2030,10.02210000000
-2,2069,R1,gassupply1,2030,10.02210000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2035.csv b/tests/example_outputs/medium/Gas/Capacity/2035.csv
deleted file mode 100644
index acc1a01a8..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
-1,2030,R1,gassupply1,2025,12.51020000000
-1,2035,R1,gassupply1,2025,12.51020000000
-1,2040,R1,gassupply1,2025,12.51020000000
-1,2045,R1,gassupply1,2025,12.51020000000
-1,2050,R1,gassupply1,2025,12.51020000000
-1,2059,R1,gassupply1,2025,12.51020000000
-1,2060,R1,gassupply1,2025,12.51020000000
-1,2064,R1,gassupply1,2025,12.51020000000
-2,2035,R1,gassupply1,2030,10.02210000000
-2,2040,R1,gassupply1,2030,10.02210000000
-2,2045,R1,gassupply1,2030,10.02210000000
-2,2050,R1,gassupply1,2030,10.02210000000
-2,2059,R1,gassupply1,2030,10.02210000000
-2,2060,R1,gassupply1,2030,10.02210000000
-2,2064,R1,gassupply1,2030,10.02210000000
-2,2065,R1,gassupply1,2030,10.02210000000
-2,2069,R1,gassupply1,2030,10.02210000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2040.csv b/tests/example_outputs/medium/Gas/Capacity/2040.csv
deleted file mode 100644
index acc1a01a8..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
-1,2030,R1,gassupply1,2025,12.51020000000
-1,2035,R1,gassupply1,2025,12.51020000000
-1,2040,R1,gassupply1,2025,12.51020000000
-1,2045,R1,gassupply1,2025,12.51020000000
-1,2050,R1,gassupply1,2025,12.51020000000
-1,2059,R1,gassupply1,2025,12.51020000000
-1,2060,R1,gassupply1,2025,12.51020000000
-1,2064,R1,gassupply1,2025,12.51020000000
-2,2035,R1,gassupply1,2030,10.02210000000
-2,2040,R1,gassupply1,2030,10.02210000000
-2,2045,R1,gassupply1,2030,10.02210000000
-2,2050,R1,gassupply1,2030,10.02210000000
-2,2059,R1,gassupply1,2030,10.02210000000
-2,2060,R1,gassupply1,2030,10.02210000000
-2,2064,R1,gassupply1,2030,10.02210000000
-2,2065,R1,gassupply1,2030,10.02210000000
-2,2069,R1,gassupply1,2030,10.02210000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2045.csv b/tests/example_outputs/medium/Gas/Capacity/2045.csv
deleted file mode 100644
index 8b2b6cb95..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
-1,2030,R1,gassupply1,2025,12.51020000000
-1,2035,R1,gassupply1,2025,12.51020000000
-1,2040,R1,gassupply1,2025,12.51020000000
-1,2045,R1,gassupply1,2025,12.51020000000
-1,2050,R1,gassupply1,2025,12.51020000000
-1,2059,R1,gassupply1,2025,12.51020000000
-1,2060,R1,gassupply1,2025,12.51020000000
-1,2064,R1,gassupply1,2025,12.51020000000
-2,2035,R1,gassupply1,2030,10.02210000000
-2,2040,R1,gassupply1,2030,10.02210000000
-2,2045,R1,gassupply1,2030,10.02210000000
-2,2050,R1,gassupply1,2030,10.02210000000
-2,2059,R1,gassupply1,2030,10.02210000000
-2,2060,R1,gassupply1,2030,10.02210000000
-2,2064,R1,gassupply1,2030,10.02210000000
-2,2065,R1,gassupply1,2030,10.02210000000
-2,2069,R1,gassupply1,2030,10.02210000000
-3,2050,R1,gassupply1,2045,0.88640000000
-3,2059,R1,gassupply1,2045,0.88640000000
-3,2060,R1,gassupply1,2045,0.88640000000
-3,2064,R1,gassupply1,2045,0.88640000000
-3,2065,R1,gassupply1,2045,0.88640000000
-3,2069,R1,gassupply1,2045,0.88640000000
-3,2070,R1,gassupply1,2045,0.88640000000
-3,2084,R1,gassupply1,2045,0.88640000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2050.csv b/tests/example_outputs/medium/Gas/Capacity/2050.csv
deleted file mode 100644
index 8b2b6cb95..000000000
--- a/tests/example_outputs/medium/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,26.63810000000
-0,2030,R1,gassupply1,2020,19.13810000000
-0,2035,R1,gassupply1,2020,11.63810000000
-0,2040,R1,gassupply1,2020,11.63810000000
-0,2045,R1,gassupply1,2020,11.63810000000
-0,2050,R1,gassupply1,2020,11.63810000000
-0,2059,R1,gassupply1,2020,11.63810000000
-1,2030,R1,gassupply1,2025,12.51020000000
-1,2035,R1,gassupply1,2025,12.51020000000
-1,2040,R1,gassupply1,2025,12.51020000000
-1,2045,R1,gassupply1,2025,12.51020000000
-1,2050,R1,gassupply1,2025,12.51020000000
-1,2059,R1,gassupply1,2025,12.51020000000
-1,2060,R1,gassupply1,2025,12.51020000000
-1,2064,R1,gassupply1,2025,12.51020000000
-2,2035,R1,gassupply1,2030,10.02210000000
-2,2040,R1,gassupply1,2030,10.02210000000
-2,2045,R1,gassupply1,2030,10.02210000000
-2,2050,R1,gassupply1,2030,10.02210000000
-2,2059,R1,gassupply1,2030,10.02210000000
-2,2060,R1,gassupply1,2030,10.02210000000
-2,2064,R1,gassupply1,2030,10.02210000000
-2,2065,R1,gassupply1,2030,10.02210000000
-2,2069,R1,gassupply1,2030,10.02210000000
-3,2050,R1,gassupply1,2045,0.88640000000
-3,2059,R1,gassupply1,2045,0.88640000000
-3,2060,R1,gassupply1,2045,0.88640000000
-3,2064,R1,gassupply1,2045,0.88640000000
-3,2065,R1,gassupply1,2045,0.88640000000
-3,2069,R1,gassupply1,2045,0.88640000000
-3,2070,R1,gassupply1,2045,0.88640000000
-3,2084,R1,gassupply1,2045,0.88640000000
diff --git a/tests/example_outputs/medium/Power/Capacity.csv b/tests/example_outputs/medium/Power/Capacity.csv
new file mode 100644
index 000000000..5755ef966
--- /dev/null
+++ b/tests/example_outputs/medium/Power/Capacity.csv
@@ -0,0 +1,18 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,1,2020,R1,gasCCGT,2025
+1,3,2025,R1,gasCCGT,2030
+1,3,2025,R1,gasCCGT,2035
+3,4,2030,R1,windturbine,2035
+1,3,2025,R1,gasCCGT,2040
+3,4,2030,R1,windturbine,2040
+4,10,2035,R1,windturbine,2040
+1,3,2025,R1,gasCCGT,2045
+3,4,2030,R1,windturbine,2045
+4,10,2035,R1,windturbine,2045
+5,3,2040,R1,windturbine,2045
+1,3,2025,R1,gasCCGT,2050
+3,4,2030,R1,windturbine,2050
+4,10,2035,R1,windturbine,2050
+5,3,2040,R1,windturbine,2050
+6,3,2045,R1,windturbine,2050
diff --git a/tests/example_outputs/medium/Power/Capacity/2020.csv b/tests/example_outputs/medium/Power/Capacity/2020.csv
deleted file mode 100644
index c4df69fe1..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
diff --git a/tests/example_outputs/medium/Power/Capacity/2025.csv b/tests/example_outputs/medium/Power/Capacity/2025.csv
deleted file mode 100644
index d90c52127..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2030.csv b/tests/example_outputs/medium/Power/Capacity/2030.csv
deleted file mode 100644
index 1e85f362d..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-2,2035,R1,windturbine,2030,4
-2,2040,R1,windturbine,2030,4
-2,2045,R1,windturbine,2030,4
-2,2050,R1,windturbine,2030,4
-2,2059,R1,windturbine,2030,4
diff --git a/tests/example_outputs/medium/Power/Capacity/2035.csv b/tests/example_outputs/medium/Power/Capacity/2035.csv
deleted file mode 100644
index d99ccb910..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-3,2035,R1,windturbine,2030,4
-3,2040,R1,windturbine,2030,4
-3,2045,R1,windturbine,2030,4
-3,2050,R1,windturbine,2030,4
-3,2059,R1,windturbine,2030,4
-4,2040,R1,windturbine,2035,10
-4,2045,R1,windturbine,2035,10
-4,2050,R1,windturbine,2035,10
-4,2059,R1,windturbine,2035,10
-4,2060,R1,windturbine,2035,10
-4,2064,R1,windturbine,2035,10
diff --git a/tests/example_outputs/medium/Power/Capacity/2040.csv b/tests/example_outputs/medium/Power/Capacity/2040.csv
deleted file mode 100644
index 7a731b841..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-3,2035,R1,windturbine,2030,4
-3,2040,R1,windturbine,2030,4
-3,2045,R1,windturbine,2030,4
-3,2050,R1,windturbine,2030,4
-3,2059,R1,windturbine,2030,4
-4,2040,R1,windturbine,2035,10
-4,2045,R1,windturbine,2035,10
-4,2050,R1,windturbine,2035,10
-4,2059,R1,windturbine,2035,10
-4,2060,R1,windturbine,2035,10
-4,2064,R1,windturbine,2035,10
-5,2045,R1,windturbine,2040,3
-5,2050,R1,windturbine,2040,3
-5,2059,R1,windturbine,2040,3
-5,2060,R1,windturbine,2040,3
-5,2064,R1,windturbine,2040,3
-5,2065,R1,windturbine,2040,3
-5,2069,R1,windturbine,2040,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2045.csv b/tests/example_outputs/medium/Power/Capacity/2045.csv
deleted file mode 100644
index b298ac216..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-3,2035,R1,windturbine,2030,4
-3,2040,R1,windturbine,2030,4
-3,2045,R1,windturbine,2030,4
-3,2050,R1,windturbine,2030,4
-3,2059,R1,windturbine,2030,4
-4,2040,R1,windturbine,2035,10
-4,2045,R1,windturbine,2035,10
-4,2050,R1,windturbine,2035,10
-4,2059,R1,windturbine,2035,10
-4,2060,R1,windturbine,2035,10
-4,2064,R1,windturbine,2035,10
-5,2045,R1,windturbine,2040,3
-5,2050,R1,windturbine,2040,3
-5,2059,R1,windturbine,2040,3
-5,2060,R1,windturbine,2040,3
-5,2064,R1,windturbine,2040,3
-5,2065,R1,windturbine,2040,3
-5,2069,R1,windturbine,2040,3
-6,2050,R1,windturbine,2045,3
-6,2059,R1,windturbine,2045,3
-6,2060,R1,windturbine,2045,3
-6,2064,R1,windturbine,2045,3
-6,2065,R1,windturbine,2045,3
-6,2069,R1,windturbine,2045,3
-6,2070,R1,windturbine,2045,3
-6,2074,R1,windturbine,2045,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2050.csv b/tests/example_outputs/medium/Power/Capacity/2050.csv
deleted file mode 100644
index 9a9abbdda..000000000
--- a/tests/example_outputs/medium/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2030,R1,gasCCGT,2025,3
-1,2035,R1,gasCCGT,2025,3
-1,2040,R1,gasCCGT,2025,3
-1,2045,R1,gasCCGT,2025,3
-1,2050,R1,gasCCGT,2025,3
-1,2055,R1,gasCCGT,2025,3
-1,2059,R1,gasCCGT,2025,3
-1,2060,R1,gasCCGT,2025,3
-1,2064,R1,gasCCGT,2025,3
-3,2035,R1,windturbine,2030,4
-3,2040,R1,windturbine,2030,4
-3,2045,R1,windturbine,2030,4
-3,2050,R1,windturbine,2030,4
-3,2055,R1,windturbine,2030,4
-3,2059,R1,windturbine,2030,4
-4,2040,R1,windturbine,2035,10
-4,2045,R1,windturbine,2035,10
-4,2050,R1,windturbine,2035,10
-4,2055,R1,windturbine,2035,10
-4,2059,R1,windturbine,2035,10
-4,2060,R1,windturbine,2035,10
-4,2064,R1,windturbine,2035,10
-5,2045,R1,windturbine,2040,3
-5,2050,R1,windturbine,2040,3
-5,2055,R1,windturbine,2040,3
-5,2059,R1,windturbine,2040,3
-5,2060,R1,windturbine,2040,3
-5,2064,R1,windturbine,2040,3
-5,2065,R1,windturbine,2040,3
-5,2069,R1,windturbine,2040,3
-6,2050,R1,windturbine,2045,3
-6,2055,R1,windturbine,2045,3
-6,2059,R1,windturbine,2045,3
-6,2060,R1,windturbine,2045,3
-6,2064,R1,windturbine,2045,3
-6,2065,R1,windturbine,2045,3
-6,2069,R1,windturbine,2045,3
-6,2070,R1,windturbine,2045,3
-6,2074,R1,windturbine,2045,3
diff --git a/tests/example_outputs/medium/Residential/Capacity.csv b/tests/example_outputs/medium/Residential/Capacity.csv
new file mode 100644
index 000000000..09cfd7d6d
--- /dev/null
+++ b/tests/example_outputs/medium/Residential/Capacity.csv
@@ -0,0 +1,28 @@
+asset,capacity,installed,region,technology,year
+0,10,2020,R1,gasboiler,2020
+1,10,2020,R1,gasstove,2020
+0,8,2020,R1,gasboiler,2025
+2,12,2020,R1,gasstove,2025
+4,4,2020,R1,heatpump,2025
+1,7,2025,R1,gasboiler,2030
+2,4,2020,R1,gasstove,2030
+3,11,2025,R1,gasstove,2030
+5,4,2020,R1,heatpump,2030
+6,4,2025,R1,heatpump,2030
+1,7,2025,R1,gasboiler,2035
+3,11,2025,R1,gasstove,2035
+4,7,2030,R1,gasstove,2035
+7,4,2025,R1,heatpump,2035
+8,7,2030,R1,heatpump,2035
+4,7,2030,R1,gasstove,2040
+5,14,2035,R1,gasstove,2040
+9,7,2030,R1,heatpump,2040
+10,14,2035,R1,heatpump,2040
+5,14,2035,R1,gasstove,2045
+6,10,2040,R1,gasstove,2045
+11,14,2035,R1,heatpump,2045
+12,10,2040,R1,heatpump,2045
+6,10,2040,R1,gasstove,2050
+7,17,2045,R1,gasstove,2050
+13,10,2040,R1,heatpump,2050
+14,17,2045,R1,heatpump,2050
diff --git a/tests/example_outputs/medium/Residential/Capacity/2020.csv b/tests/example_outputs/medium/Residential/Capacity/2020.csv
deleted file mode 100644
index 3d4e71d74..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2020,R1,gasstove,2020,10
-1,2025,R1,gasstove,2020,12
-1,2030,R1,gasstove,2020,4
-1,2034,R1,gasstove,2020,4
-2,2025,R1,heatpump,2020,4
-2,2030,R1,heatpump,2020,4
-2,2034,R1,heatpump,2020,4
diff --git a/tests/example_outputs/medium/Residential/Capacity/2025.csv b/tests/example_outputs/medium/Residential/Capacity/2025.csv
deleted file mode 100644
index 6334d8f90..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2030,R1,gasboiler,2025,7
-1,2034,R1,gasboiler,2025,7
-1,2035,R1,gasboiler,2025,7
-1,2039,R1,gasboiler,2025,7
-2,2020,R1,gasstove,2020,10
-2,2025,R1,gasstove,2020,12
-2,2030,R1,gasstove,2020,4
-2,2034,R1,gasstove,2020,4
-3,2030,R1,gasstove,2025,11
-3,2034,R1,gasstove,2025,11
-3,2035,R1,gasstove,2025,11
-3,2039,R1,gasstove,2025,11
-4,2025,R1,heatpump,2020,4
-4,2030,R1,heatpump,2020,4
-4,2034,R1,heatpump,2020,4
-5,2030,R1,heatpump,2025,4
-5,2034,R1,heatpump,2025,4
-5,2035,R1,heatpump,2025,4
-5,2039,R1,heatpump,2025,4
diff --git a/tests/example_outputs/medium/Residential/Capacity/2030.csv b/tests/example_outputs/medium/Residential/Capacity/2030.csv
deleted file mode 100644
index 0469b7902..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2030,R1,gasboiler,2025,7
-1,2034,R1,gasboiler,2025,7
-1,2035,R1,gasboiler,2025,7
-1,2039,R1,gasboiler,2025,7
-2,2020,R1,gasstove,2020,10
-2,2025,R1,gasstove,2020,12
-2,2030,R1,gasstove,2020,4
-2,2034,R1,gasstove,2020,4
-3,2030,R1,gasstove,2025,11
-3,2034,R1,gasstove,2025,11
-3,2035,R1,gasstove,2025,11
-3,2039,R1,gasstove,2025,11
-4,2035,R1,gasstove,2030,7
-4,2039,R1,gasstove,2030,7
-4,2040,R1,gasstove,2030,7
-4,2044,R1,gasstove,2030,7
-5,2025,R1,heatpump,2020,4
-5,2030,R1,heatpump,2020,4
-5,2034,R1,heatpump,2020,4
-6,2030,R1,heatpump,2025,4
-6,2034,R1,heatpump,2025,4
-6,2035,R1,heatpump,2025,4
-6,2039,R1,heatpump,2025,4
-7,2035,R1,heatpump,2030,7
-7,2039,R1,heatpump,2030,7
-7,2040,R1,heatpump,2030,7
-7,2044,R1,heatpump,2030,7
diff --git a/tests/example_outputs/medium/Residential/Capacity/2035.csv b/tests/example_outputs/medium/Residential/Capacity/2035.csv
deleted file mode 100644
index 199c6a7bf..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,38 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2030,R1,gasboiler,2025,7
-1,2034,R1,gasboiler,2025,7
-1,2035,R1,gasboiler,2025,7
-1,2039,R1,gasboiler,2025,7
-2,2020,R1,gasstove,2020,10
-2,2025,R1,gasstove,2020,12
-2,2030,R1,gasstove,2020,4
-2,2034,R1,gasstove,2020,4
-3,2030,R1,gasstove,2025,11
-3,2034,R1,gasstove,2025,11
-3,2035,R1,gasstove,2025,11
-3,2039,R1,gasstove,2025,11
-4,2035,R1,gasstove,2030,7
-4,2039,R1,gasstove,2030,7
-4,2040,R1,gasstove,2030,7
-4,2044,R1,gasstove,2030,7
-5,2040,R1,gasstove,2035,14
-5,2044,R1,gasstove,2035,14
-5,2045,R1,gasstove,2035,14
-5,2049,R1,gasstove,2035,14
-6,2025,R1,heatpump,2020,4
-6,2030,R1,heatpump,2020,4
-6,2034,R1,heatpump,2020,4
-7,2030,R1,heatpump,2025,4
-7,2034,R1,heatpump,2025,4
-7,2035,R1,heatpump,2025,4
-7,2039,R1,heatpump,2025,4
-8,2035,R1,heatpump,2030,7
-8,2039,R1,heatpump,2030,7
-8,2040,R1,heatpump,2030,7
-8,2044,R1,heatpump,2030,7
-9,2040,R1,heatpump,2035,14
-9,2044,R1,heatpump,2035,14
-9,2045,R1,heatpump,2035,14
-9,2049,R1,heatpump,2035,14
diff --git a/tests/example_outputs/medium/Residential/Capacity/2040.csv b/tests/example_outputs/medium/Residential/Capacity/2040.csv
deleted file mode 100644
index 0d25364c8..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2030,R1,gasboiler,2025,7
-1,2034,R1,gasboiler,2025,7
-1,2035,R1,gasboiler,2025,7
-1,2039,R1,gasboiler,2025,7
-2,2020,R1,gasstove,2020,10
-2,2025,R1,gasstove,2020,12
-2,2030,R1,gasstove,2020,4
-2,2034,R1,gasstove,2020,4
-3,2030,R1,gasstove,2025,11
-3,2034,R1,gasstove,2025,11
-3,2035,R1,gasstove,2025,11
-3,2039,R1,gasstove,2025,11
-4,2035,R1,gasstove,2030,7
-4,2039,R1,gasstove,2030,7
-4,2040,R1,gasstove,2030,7
-4,2044,R1,gasstove,2030,7
-5,2040,R1,gasstove,2035,14
-5,2044,R1,gasstove,2035,14
-5,2045,R1,gasstove,2035,14
-5,2049,R1,gasstove,2035,14
-6,2045,R1,gasstove,2040,10
-6,2049,R1,gasstove,2040,10
-6,2050,R1,gasstove,2040,10
-6,2054,R1,gasstove,2040,10
-7,2025,R1,heatpump,2020,4
-7,2030,R1,heatpump,2020,4
-7,2034,R1,heatpump,2020,4
-8,2030,R1,heatpump,2025,4
-8,2034,R1,heatpump,2025,4
-8,2035,R1,heatpump,2025,4
-8,2039,R1,heatpump,2025,4
-9,2035,R1,heatpump,2030,7
-9,2039,R1,heatpump,2030,7
-9,2040,R1,heatpump,2030,7
-9,2044,R1,heatpump,2030,7
-10,2040,R1,heatpump,2035,14
-10,2044,R1,heatpump,2035,14
-10,2045,R1,heatpump,2035,14
-10,2049,R1,heatpump,2035,14
-11,2045,R1,heatpump,2040,10
-11,2049,R1,heatpump,2040,10
-11,2050,R1,heatpump,2040,10
-11,2054,R1,heatpump,2040,10
diff --git a/tests/example_outputs/medium/Residential/Capacity/2045.csv b/tests/example_outputs/medium/Residential/Capacity/2045.csv
deleted file mode 100644
index 7b6fe12d4..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,54 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2030,R1,gasboiler,2025,7
-1,2034,R1,gasboiler,2025,7
-1,2035,R1,gasboiler,2025,7
-1,2039,R1,gasboiler,2025,7
-2,2020,R1,gasstove,2020,10
-2,2025,R1,gasstove,2020,12
-2,2030,R1,gasstove,2020,4
-2,2034,R1,gasstove,2020,4
-3,2030,R1,gasstove,2025,11
-3,2034,R1,gasstove,2025,11
-3,2035,R1,gasstove,2025,11
-3,2039,R1,gasstove,2025,11
-4,2035,R1,gasstove,2030,7
-4,2039,R1,gasstove,2030,7
-4,2040,R1,gasstove,2030,7
-4,2044,R1,gasstove,2030,7
-5,2040,R1,gasstove,2035,14
-5,2044,R1,gasstove,2035,14
-5,2045,R1,gasstove,2035,14
-5,2049,R1,gasstove,2035,14
-6,2045,R1,gasstove,2040,10
-6,2049,R1,gasstove,2040,10
-6,2050,R1,gasstove,2040,10
-6,2054,R1,gasstove,2040,10
-7,2050,R1,gasstove,2045,17
-7,2054,R1,gasstove,2045,17
-7,2055,R1,gasstove,2045,17
-7,2059,R1,gasstove,2045,17
-8,2025,R1,heatpump,2020,4
-8,2030,R1,heatpump,2020,4
-8,2034,R1,heatpump,2020,4
-9,2030,R1,heatpump,2025,4
-9,2034,R1,heatpump,2025,4
-9,2035,R1,heatpump,2025,4
-9,2039,R1,heatpump,2025,4
-10,2035,R1,heatpump,2030,7
-10,2039,R1,heatpump,2030,7
-10,2040,R1,heatpump,2030,7
-10,2044,R1,heatpump,2030,7
-11,2040,R1,heatpump,2035,14
-11,2044,R1,heatpump,2035,14
-11,2045,R1,heatpump,2035,14
-11,2049,R1,heatpump,2035,14
-12,2045,R1,heatpump,2040,10
-12,2049,R1,heatpump,2040,10
-12,2050,R1,heatpump,2040,10
-12,2054,R1,heatpump,2040,10
-13,2050,R1,heatpump,2045,17
-13,2054,R1,heatpump,2045,17
-13,2055,R1,heatpump,2045,17
-13,2059,R1,heatpump,2045,17
diff --git a/tests/example_outputs/medium/Residential/Capacity/2050.csv b/tests/example_outputs/medium/Residential/Capacity/2050.csv
deleted file mode 100644
index 8d6ad08b4..000000000
--- a/tests/example_outputs/medium/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,62 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,8
-1,2030,R1,gasboiler,2025,7
-1,2034,R1,gasboiler,2025,7
-1,2035,R1,gasboiler,2025,7
-1,2039,R1,gasboiler,2025,7
-2,2020,R1,gasstove,2020,10
-2,2025,R1,gasstove,2020,12
-2,2030,R1,gasstove,2020,4
-2,2034,R1,gasstove,2020,4
-3,2030,R1,gasstove,2025,11
-3,2034,R1,gasstove,2025,11
-3,2035,R1,gasstove,2025,11
-3,2039,R1,gasstove,2025,11
-4,2035,R1,gasstove,2030,7
-4,2039,R1,gasstove,2030,7
-4,2040,R1,gasstove,2030,7
-4,2044,R1,gasstove,2030,7
-5,2040,R1,gasstove,2035,14
-5,2044,R1,gasstove,2035,14
-5,2045,R1,gasstove,2035,14
-5,2049,R1,gasstove,2035,14
-6,2045,R1,gasstove,2040,10
-6,2049,R1,gasstove,2040,10
-6,2050,R1,gasstove,2040,10
-6,2054,R1,gasstove,2040,10
-7,2050,R1,gasstove,2045,17
-7,2054,R1,gasstove,2045,17
-7,2055,R1,gasstove,2045,17
-7,2059,R1,gasstove,2045,17
-8,2055,R1,gasstove,2050,10
-8,2059,R1,gasstove,2050,10
-8,2060,R1,gasstove,2050,10
-8,2064,R1,gasstove,2050,10
-9,2025,R1,heatpump,2020,4
-9,2030,R1,heatpump,2020,4
-9,2034,R1,heatpump,2020,4
-10,2030,R1,heatpump,2025,4
-10,2034,R1,heatpump,2025,4
-10,2035,R1,heatpump,2025,4
-10,2039,R1,heatpump,2025,4
-11,2035,R1,heatpump,2030,7
-11,2039,R1,heatpump,2030,7
-11,2040,R1,heatpump,2030,7
-11,2044,R1,heatpump,2030,7
-12,2040,R1,heatpump,2035,14
-12,2044,R1,heatpump,2035,14
-12,2045,R1,heatpump,2035,14
-12,2049,R1,heatpump,2035,14
-13,2045,R1,heatpump,2040,10
-13,2049,R1,heatpump,2040,10
-13,2050,R1,heatpump,2040,10
-13,2054,R1,heatpump,2040,10
-14,2050,R1,heatpump,2045,17
-14,2054,R1,heatpump,2045,17
-14,2055,R1,heatpump,2045,17
-14,2059,R1,heatpump,2045,17
-15,2055,R1,heatpump,2050,10
-15,2059,R1,heatpump,2050,10
-15,2060,R1,heatpump,2050,10
-15,2064,R1,heatpump,2050,10
diff --git a/tests/example_outputs/medium/Residential/Supply.csv b/tests/example_outputs/medium/Residential/Supply.csv
new file mode 100644
index 000000000..38b5ab15b
--- /dev/null
+++ b/tests/example_outputs/medium/Residential/Supply.csv
@@ -0,0 +1,187 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,CO2f,all-week,night,2020,all-year,R1,32.35290000000,gasboiler,0,2020
+1,cook,all-week,night,2020,all-year,R1,0.50000000000,gasstove,0,2020
+0,heat,all-week,night,2020,all-year,R1,0.50000000000,gasboiler,0,2020
+0,CO2f,all-week,morning,2020,all-year,R1,48.52940000000,gasboiler,1,2020
+1,cook,all-week,morning,2020,all-year,R1,0.75000000000,gasstove,1,2020
+0,heat,all-week,morning,2020,all-year,R1,0.75000000000,gasboiler,1,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,32.35290000000,gasboiler,2,2020
+1,cook,all-week,afternoon,2020,all-year,R1,0.50000000000,gasstove,2,2020
+0,heat,all-week,afternoon,2020,all-year,R1,0.50000000000,gasboiler,2,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,48.52940000000,gasboiler,3,2020
+1,cook,all-week,early-peak,2020,all-year,R1,0.75000000000,gasstove,3,2020
+0,heat,all-week,early-peak,2020,all-year,R1,0.75000000000,gasboiler,3,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,97.05880000000,gasboiler,4,2020
+1,cook,all-week,late-peak,2020,all-year,R1,1.50000000000,gasstove,4,2020
+0,heat,all-week,late-peak,2020,all-year,R1,1.50000000000,gasboiler,4,2020
+0,CO2f,all-week,evening,2020,all-year,R1,64.70590000000,gasboiler,5,2020
+1,cook,all-week,evening,2020,all-year,R1,1.00000000000,gasstove,5,2020
+0,heat,all-week,evening,2020,all-year,R1,1.00000000000,gasboiler,5,2020
+0,CO2f,all-week,night,2020,all-year,R1,28.75820000000,gasboiler,0,2025
+2,cook,all-week,night,2020,all-year,R1,0.66670000000,gasstove,0,2025
+0,heat,all-week,night,2020,all-year,R1,0.44440000000,gasboiler,0,2025
+4,heat,all-week,night,2020,all-year,R1,0.22220000000,heatpump,0,2025
+0,CO2f,all-week,morning,2020,all-year,R1,43.13730000000,gasboiler,1,2025
+2,cook,all-week,morning,2020,all-year,R1,1.00000000000,gasstove,1,2025
+0,heat,all-week,morning,2020,all-year,R1,0.66670000000,gasboiler,1,2025
+4,heat,all-week,morning,2020,all-year,R1,0.33330000000,heatpump,1,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,28.75820000000,gasboiler,2,2025
+2,cook,all-week,afternoon,2020,all-year,R1,0.66670000000,gasstove,2,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.44440000000,gasboiler,2,2025
+4,heat,all-week,afternoon,2020,all-year,R1,0.22220000000,heatpump,2,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,43.13730000000,gasboiler,3,2025
+2,cook,all-week,early-peak,2020,all-year,R1,1.00000000000,gasstove,3,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.66670000000,gasboiler,3,2025
+4,heat,all-week,early-peak,2020,all-year,R1,0.33330000000,heatpump,3,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,86.27450000000,gasboiler,4,2025
+2,cook,all-week,late-peak,2020,all-year,R1,2.00000000000,gasstove,4,2025
+0,heat,all-week,late-peak,2020,all-year,R1,1.33330000000,gasboiler,4,2025
+4,heat,all-week,late-peak,2020,all-year,R1,0.66670000000,heatpump,4,2025
+0,CO2f,all-week,evening,2020,all-year,R1,57.51630000000,gasboiler,5,2025
+2,cook,all-week,evening,2020,all-year,R1,1.33330000000,gasstove,5,2025
+0,heat,all-week,evening,2020,all-year,R1,0.88890000000,gasboiler,5,2025
+4,heat,all-week,evening,2020,all-year,R1,0.44440000000,heatpump,5,2025
+1,CO2f,all-week,night,2025,all-year,R1,25.16340000000,gasboiler,0,2030
+2,cook,all-week,night,2020,all-year,R1,0.22220000000,gasstove,0,2030
+3,cook,all-week,night,2025,all-year,R1,0.61110000000,gasstove,0,2030
+1,heat,all-week,night,2025,all-year,R1,0.38890000000,gasboiler,0,2030
+5,heat,all-week,night,2020,all-year,R1,0.22220000000,heatpump,0,2030
+6,heat,all-week,night,2025,all-year,R1,0.22220000000,heatpump,0,2030
+1,CO2f,all-week,morning,2025,all-year,R1,37.74510000000,gasboiler,1,2030
+2,cook,all-week,morning,2020,all-year,R1,0.33330000000,gasstove,1,2030
+3,cook,all-week,morning,2025,all-year,R1,0.91670000000,gasstove,1,2030
+1,heat,all-week,morning,2025,all-year,R1,0.58330000000,gasboiler,1,2030
+5,heat,all-week,morning,2020,all-year,R1,0.33330000000,heatpump,1,2030
+6,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2030
+1,CO2f,all-week,afternoon,2025,all-year,R1,25.16340000000,gasboiler,2,2030
+2,cook,all-week,afternoon,2020,all-year,R1,0.22220000000,gasstove,2,2030
+3,cook,all-week,afternoon,2025,all-year,R1,0.61110000000,gasstove,2,2030
+1,heat,all-week,afternoon,2025,all-year,R1,0.38890000000,gasboiler,2,2030
+5,heat,all-week,afternoon,2020,all-year,R1,0.22220000000,heatpump,2,2030
+6,heat,all-week,afternoon,2025,all-year,R1,0.22220000000,heatpump,2,2030
+1,CO2f,all-week,early-peak,2025,all-year,R1,37.74510000000,gasboiler,3,2030
+2,cook,all-week,early-peak,2020,all-year,R1,0.33330000000,gasstove,3,2030
+3,cook,all-week,early-peak,2025,all-year,R1,0.91670000000,gasstove,3,2030
+1,heat,all-week,early-peak,2025,all-year,R1,0.58330000000,gasboiler,3,2030
+5,heat,all-week,early-peak,2020,all-year,R1,0.33330000000,heatpump,3,2030
+6,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2030
+1,CO2f,all-week,late-peak,2025,all-year,R1,75.49020000000,gasboiler,4,2030
+2,cook,all-week,late-peak,2020,all-year,R1,0.66670000000,gasstove,4,2030
+3,cook,all-week,late-peak,2025,all-year,R1,1.83330000000,gasstove,4,2030
+1,heat,all-week,late-peak,2025,all-year,R1,1.16670000000,gasboiler,4,2030
+5,heat,all-week,late-peak,2020,all-year,R1,0.66670000000,heatpump,4,2030
+6,heat,all-week,late-peak,2025,all-year,R1,0.66670000000,heatpump,4,2030
+1,CO2f,all-week,evening,2025,all-year,R1,50.32680000000,gasboiler,5,2030
+2,cook,all-week,evening,2020,all-year,R1,0.44440000000,gasstove,5,2030
+3,cook,all-week,evening,2025,all-year,R1,1.22220000000,gasstove,5,2030
+1,heat,all-week,evening,2025,all-year,R1,0.77780000000,gasboiler,5,2030
+5,heat,all-week,evening,2020,all-year,R1,0.44440000000,heatpump,5,2030
+6,heat,all-week,evening,2025,all-year,R1,0.44440000000,heatpump,5,2030
+1,CO2f,all-week,night,2025,all-year,R1,25.16340000000,gasboiler,0,2035
+3,cook,all-week,night,2025,all-year,R1,0.61110000000,gasstove,0,2035
+4,cook,all-week,night,2030,all-year,R1,0.38890000000,gasstove,0,2035
+1,heat,all-week,night,2025,all-year,R1,0.38890000000,gasboiler,0,2035
+7,heat,all-week,night,2025,all-year,R1,0.22220000000,heatpump,0,2035
+8,heat,all-week,night,2030,all-year,R1,0.38890000000,heatpump,0,2035
+1,CO2f,all-week,morning,2025,all-year,R1,37.74510000000,gasboiler,1,2035
+3,cook,all-week,morning,2025,all-year,R1,0.91670000000,gasstove,1,2035
+4,cook,all-week,morning,2030,all-year,R1,0.58330000000,gasstove,1,2035
+1,heat,all-week,morning,2025,all-year,R1,0.58330000000,gasboiler,1,2035
+7,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035
+8,heat,all-week,morning,2030,all-year,R1,0.58330000000,heatpump,1,2035
+1,CO2f,all-week,afternoon,2025,all-year,R1,25.16340000000,gasboiler,2,2035
+3,cook,all-week,afternoon,2025,all-year,R1,0.61110000000,gasstove,2,2035
+4,cook,all-week,afternoon,2030,all-year,R1,0.38890000000,gasstove,2,2035
+1,heat,all-week,afternoon,2025,all-year,R1,0.38890000000,gasboiler,2,2035
+7,heat,all-week,afternoon,2025,all-year,R1,0.22220000000,heatpump,2,2035
+8,heat,all-week,afternoon,2030,all-year,R1,0.38890000000,heatpump,2,2035
+1,CO2f,all-week,early-peak,2025,all-year,R1,37.74510000000,gasboiler,3,2035
+3,cook,all-week,early-peak,2025,all-year,R1,0.91670000000,gasstove,3,2035
+4,cook,all-week,early-peak,2030,all-year,R1,0.58330000000,gasstove,3,2035
+1,heat,all-week,early-peak,2025,all-year,R1,0.58330000000,gasboiler,3,2035
+7,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035
+8,heat,all-week,early-peak,2030,all-year,R1,0.58330000000,heatpump,3,2035
+1,CO2f,all-week,late-peak,2025,all-year,R1,75.49020000000,gasboiler,4,2035
+3,cook,all-week,late-peak,2025,all-year,R1,1.83330000000,gasstove,4,2035
+4,cook,all-week,late-peak,2030,all-year,R1,1.16670000000,gasstove,4,2035
+1,heat,all-week,late-peak,2025,all-year,R1,1.16670000000,gasboiler,4,2035
+7,heat,all-week,late-peak,2025,all-year,R1,0.66670000000,heatpump,4,2035
+8,heat,all-week,late-peak,2030,all-year,R1,1.16670000000,heatpump,4,2035
+1,CO2f,all-week,evening,2025,all-year,R1,50.32680000000,gasboiler,5,2035
+3,cook,all-week,evening,2025,all-year,R1,1.22220000000,gasstove,5,2035
+4,cook,all-week,evening,2030,all-year,R1,0.77780000000,gasstove,5,2035
+1,heat,all-week,evening,2025,all-year,R1,0.77780000000,gasboiler,5,2035
+7,heat,all-week,evening,2025,all-year,R1,0.44440000000,heatpump,5,2035
+8,heat,all-week,evening,2030,all-year,R1,0.77780000000,heatpump,5,2035
+4,cook,all-week,night,2030,all-year,R1,0.38890000000,gasstove,0,2040
+5,cook,all-week,night,2035,all-year,R1,0.77780000000,gasstove,0,2040
+9,heat,all-week,night,2030,all-year,R1,0.38890000000,heatpump,0,2040
+10,heat,all-week,night,2035,all-year,R1,0.77780000000,heatpump,0,2040
+4,cook,all-week,morning,2030,all-year,R1,0.58330000000,gasstove,1,2040
+5,cook,all-week,morning,2035,all-year,R1,1.16670000000,gasstove,1,2040
+9,heat,all-week,morning,2030,all-year,R1,0.58330000000,heatpump,1,2040
+10,heat,all-week,morning,2035,all-year,R1,1.16670000000,heatpump,1,2040
+4,cook,all-week,afternoon,2030,all-year,R1,0.38890000000,gasstove,2,2040
+5,cook,all-week,afternoon,2035,all-year,R1,0.77780000000,gasstove,2,2040
+9,heat,all-week,afternoon,2030,all-year,R1,0.38890000000,heatpump,2,2040
+10,heat,all-week,afternoon,2035,all-year,R1,0.77780000000,heatpump,2,2040
+4,cook,all-week,early-peak,2030,all-year,R1,0.58330000000,gasstove,3,2040
+5,cook,all-week,early-peak,2035,all-year,R1,1.16670000000,gasstove,3,2040
+9,heat,all-week,early-peak,2030,all-year,R1,0.58330000000,heatpump,3,2040
+10,heat,all-week,early-peak,2035,all-year,R1,1.16670000000,heatpump,3,2040
+4,cook,all-week,late-peak,2030,all-year,R1,1.16670000000,gasstove,4,2040
+5,cook,all-week,late-peak,2035,all-year,R1,2.33330000000,gasstove,4,2040
+9,heat,all-week,late-peak,2030,all-year,R1,1.16670000000,heatpump,4,2040
+10,heat,all-week,late-peak,2035,all-year,R1,2.33330000000,heatpump,4,2040
+4,cook,all-week,evening,2030,all-year,R1,0.77780000000,gasstove,5,2040
+5,cook,all-week,evening,2035,all-year,R1,1.55560000000,gasstove,5,2040
+9,heat,all-week,evening,2030,all-year,R1,0.77780000000,heatpump,5,2040
+10,heat,all-week,evening,2035,all-year,R1,1.55560000000,heatpump,5,2040
+5,cook,all-week,night,2035,all-year,R1,0.77780000000,gasstove,0,2045
+6,cook,all-week,night,2040,all-year,R1,0.55560000000,gasstove,0,2045
+11,heat,all-week,night,2035,all-year,R1,0.77780000000,heatpump,0,2045
+12,heat,all-week,night,2040,all-year,R1,0.55560000000,heatpump,0,2045
+5,cook,all-week,morning,2035,all-year,R1,1.16670000000,gasstove,1,2045
+6,cook,all-week,morning,2040,all-year,R1,0.83330000000,gasstove,1,2045
+11,heat,all-week,morning,2035,all-year,R1,1.16670000000,heatpump,1,2045
+12,heat,all-week,morning,2040,all-year,R1,0.83330000000,heatpump,1,2045
+5,cook,all-week,afternoon,2035,all-year,R1,0.77780000000,gasstove,2,2045
+6,cook,all-week,afternoon,2040,all-year,R1,0.55560000000,gasstove,2,2045
+11,heat,all-week,afternoon,2035,all-year,R1,0.77780000000,heatpump,2,2045
+12,heat,all-week,afternoon,2040,all-year,R1,0.55560000000,heatpump,2,2045
+5,cook,all-week,early-peak,2035,all-year,R1,1.16670000000,gasstove,3,2045
+6,cook,all-week,early-peak,2040,all-year,R1,0.83330000000,gasstove,3,2045
+11,heat,all-week,early-peak,2035,all-year,R1,1.16670000000,heatpump,3,2045
+12,heat,all-week,early-peak,2040,all-year,R1,0.83330000000,heatpump,3,2045
+5,cook,all-week,late-peak,2035,all-year,R1,2.33330000000,gasstove,4,2045
+6,cook,all-week,late-peak,2040,all-year,R1,1.66670000000,gasstove,4,2045
+11,heat,all-week,late-peak,2035,all-year,R1,2.33330000000,heatpump,4,2045
+12,heat,all-week,late-peak,2040,all-year,R1,1.66670000000,heatpump,4,2045
+5,cook,all-week,evening,2035,all-year,R1,1.55560000000,gasstove,5,2045
+6,cook,all-week,evening,2040,all-year,R1,1.11110000000,gasstove,5,2045
+11,heat,all-week,evening,2035,all-year,R1,1.55560000000,heatpump,5,2045
+12,heat,all-week,evening,2040,all-year,R1,1.11110000000,heatpump,5,2045
+6,cook,all-week,night,2040,all-year,R1,0.55560000000,gasstove,0,2050
+7,cook,all-week,night,2045,all-year,R1,0.94440000000,gasstove,0,2050
+13,heat,all-week,night,2040,all-year,R1,0.55560000000,heatpump,0,2050
+14,heat,all-week,night,2045,all-year,R1,0.94440000000,heatpump,0,2050
+6,cook,all-week,morning,2040,all-year,R1,0.83330000000,gasstove,1,2050
+7,cook,all-week,morning,2045,all-year,R1,1.41670000000,gasstove,1,2050
+13,heat,all-week,morning,2040,all-year,R1,0.83330000000,heatpump,1,2050
+14,heat,all-week,morning,2045,all-year,R1,1.41670000000,heatpump,1,2050
+6,cook,all-week,afternoon,2040,all-year,R1,0.55560000000,gasstove,2,2050
+7,cook,all-week,afternoon,2045,all-year,R1,0.94440000000,gasstove,2,2050
+13,heat,all-week,afternoon,2040,all-year,R1,0.55560000000,heatpump,2,2050
+14,heat,all-week,afternoon,2045,all-year,R1,0.94440000000,heatpump,2,2050
+6,cook,all-week,early-peak,2040,all-year,R1,0.83330000000,gasstove,3,2050
+7,cook,all-week,early-peak,2045,all-year,R1,1.41670000000,gasstove,3,2050
+13,heat,all-week,early-peak,2040,all-year,R1,0.83330000000,heatpump,3,2050
+14,heat,all-week,early-peak,2045,all-year,R1,1.41670000000,heatpump,3,2050
+6,cook,all-week,late-peak,2040,all-year,R1,1.66670000000,gasstove,4,2050
+7,cook,all-week,late-peak,2045,all-year,R1,2.83330000000,gasstove,4,2050
+13,heat,all-week,late-peak,2040,all-year,R1,1.66670000000,heatpump,4,2050
+14,heat,all-week,late-peak,2045,all-year,R1,2.83330000000,heatpump,4,2050
+6,cook,all-week,evening,2040,all-year,R1,1.11110000000,gasstove,5,2050
+7,cook,all-week,evening,2045,all-year,R1,1.88890000000,gasstove,5,2050
+13,heat,all-week,evening,2040,all-year,R1,1.11110000000,heatpump,5,2050
+14,heat,all-week,evening,2045,all-year,R1,1.88890000000,heatpump,5,2050
diff --git a/tests/example_outputs/medium/Residential/Supply/2020.csv b/tests/example_outputs/medium/Residential/Supply/2020.csv
deleted file mode 100644
index c5696bdad..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,32.35290000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,28.75820000000
-0,cook,2020,1,R1,all-year,all-week,night,gasstove,2020,0.50000000000
-0,cook,2025,1,R1,all-year,all-week,night,gasstove,2020,0.66670000000
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,0.50000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.44440000000
-0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.22220000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,48.52940000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
-1,cook,2020,1,R1,all-year,all-week,morning,gasstove,2020,0.75000000000
-1,cook,2025,1,R1,all-year,all-week,morning,gasstove,2020,1.00000000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,0.75000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
-1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,32.35290000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
-2,cook,2020,1,R1,all-year,all-week,afternoon,gasstove,2020,0.50000000000
-2,cook,2025,1,R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
-2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,48.52940000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
-3,cook,2020,1,R1,all-year,all-week,early-peak,gasstove,2020,0.75000000000
-3,cook,2025,1,R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
-3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,97.05880000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
-4,cook,2020,1,R1,all-year,all-week,late-peak,gasstove,2020,1.50000000000
-4,cook,2025,1,R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
-4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,64.70590000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
-5,cook,2020,1,R1,all-year,all-week,evening,gasstove,2020,1.00000000000
-5,cook,2025,1,R1,all-year,all-week,evening,gasstove,2020,1.33330000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,1.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
-5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2025.csv b/tests/example_outputs/medium/Residential/Supply/2025.csv
deleted file mode 100644
index 6c0a8f6bd..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,28.75820000000
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-0,cook,2025,2,R1,all-year,all-week,night,gasstove,2020,0.66670000000
-0,cook,2030,2,R1,all-year,all-week,night,gasstove,2020,0.22220000000
-0,cook,2030,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.44440000000
-0,heat,2025,4,R1,all-year,all-week,night,heatpump,2020,0.22220000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2030,4,R1,all-year,all-week,night,heatpump,2020,0.22220000000
-0,heat,2030,5,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-1,cook,2025,2,R1,all-year,all-week,morning,gasstove,2020,1.00000000000
-1,cook,2030,2,R1,all-year,all-week,morning,gasstove,2020,0.33330000000
-1,cook,2030,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
-1,heat,2025,4,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-2,cook,2025,2,R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
-2,cook,2030,2,R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
-2,cook,2030,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
-2,heat,2025,4,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-3,cook,2025,2,R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
-3,cook,2030,2,R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
-3,cook,2030,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
-3,heat,2025,4,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-4,cook,2025,2,R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
-4,cook,2030,2,R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
-4,cook,2030,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
-4,heat,2025,4,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-5,cook,2025,2,R1,all-year,all-week,evening,gasstove,2020,1.33330000000
-5,cook,2030,2,R1,all-year,all-week,evening,gasstove,2020,0.44440000000
-5,cook,2030,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
-5,heat,2025,4,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2030.csv b/tests/example_outputs/medium/Residential/Supply/2030.csv
deleted file mode 100644
index 434eea1ad..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,73 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-0,cook,2030,2,R1,all-year,all-week,night,gasstove,2020,0.22220000000
-0,cook,2030,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
-0,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
-0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2030,5,R1,all-year,all-week,night,heatpump,2020,0.22220000000
-0,heat,2030,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2035,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-0,heat,2035,7,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-1,cook,2030,2,R1,all-year,all-week,morning,gasstove,2020,0.33330000000
-1,cook,2030,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-1,heat,2030,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-2,cook,2030,2,R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
-2,cook,2030,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-2,heat,2030,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-3,cook,2030,2,R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
-3,cook,2030,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-3,heat,2030,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-4,cook,2030,2,R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
-4,cook,2030,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-4,heat,2030,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-5,cook,2030,2,R1,all-year,all-week,evening,gasstove,2020,0.44440000000
-5,cook,2030,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-5,heat,2030,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-5,heat,2035,7,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2035.csv b/tests/example_outputs/medium/Residential/Supply/2035.csv
deleted file mode 100644
index 152438f8d..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-0,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
-0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2035,7,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-0,heat,2035,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-0,heat,2040,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-0,heat,2040,9,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,2035,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-2,heat,2035,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,2035,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-4,heat,2035,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2035,7,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-5,heat,2035,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2040.csv b/tests/example_outputs/medium/Residential/Supply/2040.csv
deleted file mode 100644
index a92754eeb..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,heat,2040,9,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-0,heat,2040,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-0,heat,2045,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-0,heat,2045,11,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-1,heat,2040,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-1,heat,2045,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-2,heat,2040,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-2,heat,2045,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-3,heat,2040,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-3,heat,2045,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-4,heat,2040,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-4,heat,2045,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-5,heat,2040,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-5,heat,2045,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-5,heat,2045,11,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2045.csv b/tests/example_outputs/medium/Residential/Supply/2045.csv
deleted file mode 100644
index 58e9df295..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
-0,heat,2045,11,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-0,heat,2045,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-0,heat,2050,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-0,heat,2050,13,R1,all-year,all-week,night,heatpump,2045,0.94440000000
-1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-1,heat,2045,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-1,heat,2050,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-2,heat,2045,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-2,heat,2050,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-3,heat,2045,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-3,heat,2050,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-4,heat,2045,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-4,heat,2050,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-5,heat,2045,11,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-5,heat,2045,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-5,heat,2050,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2050.csv b/tests/example_outputs/medium/Residential/Supply/2050.csv
deleted file mode 100644
index ea9a86289..000000000
--- a/tests/example_outputs/medium/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
-0,cook,2055,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
-0,cook,2055,8,R1,all-year,all-week,night,gasstove,2050,0.55560000000
-0,heat,2050,13,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-0,heat,2050,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
-0,heat,2055,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
-0,heat,2055,15,R1,all-year,all-week,night,heatpump,2050,0.55560000000
-1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-1,cook,2055,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-1,cook,2055,8,R1,all-year,all-week,morning,gasstove,2050,0.83330000000
-1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-1,heat,2050,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-1,heat,2055,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-1,heat,2055,15,R1,all-year,all-week,morning,heatpump,2050,0.83330000000
-2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-2,cook,2055,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-2,cook,2055,8,R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
-2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-2,heat,2050,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-2,heat,2055,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-2,heat,2055,15,R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
-3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-3,cook,2055,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-3,cook,2055,8,R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
-3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-3,heat,2050,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-3,heat,2055,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-3,heat,2055,15,R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
-4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-4,cook,2055,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-4,cook,2055,8,R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
-4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-4,heat,2050,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-4,heat,2055,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-4,heat,2055,15,R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
-5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-5,cook,2055,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-5,cook,2055,8,R1,all-year,all-week,evening,gasstove,2050,1.11110000000
-5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-5,heat,2050,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
-5,heat,2055,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
-5,heat,2055,15,R1,all-year,all-week,evening,heatpump,2050,1.11110000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity.csv b/tests/example_outputs/minimum_service/Industry/Capacity.csv
new file mode 100644
index 000000000..b0053da4a
--- /dev/null
+++ b/tests/example_outputs/minimum_service/Industry/Capacity.csv
@@ -0,0 +1,35 @@
+asset,capacity,installed,region,technology,year
+0,26.00000000000,2010,R1,procammonia_1,2010
+1,26.00000000000,2010,R1,procammonia_2,2010
+0,29.90000000000,2010,R1,procammonia_1,2015
+2,24.35470000000,2010,R1,procammonia_2,2015
+0,25.56670000000,2010,R1,procammonia_1,2020
+1,8.66670000000,2015,R1,procammonia_1,2020
+3,20.02140000000,2010,R1,procammonia_2,2020
+0,21.23330000000,2010,R1,procammonia_1,2025
+1,8.66670000000,2015,R1,procammonia_1,2025
+2,8.70630000000,2020,R1,procammonia_1,2025
+4,15.68800000000,2010,R1,procammonia_2,2025
+0,16.90000000000,2010,R1,procammonia_1,2030
+1,8.66670000000,2015,R1,procammonia_1,2030
+2,8.70630000000,2020,R1,procammonia_1,2030
+3,8.70630000000,2025,R1,procammonia_1,2030
+5,11.35470000000,2010,R1,procammonia_2,2030
+0,4.33330000000,2010,R1,procammonia_1,2035
+1,8.66670000000,2015,R1,procammonia_1,2035
+2,8.70630000000,2020,R1,procammonia_1,2035
+3,8.70630000000,2025,R1,procammonia_1,2035
+4,18.79580000000,2030,R1,procammonia_1,2035
+6,4.33330000000,2010,R1,procammonia_2,2035
+2,8.70630000000,2020,R1,procammonia_1,2040
+3,8.70630000000,2025,R1,procammonia_1,2040
+4,18.79580000000,2030,R1,procammonia_1,2040
+5,16.54120000000,2035,R1,procammonia_1,2040
+3,8.70630000000,2025,R1,procammonia_1,2045
+4,18.79580000000,2030,R1,procammonia_1,2045
+5,16.54120000000,2035,R1,procammonia_1,2045
+6,7.21970000000,2040,R1,procammonia_1,2045
+4,18.79580000000,2030,R1,procammonia_1,2050
+5,16.54120000000,2035,R1,procammonia_1,2050
+6,7.21970000000,2040,R1,procammonia_1,2050
+7,7.21970000000,2045,R1,procammonia_1,2050
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv
deleted file mode 100644
index 9198760ca..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2010,R1,procammonia_2,2010,26.00000000000
-1,2011,R1,procammonia_2,2010,25.13330000000
-1,2012,R1,procammonia_2,2010,24.26670000000
-1,2013,R1,procammonia_2,2010,23.40000000000
-1,2014,R1,procammonia_2,2010,22.53330000000
-1,2015,R1,procammonia_2,2010,24.35470000000
-1,2016,R1,procammonia_2,2010,23.48800000000
-1,2017,R1,procammonia_2,2010,22.62140000000
-1,2018,R1,procammonia_2,2010,21.75470000000
-1,2019,R1,procammonia_2,2010,20.88800000000
-1,2020,R1,procammonia_2,2010,20.02140000000
-1,2021,R1,procammonia_2,2010,19.15470000000
-1,2022,R1,procammonia_2,2010,18.28800000000
-1,2023,R1,procammonia_2,2010,17.42140000000
-1,2024,R1,procammonia_2,2010,16.55470000000
-1,2025,R1,procammonia_2,2010,15.68800000000
-1,2026,R1,procammonia_2,2010,14.82140000000
-1,2027,R1,procammonia_2,2010,13.95470000000
-1,2028,R1,procammonia_2,2010,13.08800000000
-1,2029,R1,procammonia_2,2010,12.22140000000
-1,2030,R1,procammonia_2,2010,11.35470000000
-1,2031,R1,procammonia_2,2010,10.48800000000
-1,2032,R1,procammonia_2,2010,9.62140000000
-1,2033,R1,procammonia_2,2010,8.75470000000
-1,2034,R1,procammonia_2,2010,7.88800000000
-1,2035,R1,procammonia_2,2010,4.33330000000
-1,2036,R1,procammonia_2,2010,3.46670000000
-1,2037,R1,procammonia_2,2010,2.60000000000
-1,2038,R1,procammonia_2,2010,1.73330000000
-1,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
deleted file mode 100644
index 9acfc8154..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
+++ /dev/null
@@ -1,81 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2010,R1,procammonia_2,2010,26.00000000000
-2,2011,R1,procammonia_2,2010,25.13330000000
-2,2012,R1,procammonia_2,2010,24.26670000000
-2,2013,R1,procammonia_2,2010,23.40000000000
-2,2014,R1,procammonia_2,2010,22.53330000000
-2,2015,R1,procammonia_2,2010,24.35470000000
-2,2016,R1,procammonia_2,2010,23.48800000000
-2,2017,R1,procammonia_2,2010,22.62140000000
-2,2018,R1,procammonia_2,2010,21.75470000000
-2,2019,R1,procammonia_2,2010,20.88800000000
-2,2020,R1,procammonia_2,2010,20.02140000000
-2,2021,R1,procammonia_2,2010,19.15470000000
-2,2022,R1,procammonia_2,2010,18.28800000000
-2,2023,R1,procammonia_2,2010,17.42140000000
-2,2024,R1,procammonia_2,2010,16.55470000000
-2,2025,R1,procammonia_2,2010,15.68800000000
-2,2026,R1,procammonia_2,2010,14.82140000000
-2,2027,R1,procammonia_2,2010,13.95470000000
-2,2028,R1,procammonia_2,2010,13.08800000000
-2,2029,R1,procammonia_2,2010,12.22140000000
-2,2030,R1,procammonia_2,2010,11.35470000000
-2,2031,R1,procammonia_2,2010,10.48800000000
-2,2032,R1,procammonia_2,2010,9.62140000000
-2,2033,R1,procammonia_2,2010,8.75470000000
-2,2034,R1,procammonia_2,2010,7.88800000000
-2,2035,R1,procammonia_2,2010,4.33330000000
-2,2036,R1,procammonia_2,2010,3.46670000000
-2,2037,R1,procammonia_2,2010,2.60000000000
-2,2038,R1,procammonia_2,2010,1.73330000000
-2,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv
deleted file mode 100644
index 7c1a31e31..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2010,R1,procammonia_2,2010,26.00000000000
-3,2011,R1,procammonia_2,2010,25.13330000000
-3,2012,R1,procammonia_2,2010,24.26670000000
-3,2013,R1,procammonia_2,2010,23.40000000000
-3,2014,R1,procammonia_2,2010,22.53330000000
-3,2015,R1,procammonia_2,2010,24.35470000000
-3,2016,R1,procammonia_2,2010,23.48800000000
-3,2017,R1,procammonia_2,2010,22.62140000000
-3,2018,R1,procammonia_2,2010,21.75470000000
-3,2019,R1,procammonia_2,2010,20.88800000000
-3,2020,R1,procammonia_2,2010,20.02140000000
-3,2021,R1,procammonia_2,2010,19.15470000000
-3,2022,R1,procammonia_2,2010,18.28800000000
-3,2023,R1,procammonia_2,2010,17.42140000000
-3,2024,R1,procammonia_2,2010,16.55470000000
-3,2025,R1,procammonia_2,2010,15.68800000000
-3,2026,R1,procammonia_2,2010,14.82140000000
-3,2027,R1,procammonia_2,2010,13.95470000000
-3,2028,R1,procammonia_2,2010,13.08800000000
-3,2029,R1,procammonia_2,2010,12.22140000000
-3,2030,R1,procammonia_2,2010,11.35470000000
-3,2031,R1,procammonia_2,2010,10.48800000000
-3,2032,R1,procammonia_2,2010,9.62140000000
-3,2033,R1,procammonia_2,2010,8.75470000000
-3,2034,R1,procammonia_2,2010,7.88800000000
-3,2035,R1,procammonia_2,2010,4.33330000000
-3,2036,R1,procammonia_2,2010,3.46670000000
-3,2037,R1,procammonia_2,2010,2.60000000000
-3,2038,R1,procammonia_2,2010,1.73330000000
-3,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv
deleted file mode 100644
index 4202f67e1..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2030,R1,procammonia_1,2025,8.70630000000
-3,2031,R1,procammonia_1,2025,8.70630000000
-3,2032,R1,procammonia_1,2025,8.70630000000
-3,2033,R1,procammonia_1,2025,8.70630000000
-3,2034,R1,procammonia_1,2025,8.70630000000
-3,2035,R1,procammonia_1,2025,8.70630000000
-3,2036,R1,procammonia_1,2025,8.70630000000
-3,2037,R1,procammonia_1,2025,8.70630000000
-3,2038,R1,procammonia_1,2025,8.70630000000
-3,2039,R1,procammonia_1,2025,8.70630000000
-3,2040,R1,procammonia_1,2025,8.70630000000
-3,2041,R1,procammonia_1,2025,8.70630000000
-3,2042,R1,procammonia_1,2025,8.70630000000
-3,2043,R1,procammonia_1,2025,8.70630000000
-3,2044,R1,procammonia_1,2025,8.70630000000
-3,2045,R1,procammonia_1,2025,8.70630000000
-3,2046,R1,procammonia_1,2025,8.70630000000
-3,2047,R1,procammonia_1,2025,8.70630000000
-3,2048,R1,procammonia_1,2025,8.70630000000
-3,2049,R1,procammonia_1,2025,8.70630000000
-4,2010,R1,procammonia_2,2010,26.00000000000
-4,2011,R1,procammonia_2,2010,25.13330000000
-4,2012,R1,procammonia_2,2010,24.26670000000
-4,2013,R1,procammonia_2,2010,23.40000000000
-4,2014,R1,procammonia_2,2010,22.53330000000
-4,2015,R1,procammonia_2,2010,24.35470000000
-4,2016,R1,procammonia_2,2010,23.48800000000
-4,2017,R1,procammonia_2,2010,22.62140000000
-4,2018,R1,procammonia_2,2010,21.75470000000
-4,2019,R1,procammonia_2,2010,20.88800000000
-4,2020,R1,procammonia_2,2010,20.02140000000
-4,2021,R1,procammonia_2,2010,19.15470000000
-4,2022,R1,procammonia_2,2010,18.28800000000
-4,2023,R1,procammonia_2,2010,17.42140000000
-4,2024,R1,procammonia_2,2010,16.55470000000
-4,2025,R1,procammonia_2,2010,15.68800000000
-4,2026,R1,procammonia_2,2010,14.82140000000
-4,2027,R1,procammonia_2,2010,13.95470000000
-4,2028,R1,procammonia_2,2010,13.08800000000
-4,2029,R1,procammonia_2,2010,12.22140000000
-4,2030,R1,procammonia_2,2010,11.35470000000
-4,2031,R1,procammonia_2,2010,10.48800000000
-4,2032,R1,procammonia_2,2010,9.62140000000
-4,2033,R1,procammonia_2,2010,8.75470000000
-4,2034,R1,procammonia_2,2010,7.88800000000
-4,2035,R1,procammonia_2,2010,4.33330000000
-4,2036,R1,procammonia_2,2010,3.46670000000
-4,2037,R1,procammonia_2,2010,2.60000000000
-4,2038,R1,procammonia_2,2010,1.73330000000
-4,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
deleted file mode 100644
index bf7527ea9..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
+++ /dev/null
@@ -1,138 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2030,R1,procammonia_1,2025,8.70630000000
-3,2031,R1,procammonia_1,2025,8.70630000000
-3,2032,R1,procammonia_1,2025,8.70630000000
-3,2033,R1,procammonia_1,2025,8.70630000000
-3,2034,R1,procammonia_1,2025,8.70630000000
-3,2035,R1,procammonia_1,2025,8.70630000000
-3,2036,R1,procammonia_1,2025,8.70630000000
-3,2037,R1,procammonia_1,2025,8.70630000000
-3,2038,R1,procammonia_1,2025,8.70630000000
-3,2039,R1,procammonia_1,2025,8.70630000000
-3,2040,R1,procammonia_1,2025,8.70630000000
-3,2041,R1,procammonia_1,2025,8.70630000000
-3,2042,R1,procammonia_1,2025,8.70630000000
-3,2043,R1,procammonia_1,2025,8.70630000000
-3,2044,R1,procammonia_1,2025,8.70630000000
-3,2045,R1,procammonia_1,2025,8.70630000000
-3,2046,R1,procammonia_1,2025,8.70630000000
-3,2047,R1,procammonia_1,2025,8.70630000000
-3,2048,R1,procammonia_1,2025,8.70630000000
-3,2049,R1,procammonia_1,2025,8.70630000000
-4,2035,R1,procammonia_1,2030,18.79580000000
-4,2036,R1,procammonia_1,2030,18.79580000000
-4,2037,R1,procammonia_1,2030,18.79580000000
-4,2038,R1,procammonia_1,2030,18.79580000000
-4,2039,R1,procammonia_1,2030,18.79580000000
-4,2040,R1,procammonia_1,2030,18.79580000000
-4,2041,R1,procammonia_1,2030,18.79580000000
-4,2042,R1,procammonia_1,2030,18.79580000000
-4,2043,R1,procammonia_1,2030,18.79580000000
-4,2044,R1,procammonia_1,2030,18.79580000000
-4,2045,R1,procammonia_1,2030,18.79580000000
-4,2046,R1,procammonia_1,2030,18.79580000000
-4,2047,R1,procammonia_1,2030,18.79580000000
-4,2048,R1,procammonia_1,2030,18.79580000000
-4,2049,R1,procammonia_1,2030,18.79580000000
-4,2050,R1,procammonia_1,2030,18.79580000000
-4,2054,R1,procammonia_1,2030,18.79580000000
-5,2010,R1,procammonia_2,2010,26.00000000000
-5,2011,R1,procammonia_2,2010,25.13330000000
-5,2012,R1,procammonia_2,2010,24.26670000000
-5,2013,R1,procammonia_2,2010,23.40000000000
-5,2014,R1,procammonia_2,2010,22.53330000000
-5,2015,R1,procammonia_2,2010,24.35470000000
-5,2016,R1,procammonia_2,2010,23.48800000000
-5,2017,R1,procammonia_2,2010,22.62140000000
-5,2018,R1,procammonia_2,2010,21.75470000000
-5,2019,R1,procammonia_2,2010,20.88800000000
-5,2020,R1,procammonia_2,2010,20.02140000000
-5,2021,R1,procammonia_2,2010,19.15470000000
-5,2022,R1,procammonia_2,2010,18.28800000000
-5,2023,R1,procammonia_2,2010,17.42140000000
-5,2024,R1,procammonia_2,2010,16.55470000000
-5,2025,R1,procammonia_2,2010,15.68800000000
-5,2026,R1,procammonia_2,2010,14.82140000000
-5,2027,R1,procammonia_2,2010,13.95470000000
-5,2028,R1,procammonia_2,2010,13.08800000000
-5,2029,R1,procammonia_2,2010,12.22140000000
-5,2030,R1,procammonia_2,2010,11.35470000000
-5,2031,R1,procammonia_2,2010,10.48800000000
-5,2032,R1,procammonia_2,2010,9.62140000000
-5,2033,R1,procammonia_2,2010,8.75470000000
-5,2034,R1,procammonia_2,2010,7.88800000000
-5,2035,R1,procammonia_2,2010,4.33330000000
-5,2036,R1,procammonia_2,2010,3.46670000000
-5,2037,R1,procammonia_2,2010,2.60000000000
-5,2038,R1,procammonia_2,2010,1.73330000000
-5,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
deleted file mode 100644
index 42a9280db..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
+++ /dev/null
@@ -1,152 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2030,R1,procammonia_1,2025,8.70630000000
-3,2031,R1,procammonia_1,2025,8.70630000000
-3,2032,R1,procammonia_1,2025,8.70630000000
-3,2033,R1,procammonia_1,2025,8.70630000000
-3,2034,R1,procammonia_1,2025,8.70630000000
-3,2035,R1,procammonia_1,2025,8.70630000000
-3,2036,R1,procammonia_1,2025,8.70630000000
-3,2037,R1,procammonia_1,2025,8.70630000000
-3,2038,R1,procammonia_1,2025,8.70630000000
-3,2039,R1,procammonia_1,2025,8.70630000000
-3,2040,R1,procammonia_1,2025,8.70630000000
-3,2041,R1,procammonia_1,2025,8.70630000000
-3,2042,R1,procammonia_1,2025,8.70630000000
-3,2043,R1,procammonia_1,2025,8.70630000000
-3,2044,R1,procammonia_1,2025,8.70630000000
-3,2045,R1,procammonia_1,2025,8.70630000000
-3,2046,R1,procammonia_1,2025,8.70630000000
-3,2047,R1,procammonia_1,2025,8.70630000000
-3,2048,R1,procammonia_1,2025,8.70630000000
-3,2049,R1,procammonia_1,2025,8.70630000000
-4,2035,R1,procammonia_1,2030,18.79580000000
-4,2036,R1,procammonia_1,2030,18.79580000000
-4,2037,R1,procammonia_1,2030,18.79580000000
-4,2038,R1,procammonia_1,2030,18.79580000000
-4,2039,R1,procammonia_1,2030,18.79580000000
-4,2040,R1,procammonia_1,2030,18.79580000000
-4,2041,R1,procammonia_1,2030,18.79580000000
-4,2042,R1,procammonia_1,2030,18.79580000000
-4,2043,R1,procammonia_1,2030,18.79580000000
-4,2044,R1,procammonia_1,2030,18.79580000000
-4,2045,R1,procammonia_1,2030,18.79580000000
-4,2046,R1,procammonia_1,2030,18.79580000000
-4,2047,R1,procammonia_1,2030,18.79580000000
-4,2048,R1,procammonia_1,2030,18.79580000000
-4,2049,R1,procammonia_1,2030,18.79580000000
-4,2050,R1,procammonia_1,2030,18.79580000000
-4,2054,R1,procammonia_1,2030,18.79580000000
-5,2040,R1,procammonia_1,2035,16.54120000000
-5,2041,R1,procammonia_1,2035,16.54120000000
-5,2042,R1,procammonia_1,2035,16.54120000000
-5,2043,R1,procammonia_1,2035,16.54120000000
-5,2044,R1,procammonia_1,2035,16.54120000000
-5,2045,R1,procammonia_1,2035,16.54120000000
-5,2046,R1,procammonia_1,2035,16.54120000000
-5,2047,R1,procammonia_1,2035,16.54120000000
-5,2048,R1,procammonia_1,2035,16.54120000000
-5,2049,R1,procammonia_1,2035,16.54120000000
-5,2050,R1,procammonia_1,2035,16.54120000000
-5,2054,R1,procammonia_1,2035,16.54120000000
-5,2055,R1,procammonia_1,2035,16.54120000000
-5,2059,R1,procammonia_1,2035,16.54120000000
-6,2010,R1,procammonia_2,2010,26.00000000000
-6,2011,R1,procammonia_2,2010,25.13330000000
-6,2012,R1,procammonia_2,2010,24.26670000000
-6,2013,R1,procammonia_2,2010,23.40000000000
-6,2014,R1,procammonia_2,2010,22.53330000000
-6,2015,R1,procammonia_2,2010,24.35470000000
-6,2016,R1,procammonia_2,2010,23.48800000000
-6,2017,R1,procammonia_2,2010,22.62140000000
-6,2018,R1,procammonia_2,2010,21.75470000000
-6,2019,R1,procammonia_2,2010,20.88800000000
-6,2020,R1,procammonia_2,2010,20.02140000000
-6,2021,R1,procammonia_2,2010,19.15470000000
-6,2022,R1,procammonia_2,2010,18.28800000000
-6,2023,R1,procammonia_2,2010,17.42140000000
-6,2024,R1,procammonia_2,2010,16.55470000000
-6,2025,R1,procammonia_2,2010,15.68800000000
-6,2026,R1,procammonia_2,2010,14.82140000000
-6,2027,R1,procammonia_2,2010,13.95470000000
-6,2028,R1,procammonia_2,2010,13.08800000000
-6,2029,R1,procammonia_2,2010,12.22140000000
-6,2030,R1,procammonia_2,2010,11.35470000000
-6,2031,R1,procammonia_2,2010,10.48800000000
-6,2032,R1,procammonia_2,2010,9.62140000000
-6,2033,R1,procammonia_2,2010,8.75470000000
-6,2034,R1,procammonia_2,2010,7.88800000000
-6,2035,R1,procammonia_2,2010,4.33330000000
-6,2036,R1,procammonia_2,2010,3.46670000000
-6,2037,R1,procammonia_2,2010,2.60000000000
-6,2038,R1,procammonia_2,2010,1.73330000000
-6,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
deleted file mode 100644
index bb9456bb5..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
+++ /dev/null
@@ -1,163 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2030,R1,procammonia_1,2025,8.70630000000
-3,2031,R1,procammonia_1,2025,8.70630000000
-3,2032,R1,procammonia_1,2025,8.70630000000
-3,2033,R1,procammonia_1,2025,8.70630000000
-3,2034,R1,procammonia_1,2025,8.70630000000
-3,2035,R1,procammonia_1,2025,8.70630000000
-3,2036,R1,procammonia_1,2025,8.70630000000
-3,2037,R1,procammonia_1,2025,8.70630000000
-3,2038,R1,procammonia_1,2025,8.70630000000
-3,2039,R1,procammonia_1,2025,8.70630000000
-3,2040,R1,procammonia_1,2025,8.70630000000
-3,2041,R1,procammonia_1,2025,8.70630000000
-3,2042,R1,procammonia_1,2025,8.70630000000
-3,2043,R1,procammonia_1,2025,8.70630000000
-3,2044,R1,procammonia_1,2025,8.70630000000
-3,2045,R1,procammonia_1,2025,8.70630000000
-3,2046,R1,procammonia_1,2025,8.70630000000
-3,2047,R1,procammonia_1,2025,8.70630000000
-3,2048,R1,procammonia_1,2025,8.70630000000
-3,2049,R1,procammonia_1,2025,8.70630000000
-4,2035,R1,procammonia_1,2030,18.79580000000
-4,2036,R1,procammonia_1,2030,18.79580000000
-4,2037,R1,procammonia_1,2030,18.79580000000
-4,2038,R1,procammonia_1,2030,18.79580000000
-4,2039,R1,procammonia_1,2030,18.79580000000
-4,2040,R1,procammonia_1,2030,18.79580000000
-4,2041,R1,procammonia_1,2030,18.79580000000
-4,2042,R1,procammonia_1,2030,18.79580000000
-4,2043,R1,procammonia_1,2030,18.79580000000
-4,2044,R1,procammonia_1,2030,18.79580000000
-4,2045,R1,procammonia_1,2030,18.79580000000
-4,2046,R1,procammonia_1,2030,18.79580000000
-4,2047,R1,procammonia_1,2030,18.79580000000
-4,2048,R1,procammonia_1,2030,18.79580000000
-4,2049,R1,procammonia_1,2030,18.79580000000
-4,2050,R1,procammonia_1,2030,18.79580000000
-4,2054,R1,procammonia_1,2030,18.79580000000
-5,2040,R1,procammonia_1,2035,16.54120000000
-5,2041,R1,procammonia_1,2035,16.54120000000
-5,2042,R1,procammonia_1,2035,16.54120000000
-5,2043,R1,procammonia_1,2035,16.54120000000
-5,2044,R1,procammonia_1,2035,16.54120000000
-5,2045,R1,procammonia_1,2035,16.54120000000
-5,2046,R1,procammonia_1,2035,16.54120000000
-5,2047,R1,procammonia_1,2035,16.54120000000
-5,2048,R1,procammonia_1,2035,16.54120000000
-5,2049,R1,procammonia_1,2035,16.54120000000
-5,2050,R1,procammonia_1,2035,16.54120000000
-5,2054,R1,procammonia_1,2035,16.54120000000
-5,2055,R1,procammonia_1,2035,16.54120000000
-5,2059,R1,procammonia_1,2035,16.54120000000
-6,2045,R1,procammonia_1,2040,7.21970000000
-6,2046,R1,procammonia_1,2040,7.21970000000
-6,2047,R1,procammonia_1,2040,7.21970000000
-6,2048,R1,procammonia_1,2040,7.21970000000
-6,2049,R1,procammonia_1,2040,7.21970000000
-6,2050,R1,procammonia_1,2040,7.21970000000
-6,2054,R1,procammonia_1,2040,7.21970000000
-6,2055,R1,procammonia_1,2040,7.21970000000
-6,2059,R1,procammonia_1,2040,7.21970000000
-6,2060,R1,procammonia_1,2040,7.21970000000
-6,2064,R1,procammonia_1,2040,7.21970000000
-7,2010,R1,procammonia_2,2010,26.00000000000
-7,2011,R1,procammonia_2,2010,25.13330000000
-7,2012,R1,procammonia_2,2010,24.26670000000
-7,2013,R1,procammonia_2,2010,23.40000000000
-7,2014,R1,procammonia_2,2010,22.53330000000
-7,2015,R1,procammonia_2,2010,24.35470000000
-7,2016,R1,procammonia_2,2010,23.48800000000
-7,2017,R1,procammonia_2,2010,22.62140000000
-7,2018,R1,procammonia_2,2010,21.75470000000
-7,2019,R1,procammonia_2,2010,20.88800000000
-7,2020,R1,procammonia_2,2010,20.02140000000
-7,2021,R1,procammonia_2,2010,19.15470000000
-7,2022,R1,procammonia_2,2010,18.28800000000
-7,2023,R1,procammonia_2,2010,17.42140000000
-7,2024,R1,procammonia_2,2010,16.55470000000
-7,2025,R1,procammonia_2,2010,15.68800000000
-7,2026,R1,procammonia_2,2010,14.82140000000
-7,2027,R1,procammonia_2,2010,13.95470000000
-7,2028,R1,procammonia_2,2010,13.08800000000
-7,2029,R1,procammonia_2,2010,12.22140000000
-7,2030,R1,procammonia_2,2010,11.35470000000
-7,2031,R1,procammonia_2,2010,10.48800000000
-7,2032,R1,procammonia_2,2010,9.62140000000
-7,2033,R1,procammonia_2,2010,8.75470000000
-7,2034,R1,procammonia_2,2010,7.88800000000
-7,2035,R1,procammonia_2,2010,4.33330000000
-7,2036,R1,procammonia_2,2010,3.46670000000
-7,2037,R1,procammonia_2,2010,2.60000000000
-7,2038,R1,procammonia_2,2010,1.73330000000
-7,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
deleted file mode 100644
index 0111670db..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
+++ /dev/null
@@ -1,171 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2030,R1,procammonia_1,2025,8.70630000000
-3,2031,R1,procammonia_1,2025,8.70630000000
-3,2032,R1,procammonia_1,2025,8.70630000000
-3,2033,R1,procammonia_1,2025,8.70630000000
-3,2034,R1,procammonia_1,2025,8.70630000000
-3,2035,R1,procammonia_1,2025,8.70630000000
-3,2036,R1,procammonia_1,2025,8.70630000000
-3,2037,R1,procammonia_1,2025,8.70630000000
-3,2038,R1,procammonia_1,2025,8.70630000000
-3,2039,R1,procammonia_1,2025,8.70630000000
-3,2040,R1,procammonia_1,2025,8.70630000000
-3,2041,R1,procammonia_1,2025,8.70630000000
-3,2042,R1,procammonia_1,2025,8.70630000000
-3,2043,R1,procammonia_1,2025,8.70630000000
-3,2044,R1,procammonia_1,2025,8.70630000000
-3,2045,R1,procammonia_1,2025,8.70630000000
-3,2046,R1,procammonia_1,2025,8.70630000000
-3,2047,R1,procammonia_1,2025,8.70630000000
-3,2048,R1,procammonia_1,2025,8.70630000000
-3,2049,R1,procammonia_1,2025,8.70630000000
-4,2035,R1,procammonia_1,2030,18.79580000000
-4,2036,R1,procammonia_1,2030,18.79580000000
-4,2037,R1,procammonia_1,2030,18.79580000000
-4,2038,R1,procammonia_1,2030,18.79580000000
-4,2039,R1,procammonia_1,2030,18.79580000000
-4,2040,R1,procammonia_1,2030,18.79580000000
-4,2041,R1,procammonia_1,2030,18.79580000000
-4,2042,R1,procammonia_1,2030,18.79580000000
-4,2043,R1,procammonia_1,2030,18.79580000000
-4,2044,R1,procammonia_1,2030,18.79580000000
-4,2045,R1,procammonia_1,2030,18.79580000000
-4,2046,R1,procammonia_1,2030,18.79580000000
-4,2047,R1,procammonia_1,2030,18.79580000000
-4,2048,R1,procammonia_1,2030,18.79580000000
-4,2049,R1,procammonia_1,2030,18.79580000000
-4,2050,R1,procammonia_1,2030,18.79580000000
-4,2054,R1,procammonia_1,2030,18.79580000000
-5,2040,R1,procammonia_1,2035,16.54120000000
-5,2041,R1,procammonia_1,2035,16.54120000000
-5,2042,R1,procammonia_1,2035,16.54120000000
-5,2043,R1,procammonia_1,2035,16.54120000000
-5,2044,R1,procammonia_1,2035,16.54120000000
-5,2045,R1,procammonia_1,2035,16.54120000000
-5,2046,R1,procammonia_1,2035,16.54120000000
-5,2047,R1,procammonia_1,2035,16.54120000000
-5,2048,R1,procammonia_1,2035,16.54120000000
-5,2049,R1,procammonia_1,2035,16.54120000000
-5,2050,R1,procammonia_1,2035,16.54120000000
-5,2054,R1,procammonia_1,2035,16.54120000000
-5,2055,R1,procammonia_1,2035,16.54120000000
-5,2059,R1,procammonia_1,2035,16.54120000000
-6,2045,R1,procammonia_1,2040,7.21970000000
-6,2046,R1,procammonia_1,2040,7.21970000000
-6,2047,R1,procammonia_1,2040,7.21970000000
-6,2048,R1,procammonia_1,2040,7.21970000000
-6,2049,R1,procammonia_1,2040,7.21970000000
-6,2050,R1,procammonia_1,2040,7.21970000000
-6,2054,R1,procammonia_1,2040,7.21970000000
-6,2055,R1,procammonia_1,2040,7.21970000000
-6,2059,R1,procammonia_1,2040,7.21970000000
-6,2060,R1,procammonia_1,2040,7.21970000000
-6,2064,R1,procammonia_1,2040,7.21970000000
-7,2050,R1,procammonia_1,2045,7.21970000000
-7,2054,R1,procammonia_1,2045,7.21970000000
-7,2055,R1,procammonia_1,2045,7.21970000000
-7,2059,R1,procammonia_1,2045,7.21970000000
-7,2060,R1,procammonia_1,2045,7.21970000000
-7,2064,R1,procammonia_1,2045,7.21970000000
-7,2065,R1,procammonia_1,2045,7.21970000000
-7,2069,R1,procammonia_1,2045,7.21970000000
-8,2010,R1,procammonia_2,2010,26.00000000000
-8,2011,R1,procammonia_2,2010,25.13330000000
-8,2012,R1,procammonia_2,2010,24.26670000000
-8,2013,R1,procammonia_2,2010,23.40000000000
-8,2014,R1,procammonia_2,2010,22.53330000000
-8,2015,R1,procammonia_2,2010,24.35470000000
-8,2016,R1,procammonia_2,2010,23.48800000000
-8,2017,R1,procammonia_2,2010,22.62140000000
-8,2018,R1,procammonia_2,2010,21.75470000000
-8,2019,R1,procammonia_2,2010,20.88800000000
-8,2020,R1,procammonia_2,2010,20.02140000000
-8,2021,R1,procammonia_2,2010,19.15470000000
-8,2022,R1,procammonia_2,2010,18.28800000000
-8,2023,R1,procammonia_2,2010,17.42140000000
-8,2024,R1,procammonia_2,2010,16.55470000000
-8,2025,R1,procammonia_2,2010,15.68800000000
-8,2026,R1,procammonia_2,2010,14.82140000000
-8,2027,R1,procammonia_2,2010,13.95470000000
-8,2028,R1,procammonia_2,2010,13.08800000000
-8,2029,R1,procammonia_2,2010,12.22140000000
-8,2030,R1,procammonia_2,2010,11.35470000000
-8,2031,R1,procammonia_2,2010,10.48800000000
-8,2032,R1,procammonia_2,2010,9.62140000000
-8,2033,R1,procammonia_2,2010,8.75470000000
-8,2034,R1,procammonia_2,2010,7.88800000000
-8,2035,R1,procammonia_2,2010,4.33330000000
-8,2036,R1,procammonia_2,2010,3.46670000000
-8,2037,R1,procammonia_2,2010,2.60000000000
-8,2038,R1,procammonia_2,2010,1.73330000000
-8,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
deleted file mode 100644
index f7944ec96..000000000
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
+++ /dev/null
@@ -1,179 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2010,R1,procammonia_1,2010,26.00000000000
-0,2011,R1,procammonia_1,2010,25.13330000000
-0,2012,R1,procammonia_1,2010,24.26670000000
-0,2013,R1,procammonia_1,2010,23.40000000000
-0,2014,R1,procammonia_1,2010,22.53330000000
-0,2015,R1,procammonia_1,2010,29.90000000000
-0,2016,R1,procammonia_1,2010,29.03330000000
-0,2017,R1,procammonia_1,2010,28.16670000000
-0,2018,R1,procammonia_1,2010,27.30000000000
-0,2019,R1,procammonia_1,2010,26.43330000000
-0,2020,R1,procammonia_1,2010,25.56670000000
-0,2021,R1,procammonia_1,2010,24.70000000000
-0,2022,R1,procammonia_1,2010,23.83330000000
-0,2023,R1,procammonia_1,2010,22.96670000000
-0,2024,R1,procammonia_1,2010,22.10000000000
-0,2025,R1,procammonia_1,2010,21.23330000000
-0,2026,R1,procammonia_1,2010,20.36670000000
-0,2027,R1,procammonia_1,2010,19.50000000000
-0,2028,R1,procammonia_1,2010,18.63330000000
-0,2029,R1,procammonia_1,2010,17.76670000000
-0,2030,R1,procammonia_1,2010,16.90000000000
-0,2031,R1,procammonia_1,2010,16.03330000000
-0,2032,R1,procammonia_1,2010,15.16670000000
-0,2033,R1,procammonia_1,2010,14.30000000000
-0,2034,R1,procammonia_1,2010,13.43330000000
-0,2035,R1,procammonia_1,2010,4.33330000000
-0,2036,R1,procammonia_1,2010,3.46670000000
-0,2037,R1,procammonia_1,2010,2.60000000000
-0,2038,R1,procammonia_1,2010,1.73330000000
-0,2039,R1,procammonia_1,2010,0.86670000000
-1,2020,R1,procammonia_1,2015,8.66670000000
-1,2021,R1,procammonia_1,2015,8.66670000000
-1,2022,R1,procammonia_1,2015,8.66670000000
-1,2023,R1,procammonia_1,2015,8.66670000000
-1,2024,R1,procammonia_1,2015,8.66670000000
-1,2025,R1,procammonia_1,2015,8.66670000000
-1,2026,R1,procammonia_1,2015,8.66670000000
-1,2027,R1,procammonia_1,2015,8.66670000000
-1,2028,R1,procammonia_1,2015,8.66670000000
-1,2029,R1,procammonia_1,2015,8.66670000000
-1,2030,R1,procammonia_1,2015,8.66670000000
-1,2031,R1,procammonia_1,2015,8.66670000000
-1,2032,R1,procammonia_1,2015,8.66670000000
-1,2033,R1,procammonia_1,2015,8.66670000000
-1,2034,R1,procammonia_1,2015,8.66670000000
-1,2035,R1,procammonia_1,2015,8.66670000000
-1,2036,R1,procammonia_1,2015,8.66670000000
-1,2037,R1,procammonia_1,2015,8.66670000000
-1,2038,R1,procammonia_1,2015,8.66670000000
-1,2039,R1,procammonia_1,2015,8.66670000000
-2,2025,R1,procammonia_1,2020,8.70630000000
-2,2026,R1,procammonia_1,2020,8.70630000000
-2,2027,R1,procammonia_1,2020,8.70630000000
-2,2028,R1,procammonia_1,2020,8.70630000000
-2,2029,R1,procammonia_1,2020,8.70630000000
-2,2030,R1,procammonia_1,2020,8.70630000000
-2,2031,R1,procammonia_1,2020,8.70630000000
-2,2032,R1,procammonia_1,2020,8.70630000000
-2,2033,R1,procammonia_1,2020,8.70630000000
-2,2034,R1,procammonia_1,2020,8.70630000000
-2,2035,R1,procammonia_1,2020,8.70630000000
-2,2036,R1,procammonia_1,2020,8.70630000000
-2,2037,R1,procammonia_1,2020,8.70630000000
-2,2038,R1,procammonia_1,2020,8.70630000000
-2,2039,R1,procammonia_1,2020,8.70630000000
-2,2040,R1,procammonia_1,2020,8.70630000000
-2,2041,R1,procammonia_1,2020,8.70630000000
-2,2042,R1,procammonia_1,2020,8.70630000000
-2,2043,R1,procammonia_1,2020,8.70630000000
-2,2044,R1,procammonia_1,2020,8.70630000000
-3,2030,R1,procammonia_1,2025,8.70630000000
-3,2031,R1,procammonia_1,2025,8.70630000000
-3,2032,R1,procammonia_1,2025,8.70630000000
-3,2033,R1,procammonia_1,2025,8.70630000000
-3,2034,R1,procammonia_1,2025,8.70630000000
-3,2035,R1,procammonia_1,2025,8.70630000000
-3,2036,R1,procammonia_1,2025,8.70630000000
-3,2037,R1,procammonia_1,2025,8.70630000000
-3,2038,R1,procammonia_1,2025,8.70630000000
-3,2039,R1,procammonia_1,2025,8.70630000000
-3,2040,R1,procammonia_1,2025,8.70630000000
-3,2041,R1,procammonia_1,2025,8.70630000000
-3,2042,R1,procammonia_1,2025,8.70630000000
-3,2043,R1,procammonia_1,2025,8.70630000000
-3,2044,R1,procammonia_1,2025,8.70630000000
-3,2045,R1,procammonia_1,2025,8.70630000000
-3,2046,R1,procammonia_1,2025,8.70630000000
-3,2047,R1,procammonia_1,2025,8.70630000000
-3,2048,R1,procammonia_1,2025,8.70630000000
-3,2049,R1,procammonia_1,2025,8.70630000000
-4,2035,R1,procammonia_1,2030,18.79580000000
-4,2036,R1,procammonia_1,2030,18.79580000000
-4,2037,R1,procammonia_1,2030,18.79580000000
-4,2038,R1,procammonia_1,2030,18.79580000000
-4,2039,R1,procammonia_1,2030,18.79580000000
-4,2040,R1,procammonia_1,2030,18.79580000000
-4,2041,R1,procammonia_1,2030,18.79580000000
-4,2042,R1,procammonia_1,2030,18.79580000000
-4,2043,R1,procammonia_1,2030,18.79580000000
-4,2044,R1,procammonia_1,2030,18.79580000000
-4,2045,R1,procammonia_1,2030,18.79580000000
-4,2046,R1,procammonia_1,2030,18.79580000000
-4,2047,R1,procammonia_1,2030,18.79580000000
-4,2048,R1,procammonia_1,2030,18.79580000000
-4,2049,R1,procammonia_1,2030,18.79580000000
-4,2050,R1,procammonia_1,2030,18.79580000000
-4,2054,R1,procammonia_1,2030,18.79580000000
-5,2040,R1,procammonia_1,2035,16.54120000000
-5,2041,R1,procammonia_1,2035,16.54120000000
-5,2042,R1,procammonia_1,2035,16.54120000000
-5,2043,R1,procammonia_1,2035,16.54120000000
-5,2044,R1,procammonia_1,2035,16.54120000000
-5,2045,R1,procammonia_1,2035,16.54120000000
-5,2046,R1,procammonia_1,2035,16.54120000000
-5,2047,R1,procammonia_1,2035,16.54120000000
-5,2048,R1,procammonia_1,2035,16.54120000000
-5,2049,R1,procammonia_1,2035,16.54120000000
-5,2050,R1,procammonia_1,2035,16.54120000000
-5,2054,R1,procammonia_1,2035,16.54120000000
-5,2055,R1,procammonia_1,2035,16.54120000000
-5,2059,R1,procammonia_1,2035,16.54120000000
-6,2045,R1,procammonia_1,2040,7.21970000000
-6,2046,R1,procammonia_1,2040,7.21970000000
-6,2047,R1,procammonia_1,2040,7.21970000000
-6,2048,R1,procammonia_1,2040,7.21970000000
-6,2049,R1,procammonia_1,2040,7.21970000000
-6,2050,R1,procammonia_1,2040,7.21970000000
-6,2054,R1,procammonia_1,2040,7.21970000000
-6,2055,R1,procammonia_1,2040,7.21970000000
-6,2059,R1,procammonia_1,2040,7.21970000000
-6,2060,R1,procammonia_1,2040,7.21970000000
-6,2064,R1,procammonia_1,2040,7.21970000000
-7,2050,R1,procammonia_1,2045,7.21970000000
-7,2054,R1,procammonia_1,2045,7.21970000000
-7,2055,R1,procammonia_1,2045,7.21970000000
-7,2059,R1,procammonia_1,2045,7.21970000000
-7,2060,R1,procammonia_1,2045,7.21970000000
-7,2064,R1,procammonia_1,2045,7.21970000000
-7,2065,R1,procammonia_1,2045,7.21970000000
-7,2069,R1,procammonia_1,2045,7.21970000000
-8,2055,R1,procammonia_1,2050,18.79580000000
-8,2059,R1,procammonia_1,2050,18.79580000000
-8,2060,R1,procammonia_1,2050,18.79580000000
-8,2064,R1,procammonia_1,2050,18.79580000000
-8,2065,R1,procammonia_1,2050,18.79580000000
-8,2069,R1,procammonia_1,2050,18.79580000000
-8,2070,R1,procammonia_1,2050,18.79580000000
-8,2074,R1,procammonia_1,2050,18.79580000000
-9,2010,R1,procammonia_2,2010,26.00000000000
-9,2011,R1,procammonia_2,2010,25.13330000000
-9,2012,R1,procammonia_2,2010,24.26670000000
-9,2013,R1,procammonia_2,2010,23.40000000000
-9,2014,R1,procammonia_2,2010,22.53330000000
-9,2015,R1,procammonia_2,2010,24.35470000000
-9,2016,R1,procammonia_2,2010,23.48800000000
-9,2017,R1,procammonia_2,2010,22.62140000000
-9,2018,R1,procammonia_2,2010,21.75470000000
-9,2019,R1,procammonia_2,2010,20.88800000000
-9,2020,R1,procammonia_2,2010,20.02140000000
-9,2021,R1,procammonia_2,2010,19.15470000000
-9,2022,R1,procammonia_2,2010,18.28800000000
-9,2023,R1,procammonia_2,2010,17.42140000000
-9,2024,R1,procammonia_2,2010,16.55470000000
-9,2025,R1,procammonia_2,2010,15.68800000000
-9,2026,R1,procammonia_2,2010,14.82140000000
-9,2027,R1,procammonia_2,2010,13.95470000000
-9,2028,R1,procammonia_2,2010,13.08800000000
-9,2029,R1,procammonia_2,2010,12.22140000000
-9,2030,R1,procammonia_2,2010,11.35470000000
-9,2031,R1,procammonia_2,2010,10.48800000000
-9,2032,R1,procammonia_2,2010,9.62140000000
-9,2033,R1,procammonia_2,2010,8.75470000000
-9,2034,R1,procammonia_2,2010,7.88800000000
-9,2035,R1,procammonia_2,2010,4.33330000000
-9,2036,R1,procammonia_2,2010,3.46670000000
-9,2037,R1,procammonia_2,2010,2.60000000000
-9,2038,R1,procammonia_2,2010,1.73330000000
-9,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply.csv b/tests/example_outputs/minimum_service/Industry/Supply.csv
new file mode 100644
index 000000000..26a6a6f8e
--- /dev/null
+++ b/tests/example_outputs/minimum_service/Industry/Supply.csv
@@ -0,0 +1,205 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,CO2f,all-week,all-day,2010,winter,R1,30397.66160000000,procammonia_1,0,2010
+1,CO2f,all-week,all-day,2010,winter,R1,22694.61780000000,procammonia_2,0,2010
+0,ammonia,all-week,all-day,2010,winter,R1,7.29300000000,procammonia_1,0,2010
+1,ammonia,all-week,all-day,2010,winter,R1,7.29300000000,procammonia_2,0,2010
+0,CO2f,all-week,all-day,2010,summer,R1,31318.80280000000,procammonia_1,1,2010
+1,CO2f,all-week,all-day,2010,summer,R1,23382.33350000000,procammonia_2,1,2010
+0,ammonia,all-week,all-day,2010,summer,R1,7.51400000000,procammonia_1,1,2010
+1,ammonia,all-week,all-day,2010,summer,R1,7.51400000000,procammonia_2,1,2010
+0,CO2f,all-week,all-day,2010,spring-autumn,R1,30397.66160000000,procammonia_1,2,2010
+1,CO2f,all-week,all-day,2010,spring-autumn,R1,22694.61780000000,procammonia_2,2,2010
+0,ammonia,all-week,all-day,2010,spring-autumn,R1,7.29300000000,procammonia_1,2,2010
+1,ammonia,all-week,all-day,2010,spring-autumn,R1,7.29300000000,procammonia_2,2,2010
+0,CO2f,all-week,all-day,2010,winter,R1,34271.87340000000,procammonia_1,0,2015
+2,CO2f,all-week,all-day,2010,winter,R1,20841.64410000000,procammonia_2,0,2015
+0,ammonia,all-week,all-day,2010,winter,R1,8.22250000000,procammonia_1,0,2015
+2,ammonia,all-week,all-day,2010,winter,R1,6.69750000000,procammonia_2,0,2015
+0,CO2f,all-week,all-day,2010,summer,R1,35310.41500000000,procammonia_1,1,2015
+2,CO2f,all-week,all-day,2010,summer,R1,21473.20910000000,procammonia_2,1,2015
+0,ammonia,all-week,all-day,2010,summer,R1,8.47170000000,procammonia_1,1,2015
+2,ammonia,all-week,all-day,2010,summer,R1,6.90050000000,procammonia_2,1,2015
+0,CO2f,all-week,all-day,2010,spring-autumn,R1,34271.87340000000,procammonia_1,2,2015
+2,CO2f,all-week,all-day,2010,spring-autumn,R1,20841.64410000000,procammonia_2,2,2015
+0,ammonia,all-week,all-day,2010,spring-autumn,R1,8.22250000000,procammonia_1,2,2015
+2,ammonia,all-week,all-day,2010,spring-autumn,R1,6.69750000000,procammonia_2,2,2015
+0,CO2f,all-week,all-day,2010,winter,R1,29304.93520000000,procammonia_1,0,2020
+1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2020
+3,CO2f,all-week,all-day,2010,winter,R1,17133.37320000000,procammonia_2,0,2020
+0,ammonia,all-week,all-day,2010,winter,R1,7.03080000000,procammonia_1,0,2020
+1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2020
+3,ammonia,all-week,all-day,2010,winter,R1,5.50590000000,procammonia_2,0,2020
+0,CO2f,all-week,all-day,2010,summer,R1,30192.96350000000,procammonia_1,1,2020
+1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2020
+3,CO2f,all-week,all-day,2010,summer,R1,17652.56630000000,procammonia_2,1,2020
+0,ammonia,all-week,all-day,2010,summer,R1,7.24390000000,procammonia_1,1,2020
+1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2020
+3,ammonia,all-week,all-day,2010,summer,R1,5.67270000000,procammonia_2,1,2020
+0,CO2f,all-week,all-day,2010,spring-autumn,R1,29304.93520000000,procammonia_1,2,2020
+1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2020
+3,CO2f,all-week,all-day,2010,spring-autumn,R1,17133.37320000000,procammonia_2,2,2020
+0,ammonia,all-week,all-day,2010,spring-autumn,R1,7.03080000000,procammonia_1,2,2020
+1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2020
+3,ammonia,all-week,all-day,2010,spring-autumn,R1,5.50590000000,procammonia_2,2,2020
+0,CO2f,all-week,all-day,2010,winter,R1,24337.99700000000,procammonia_1,0,2025
+1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2025
+2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2025
+4,CO2f,all-week,all-day,2010,winter,R1,13425.10230000000,procammonia_2,0,2025
+0,ammonia,all-week,all-day,2010,winter,R1,5.83920000000,procammonia_1,0,2025
+1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2025
+2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2025
+4,ammonia,all-week,all-day,2010,winter,R1,4.31420000000,procammonia_2,0,2025
+0,CO2f,all-week,all-day,2010,summer,R1,25075.51210000000,procammonia_1,1,2025
+1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2025
+2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2025
+4,CO2f,all-week,all-day,2010,summer,R1,13831.92360000000,procammonia_2,1,2025
+0,ammonia,all-week,all-day,2010,summer,R1,6.01610000000,procammonia_1,1,2025
+1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2025
+2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2025
+4,ammonia,all-week,all-day,2010,summer,R1,4.44490000000,procammonia_2,1,2025
+0,CO2f,all-week,all-day,2010,spring-autumn,R1,24337.99700000000,procammonia_1,2,2025
+1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2025
+2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2025
+4,CO2f,all-week,all-day,2010,spring-autumn,R1,13425.10230000000,procammonia_2,2,2025
+0,ammonia,all-week,all-day,2010,spring-autumn,R1,5.83920000000,procammonia_1,2,2025
+1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2025
+2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2025
+4,ammonia,all-week,all-day,2010,spring-autumn,R1,4.31420000000,procammonia_2,2,2025
+0,CO2f,all-week,all-day,2010,winter,R1,19371.05890000000,procammonia_1,0,2030
+1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2030
+2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2030
+3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2030
+5,CO2f,all-week,all-day,2010,winter,R1,9716.83140000000,procammonia_2,0,2030
+0,ammonia,all-week,all-day,2010,winter,R1,4.64750000000,procammonia_1,0,2030
+1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2030
+2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2030
+3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2030
+5,ammonia,all-week,all-day,2010,winter,R1,3.12250000000,procammonia_2,0,2030
+0,CO2f,all-week,all-day,2010,summer,R1,19958.06060000000,procammonia_1,1,2030
+1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2030
+2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2030
+3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2030
+5,CO2f,all-week,all-day,2010,summer,R1,10011.28090000000,procammonia_2,1,2030
+0,ammonia,all-week,all-day,2010,summer,R1,4.78830000000,procammonia_1,1,2030
+1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2030
+2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2030
+3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2030
+5,ammonia,all-week,all-day,2010,summer,R1,3.21720000000,procammonia_2,1,2030
+0,CO2f,all-week,all-day,2010,spring-autumn,R1,19371.05890000000,procammonia_1,2,2030
+1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2030
+2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2030
+3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2030
+5,CO2f,all-week,all-day,2010,spring-autumn,R1,9716.83140000000,procammonia_2,2,2030
+0,ammonia,all-week,all-day,2010,spring-autumn,R1,4.64750000000,procammonia_1,2,2030
+1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2030
+2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2030
+3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2030
+5,ammonia,all-week,all-day,2010,spring-autumn,R1,3.12250000000,procammonia_2,2,2030
+0,CO2f,all-week,all-day,2010,winter,R1,4966.93820000000,procammonia_1,0,2035
+1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2035
+2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2035
+3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2035
+4,CO2f,all-week,all-day,2030,winter,R1,20879.16640000000,procammonia_1,0,2035
+6,CO2f,all-week,all-day,2010,winter,R1,3708.27090000000,procammonia_2,0,2035
+0,ammonia,all-week,all-day,2010,winter,R1,1.19170000000,procammonia_1,0,2035
+1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2035
+2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2035
+3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2035
+4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2035
+6,ammonia,all-week,all-day,2010,winter,R1,1.19170000000,procammonia_2,0,2035
+0,CO2f,all-week,all-day,2010,summer,R1,5117.45140000000,procammonia_1,1,2035
+1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2035
+2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2035
+3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2035
+4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2035
+6,CO2f,all-week,all-day,2010,summer,R1,3820.64270000000,procammonia_2,1,2035
+0,ammonia,all-week,all-day,2010,summer,R1,1.22780000000,procammonia_1,1,2035
+1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2035
+2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2035
+3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2035
+4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2035
+6,ammonia,all-week,all-day,2010,summer,R1,1.22780000000,procammonia_2,1,2035
+0,CO2f,all-week,all-day,2010,spring-autumn,R1,4966.93820000000,procammonia_1,2,2035
+1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2035
+2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2035
+3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2035
+4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16640000000,procammonia_1,2,2035
+6,CO2f,all-week,all-day,2010,spring-autumn,R1,3708.27090000000,procammonia_2,2,2035
+0,ammonia,all-week,all-day,2010,spring-autumn,R1,1.19170000000,procammonia_1,2,2035
+1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2035
+2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2035
+3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2035
+4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2035
+6,ammonia,all-week,all-day,2010,spring-autumn,R1,1.19170000000,procammonia_2,2,2035
+2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2040
+3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2040
+4,CO2f,all-week,all-day,2030,winter,R1,20879.16630000000,procammonia_1,0,2040
+5,CO2f,all-week,all-day,2035,winter,R1,18228.27250000000,procammonia_1,0,2040
+2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2040
+3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2040
+4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2040
+5,ammonia,all-week,all-day,2035,winter,R1,4.54880000000,procammonia_1,0,2040
+2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2040
+3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2040
+4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2040
+5,CO2f,all-week,all-day,2035,summer,R1,18780.64440000000,procammonia_1,1,2040
+2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2040
+3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2040
+4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2040
+5,ammonia,all-week,all-day,2035,summer,R1,4.68670000000,procammonia_1,1,2040
+2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2040
+3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2040
+4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16630000000,procammonia_1,2,2040
+5,CO2f,all-week,all-day,2035,spring-autumn,R1,18228.27250000000,procammonia_1,2,2040
+2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2040
+3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2040
+4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2040
+5,ammonia,all-week,all-day,2035,spring-autumn,R1,4.54880000000,procammonia_1,2,2040
+3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2045
+4,CO2f,all-week,all-day,2030,winter,R1,20879.16630000000,procammonia_1,0,2045
+5,CO2f,all-week,all-day,2035,winter,R1,18228.27250000000,procammonia_1,0,2045
+6,CO2f,all-week,all-day,2040,winter,R1,7892.26240000000,procammonia_1,0,2045
+3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2045
+4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2045
+5,ammonia,all-week,all-day,2035,winter,R1,4.54880000000,procammonia_1,0,2045
+6,ammonia,all-week,all-day,2040,winter,R1,1.98540000000,procammonia_1,0,2045
+3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2045
+4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2045
+5,CO2f,all-week,all-day,2035,summer,R1,18780.64440000000,procammonia_1,1,2045
+6,CO2f,all-week,all-day,2040,summer,R1,8131.42190000000,procammonia_1,1,2045
+3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2045
+4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2045
+5,ammonia,all-week,all-day,2035,summer,R1,4.68670000000,procammonia_1,1,2045
+6,ammonia,all-week,all-day,2040,summer,R1,2.04560000000,procammonia_1,1,2045
+3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2045
+4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16630000000,procammonia_1,2,2045
+5,CO2f,all-week,all-day,2035,spring-autumn,R1,18228.27250000000,procammonia_1,2,2045
+6,CO2f,all-week,all-day,2040,spring-autumn,R1,7892.26240000000,procammonia_1,2,2045
+3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2045
+4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2045
+5,ammonia,all-week,all-day,2035,spring-autumn,R1,4.54880000000,procammonia_1,2,2045
+6,ammonia,all-week,all-day,2040,spring-autumn,R1,1.98540000000,procammonia_1,2,2045
+4,CO2f,all-week,all-day,2030,winter,R1,20879.16640000000,procammonia_1,0,2050
+5,CO2f,all-week,all-day,2035,winter,R1,18228.27250000000,procammonia_1,0,2050
+6,CO2f,all-week,all-day,2040,winter,R1,7892.26240000000,procammonia_1,0,2050
+7,CO2f,all-week,all-day,2045,winter,R1,7828.40920000000,procammonia_1,0,2050
+4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2050
+5,ammonia,all-week,all-day,2035,winter,R1,4.54880000000,procammonia_1,0,2050
+6,ammonia,all-week,all-day,2040,winter,R1,1.98540000000,procammonia_1,0,2050
+7,ammonia,all-week,all-day,2045,winter,R1,1.98540000000,procammonia_1,0,2050
+4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2050
+5,CO2f,all-week,all-day,2035,summer,R1,18780.64440000000,procammonia_1,1,2050
+6,CO2f,all-week,all-day,2040,summer,R1,8131.42190000000,procammonia_1,1,2050
+7,CO2f,all-week,all-day,2045,summer,R1,8065.63370000000,procammonia_1,1,2050
+4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2050
+5,ammonia,all-week,all-day,2035,summer,R1,4.68670000000,procammonia_1,1,2050
+6,ammonia,all-week,all-day,2040,summer,R1,2.04560000000,procammonia_1,1,2050
+7,ammonia,all-week,all-day,2045,summer,R1,2.04560000000,procammonia_1,1,2050
+4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16640000000,procammonia_1,2,2050
+5,CO2f,all-week,all-day,2035,spring-autumn,R1,18228.27250000000,procammonia_1,2,2050
+6,CO2f,all-week,all-day,2040,spring-autumn,R1,7892.26240000000,procammonia_1,2,2050
+7,CO2f,all-week,all-day,2045,spring-autumn,R1,7828.40920000000,procammonia_1,2,2050
+4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2050
+5,ammonia,all-week,all-day,2035,spring-autumn,R1,4.54880000000,procammonia_1,2,2050
+6,ammonia,all-week,all-day,2040,spring-autumn,R1,1.98540000000,procammonia_1,2,2050
+7,ammonia,all-week,all-day,2045,spring-autumn,R1,1.98540000000,procammonia_1,2,2050
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2010.csv b/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
deleted file mode 100644
index d0e14abfa..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2010,0,R1,winter,all-week,all-day,procammonia_1,2010,30397.66160000000
-0,CO2f,2010,1,R1,winter,all-week,all-day,procammonia_2,2010,22694.61780000000
-0,CO2f,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
-0,CO2f,2015,1,R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
-0,ammonia,2010,0,R1,winter,all-week,all-day,procammonia_1,2010,7.29300000000
-0,ammonia,2010,1,R1,winter,all-week,all-day,procammonia_2,2010,7.29300000000
-0,ammonia,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
-0,ammonia,2015,1,R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
-1,CO2f,2010,0,R1,summer,all-week,all-day,procammonia_1,2010,31318.80280000000
-1,CO2f,2010,1,R1,summer,all-week,all-day,procammonia_2,2010,23382.33350000000
-1,CO2f,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
-1,CO2f,2015,1,R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
-1,ammonia,2010,0,R1,summer,all-week,all-day,procammonia_1,2010,7.51400000000
-1,ammonia,2010,1,R1,summer,all-week,all-day,procammonia_2,2010,7.51400000000
-1,ammonia,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
-1,ammonia,2015,1,R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
-2,CO2f,2010,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,30397.66160000000
-2,CO2f,2010,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,22694.61780000000
-2,CO2f,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
-2,CO2f,2015,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
-2,ammonia,2010,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.29300000000
-2,ammonia,2010,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,7.29300000000
-2,ammonia,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
-2,ammonia,2015,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,6.69750000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2015.csv b/tests/example_outputs/minimum_service/Industry/Supply/2015.csv
deleted file mode 100644
index b7ce66c28..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2015.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
-0,CO2f,2015,2,R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
-0,CO2f,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
-0,CO2f,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2020,2,R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
-0,ammonia,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
-0,ammonia,2015,2,R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
-0,ammonia,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
-0,ammonia,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2020,2,R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
-1,CO2f,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
-1,CO2f,2015,2,R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
-1,CO2f,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
-1,CO2f,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2020,2,R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
-1,ammonia,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
-1,ammonia,2015,2,R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
-1,ammonia,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
-1,ammonia,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2020,2,R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
-2,CO2f,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
-2,CO2f,2015,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
-2,CO2f,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
-2,CO2f,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2020,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
-2,ammonia,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
-2,ammonia,2015,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,6.69750000000
-2,ammonia,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
-2,ammonia,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2020,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2020.csv b/tests/example_outputs/minimum_service/Industry/Supply/2020.csv
deleted file mode 100644
index bc3092923..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2020.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
-0,CO2f,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2020,3,R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
-0,CO2f,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
-0,CO2f,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2025,3,R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
-0,ammonia,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
-0,ammonia,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2020,3,R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
-0,ammonia,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
-0,ammonia,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2025,3,R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
-1,CO2f,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
-1,CO2f,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2020,3,R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
-1,CO2f,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
-1,CO2f,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2025,3,R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
-1,ammonia,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
-1,ammonia,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2020,3,R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
-1,ammonia,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
-1,ammonia,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2025,3,R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
-2,CO2f,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
-2,CO2f,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2020,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
-2,CO2f,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
-2,CO2f,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2025,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
-2,ammonia,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
-2,ammonia,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2020,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
-2,ammonia,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
-2,ammonia,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2025,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,4.31420000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2025.csv b/tests/example_outputs/minimum_service/Industry/Supply/2025.csv
deleted file mode 100644
index 618f98195..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2025.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
-0,CO2f,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2025,4,R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
-0,CO2f,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
-0,CO2f,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2030,4,R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
-0,ammonia,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
-0,ammonia,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2025,4,R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
-0,ammonia,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
-0,ammonia,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2030,4,R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
-1,CO2f,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
-1,CO2f,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2025,4,R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
-1,CO2f,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
-1,CO2f,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2030,4,R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
-1,ammonia,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
-1,ammonia,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2025,4,R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
-1,ammonia,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
-1,ammonia,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2030,4,R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
-2,CO2f,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
-2,CO2f,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2025,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
-2,CO2f,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
-2,CO2f,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2030,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
-2,ammonia,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
-2,ammonia,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2025,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,4.31420000000
-2,ammonia,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
-2,ammonia,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2030,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3.12250000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2030.csv b/tests/example_outputs/minimum_service/Industry/Supply/2030.csv
deleted file mode 100644
index 971a1bc6c..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2030.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
-0,CO2f,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2030,5,R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
-0,CO2f,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
-0,CO2f,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-0,CO2f,2035,5,R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
-0,ammonia,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
-0,ammonia,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2030,5,R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
-0,ammonia,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
-0,ammonia,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2035,5,R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
-1,CO2f,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
-1,CO2f,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2030,5,R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
-1,CO2f,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
-1,CO2f,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2035,5,R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
-1,ammonia,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
-1,ammonia,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2030,5,R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
-1,ammonia,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
-1,ammonia,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2035,5,R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
-2,CO2f,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
-2,CO2f,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2030,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
-2,CO2f,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
-2,CO2f,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-2,CO2f,2035,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
-2,ammonia,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
-2,ammonia,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2030,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3.12250000000
-2,ammonia,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
-2,ammonia,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2035,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2035.csv b/tests/example_outputs/minimum_service/Industry/Supply/2035.csv
deleted file mode 100644
index 68b96dd67..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2035.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
-0,CO2f,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-0,CO2f,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-0,CO2f,2035,6,R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
-0,CO2f,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-0,CO2f,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,ammonia,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
-0,ammonia,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-0,ammonia,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2035,6,R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
-0,ammonia,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-1,CO2f,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
-1,CO2f,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-1,CO2f,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2035,6,R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
-1,CO2f,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,ammonia,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
-1,ammonia,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-1,ammonia,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2035,6,R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
-1,ammonia,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-2,CO2f,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
-2,CO2f,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-2,CO2f,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-2,CO2f,2035,6,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
-2,CO2f,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-2,CO2f,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,ammonia,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
-2,ammonia,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-2,ammonia,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2035,6,R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
-2,ammonia,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2040.csv b/tests/example_outputs/minimum_service/Industry/Supply/2040.csv
deleted file mode 100644
index 21e8b0e5e..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-0,CO2f,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-0,CO2f,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,CO2f,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-0,CO2f,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,CO2f,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-0,ammonia,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-0,ammonia,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-0,ammonia,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-0,ammonia,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-1,CO2f,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-1,CO2f,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,CO2f,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,CO2f,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-1,ammonia,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-1,ammonia,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-1,ammonia,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-1,ammonia,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-2,CO2f,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-2,CO2f,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-2,CO2f,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,CO2f,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-2,CO2f,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,CO2f,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-2,ammonia,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-2,ammonia,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-2,ammonia,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-2,ammonia,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2045.csv b/tests/example_outputs/minimum_service/Industry/Supply/2045.csv
deleted file mode 100644
index 91510f365..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2045.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-0,CO2f,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-0,CO2f,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,CO2f,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-0,CO2f,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-0,CO2f,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,CO2f,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-0,CO2f,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
-0,ammonia,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-0,ammonia,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-0,ammonia,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-0,ammonia,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-0,ammonia,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-0,ammonia,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
-1,CO2f,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-1,CO2f,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,CO2f,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-1,CO2f,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,CO2f,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-1,CO2f,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
-1,ammonia,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-1,ammonia,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-1,ammonia,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-1,ammonia,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-1,ammonia,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-1,ammonia,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
-2,CO2f,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-2,CO2f,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-2,CO2f,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,CO2f,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-2,CO2f,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-2,CO2f,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,CO2f,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-2,CO2f,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
-2,ammonia,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-2,ammonia,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-2,ammonia,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-2,ammonia,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-2,ammonia,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-2,ammonia,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv
deleted file mode 100644
index 5c1490c8b..000000000
--- a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-0,CO2f,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,CO2f,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-0,CO2f,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
-0,CO2f,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-0,CO2f,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-0,CO2f,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
-0,CO2f,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,20214.22470000000
-0,ammonia,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-0,ammonia,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-0,ammonia,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-0,ammonia,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
-0,ammonia,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-0,ammonia,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-0,ammonia,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
-0,ammonia,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,5.16890000000
-1,CO2f,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-1,CO2f,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,CO2f,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-1,CO2f,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
-1,CO2f,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-1,CO2f,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-1,CO2f,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
-1,CO2f,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,20826.77700000000
-1,ammonia,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-1,ammonia,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-1,ammonia,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-1,ammonia,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
-1,ammonia,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-1,ammonia,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-1,ammonia,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
-1,ammonia,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,5.32550000000
-2,CO2f,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-2,CO2f,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,CO2f,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-2,CO2f,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
-2,CO2f,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-2,CO2f,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-2,CO2f,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
-2,CO2f,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,20214.22470000000
-2,ammonia,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-2,ammonia,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-2,ammonia,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-2,ammonia,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
-2,ammonia,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-2,ammonia,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-2,ammonia,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
-2,ammonia,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,5.16890000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity.csv b/tests/example_outputs/multiple_agents/Gas/Capacity.csv
new file mode 100644
index 000000000..b8b8c36a0
--- /dev/null
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity.csv
@@ -0,0 +1,18 @@
+asset,capacity,installed,region,technology,year
+0,15.00000000000,2020,R1,gassupply1,2020
+0,16.73530000000,2020,R1,gassupply1,2025
+0,9.23530000000,2020,R1,gassupply1,2030
+1,9.28910000000,2025,R1,gassupply1,2030
+0,1.73530000000,2020,R1,gassupply1,2035
+1,9.28910000000,2025,R1,gassupply1,2035
+2,7.47410000000,2030,R1,gassupply1,2035
+0,1.73530000000,2020,R1,gassupply1,2040
+1,9.28910000000,2025,R1,gassupply1,2040
+2,7.47410000000,2030,R1,gassupply1,2040
+0,1.73530000000,2020,R1,gassupply1,2045
+1,9.28910000000,2025,R1,gassupply1,2045
+2,7.47410000000,2030,R1,gassupply1,2045
+0,1.73530000000,2020,R1,gassupply1,2050
+1,9.28910000000,2025,R1,gassupply1,2050
+2,7.47410000000,2030,R1,gassupply1,2050
+3,0.30680000000,2045,R1,gassupply1,2050
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
deleted file mode 100644
index d37dcfe1e..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
deleted file mode 100644
index 5e2e13dc7..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
deleted file mode 100644
index a8ae6a429..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
deleted file mode 100644
index c102c566d..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
-3,2050,R1,gassupply1,2045,0.30680000000
-3,2059,R1,gassupply1,2045,0.30680000000
-3,2060,R1,gassupply1,2045,0.30680000000
-3,2064,R1,gassupply1,2045,0.30680000000
-3,2065,R1,gassupply1,2045,0.30680000000
-3,2069,R1,gassupply1,2045,0.30680000000
-3,2070,R1,gassupply1,2045,0.30680000000
-3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
deleted file mode 100644
index c102c566d..000000000
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,16.73530000000
-0,2030,R1,gassupply1,2020,9.23530000000
-0,2035,R1,gassupply1,2020,1.73530000000
-0,2040,R1,gassupply1,2020,1.73530000000
-0,2045,R1,gassupply1,2020,1.73530000000
-0,2050,R1,gassupply1,2020,1.73530000000
-0,2059,R1,gassupply1,2020,1.73530000000
-1,2030,R1,gassupply1,2025,9.28910000000
-1,2035,R1,gassupply1,2025,9.28910000000
-1,2040,R1,gassupply1,2025,9.28910000000
-1,2045,R1,gassupply1,2025,9.28910000000
-1,2050,R1,gassupply1,2025,9.28910000000
-1,2059,R1,gassupply1,2025,9.28910000000
-1,2060,R1,gassupply1,2025,9.28910000000
-1,2064,R1,gassupply1,2025,9.28910000000
-2,2035,R1,gassupply1,2030,7.47410000000
-2,2040,R1,gassupply1,2030,7.47410000000
-2,2045,R1,gassupply1,2030,7.47410000000
-2,2050,R1,gassupply1,2030,7.47410000000
-2,2059,R1,gassupply1,2030,7.47410000000
-2,2060,R1,gassupply1,2030,7.47410000000
-2,2064,R1,gassupply1,2030,7.47410000000
-2,2065,R1,gassupply1,2030,7.47410000000
-2,2069,R1,gassupply1,2030,7.47410000000
-3,2050,R1,gassupply1,2045,0.30680000000
-3,2059,R1,gassupply1,2045,0.30680000000
-3,2060,R1,gassupply1,2045,0.30680000000
-3,2064,R1,gassupply1,2045,0.30680000000
-3,2065,R1,gassupply1,2045,0.30680000000
-3,2069,R1,gassupply1,2045,0.30680000000
-3,2070,R1,gassupply1,2045,0.30680000000
-3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity.csv b/tests/example_outputs/multiple_agents/Power/Capacity.csv
new file mode 100644
index 000000000..847c7f8b4
--- /dev/null
+++ b/tests/example_outputs/multiple_agents/Power/Capacity.csv
@@ -0,0 +1,28 @@
+asset,capacity,installed,region,technology,year
+0,1,2020,R1,gasCCGT,2020
+0,6,2020,R1,gasCCGT,2025
+2,5,2020,R1,windturbine,2025
+0,5,2020,R1,gasCCGT,2030
+1,6,2025,R1,gasCCGT,2030
+2,5,2020,R1,windturbine,2030
+0,5,2020,R1,gasCCGT,2035
+1,6,2025,R1,gasCCGT,2035
+2,5,2020,R1,windturbine,2035
+3,6,2030,R1,windturbine,2035
+0,5,2020,R1,gasCCGT,2040
+1,6,2025,R1,gasCCGT,2040
+2,5,2020,R1,windturbine,2040
+3,6,2030,R1,windturbine,2040
+4,6,2035,R1,windturbine,2040
+0,5,2020,R1,gasCCGT,2045
+1,6,2025,R1,gasCCGT,2045
+3,5,2020,R1,windturbine,2045
+4,6,2030,R1,windturbine,2045
+5,6,2035,R1,windturbine,2045
+6,6,2040,R1,windturbine,2045
+0,5,2020,R1,gasCCGT,2050
+1,6,2025,R1,gasCCGT,2050
+4,6,2030,R1,windturbine,2050
+5,6,2035,R1,windturbine,2050
+6,6,2040,R1,windturbine,2050
+7,10,2045,R1,windturbine,2050
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
deleted file mode 100644
index 36b5025eb..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2025,R1,windturbine,2020,5
-1,2030,R1,windturbine,2020,5
-1,2035,R1,windturbine,2020,5
-1,2040,R1,windturbine,2020,5
-1,2045,R1,windturbine,2020,5
-1,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
deleted file mode 100644
index b130fe08f..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
deleted file mode 100644
index bfe651083..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
-3,2035,R1,windturbine,2030,6
-3,2040,R1,windturbine,2030,6
-3,2045,R1,windturbine,2030,6
-3,2049,R1,windturbine,2030,6
-3,2050,R1,windturbine,2030,6
-3,2059,R1,windturbine,2030,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
deleted file mode 100644
index a33320a72..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,38 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
-3,2035,R1,windturbine,2030,6
-3,2040,R1,windturbine,2030,6
-3,2045,R1,windturbine,2030,6
-3,2049,R1,windturbine,2030,6
-3,2050,R1,windturbine,2030,6
-3,2059,R1,windturbine,2030,6
-4,2040,R1,windturbine,2035,6
-4,2045,R1,windturbine,2035,6
-4,2049,R1,windturbine,2035,6
-4,2050,R1,windturbine,2035,6
-4,2059,R1,windturbine,2035,6
-4,2060,R1,windturbine,2035,6
-4,2064,R1,windturbine,2035,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
deleted file mode 100644
index 658cdb8e0..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-2,2025,R1,windturbine,2020,5
-2,2030,R1,windturbine,2020,5
-2,2035,R1,windturbine,2020,5
-2,2040,R1,windturbine,2020,5
-2,2045,R1,windturbine,2020,5
-2,2049,R1,windturbine,2020,5
-3,2035,R1,windturbine,2030,6
-3,2040,R1,windturbine,2030,6
-3,2045,R1,windturbine,2030,6
-3,2049,R1,windturbine,2030,6
-3,2050,R1,windturbine,2030,6
-3,2059,R1,windturbine,2030,6
-4,2040,R1,windturbine,2035,6
-4,2045,R1,windturbine,2035,6
-4,2049,R1,windturbine,2035,6
-4,2050,R1,windturbine,2035,6
-4,2059,R1,windturbine,2035,6
-4,2060,R1,windturbine,2035,6
-4,2064,R1,windturbine,2035,6
-5,2045,R1,windturbine,2040,6
-5,2049,R1,windturbine,2040,6
-5,2050,R1,windturbine,2040,6
-5,2059,R1,windturbine,2040,6
-5,2060,R1,windturbine,2040,6
-5,2064,R1,windturbine,2040,6
-5,2065,R1,windturbine,2040,6
-5,2069,R1,windturbine,2040,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
deleted file mode 100644
index f021634a2..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,54 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-3,2025,R1,windturbine,2020,5
-3,2030,R1,windturbine,2020,5
-3,2035,R1,windturbine,2020,5
-3,2040,R1,windturbine,2020,5
-3,2045,R1,windturbine,2020,5
-3,2049,R1,windturbine,2020,5
-4,2035,R1,windturbine,2030,6
-4,2040,R1,windturbine,2030,6
-4,2045,R1,windturbine,2030,6
-4,2049,R1,windturbine,2030,6
-4,2050,R1,windturbine,2030,6
-4,2059,R1,windturbine,2030,6
-5,2040,R1,windturbine,2035,6
-5,2045,R1,windturbine,2035,6
-5,2049,R1,windturbine,2035,6
-5,2050,R1,windturbine,2035,6
-5,2059,R1,windturbine,2035,6
-5,2060,R1,windturbine,2035,6
-5,2064,R1,windturbine,2035,6
-6,2045,R1,windturbine,2040,6
-6,2049,R1,windturbine,2040,6
-6,2050,R1,windturbine,2040,6
-6,2059,R1,windturbine,2040,6
-6,2060,R1,windturbine,2040,6
-6,2064,R1,windturbine,2040,6
-6,2065,R1,windturbine,2040,6
-6,2069,R1,windturbine,2040,6
-7,2050,R1,windturbine,2045,10
-7,2059,R1,windturbine,2045,10
-7,2060,R1,windturbine,2045,10
-7,2064,R1,windturbine,2045,10
-7,2065,R1,windturbine,2045,10
-7,2069,R1,windturbine,2045,10
-7,2070,R1,windturbine,2045,10
-7,2074,R1,windturbine,2045,10
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
deleted file mode 100644
index 54bbf73ac..000000000
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,70 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,6
-0,2030,R1,gasCCGT,2020,5
-0,2035,R1,gasCCGT,2020,5
-0,2040,R1,gasCCGT,2020,5
-0,2045,R1,gasCCGT,2020,5
-0,2049,R1,gasCCGT,2020,5
-0,2050,R1,gasCCGT,2020,5
-0,2055,R1,gasCCGT,2020,5
-0,2059,R1,gasCCGT,2020,5
-1,2030,R1,gasCCGT,2025,6
-1,2035,R1,gasCCGT,2025,6
-1,2040,R1,gasCCGT,2025,6
-1,2045,R1,gasCCGT,2025,6
-1,2049,R1,gasCCGT,2025,6
-1,2050,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
-1,2059,R1,gasCCGT,2025,6
-1,2060,R1,gasCCGT,2025,6
-1,2064,R1,gasCCGT,2025,6
-3,2025,R1,windturbine,2020,5
-3,2030,R1,windturbine,2020,5
-3,2035,R1,windturbine,2020,5
-3,2040,R1,windturbine,2020,5
-3,2045,R1,windturbine,2020,5
-3,2049,R1,windturbine,2020,5
-4,2035,R1,windturbine,2030,6
-4,2040,R1,windturbine,2030,6
-4,2045,R1,windturbine,2030,6
-4,2049,R1,windturbine,2030,6
-4,2050,R1,windturbine,2030,6
-4,2055,R1,windturbine,2030,6
-4,2059,R1,windturbine,2030,6
-5,2040,R1,windturbine,2035,6
-5,2045,R1,windturbine,2035,6
-5,2049,R1,windturbine,2035,6
-5,2050,R1,windturbine,2035,6
-5,2055,R1,windturbine,2035,6
-5,2059,R1,windturbine,2035,6
-5,2060,R1,windturbine,2035,6
-5,2064,R1,windturbine,2035,6
-6,2045,R1,windturbine,2040,6
-6,2049,R1,windturbine,2040,6
-6,2050,R1,windturbine,2040,6
-6,2055,R1,windturbine,2040,6
-6,2059,R1,windturbine,2040,6
-6,2060,R1,windturbine,2040,6
-6,2064,R1,windturbine,2040,6
-6,2065,R1,windturbine,2040,6
-6,2069,R1,windturbine,2040,6
-7,2050,R1,windturbine,2045,10
-7,2055,R1,windturbine,2045,10
-7,2059,R1,windturbine,2045,10
-7,2060,R1,windturbine,2045,10
-7,2064,R1,windturbine,2045,10
-7,2065,R1,windturbine,2045,10
-7,2069,R1,windturbine,2045,10
-7,2070,R1,windturbine,2045,10
-7,2074,R1,windturbine,2045,10
-8,2055,R1,windturbine,2050,1
-8,2059,R1,windturbine,2050,1
-8,2060,R1,windturbine,2050,1
-8,2064,R1,windturbine,2050,1
-8,2065,R1,windturbine,2050,1
-8,2069,R1,windturbine,2050,1
-8,2070,R1,windturbine,2050,1
-8,2074,R1,windturbine,2050,1
-8,2075,R1,windturbine,2050,1
-8,2079,R1,windturbine,2050,1
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity.csv b/tests/example_outputs/multiple_agents/Residential/Capacity.csv
new file mode 100644
index 000000000..d2c867272
--- /dev/null
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity.csv
@@ -0,0 +1,14 @@
+asset,capacity,installed,region,technology,year
+0,10.00000000000,2020,R1,gasboiler,2020
+0,5.00000000000,2020,R1,gasboiler,2025
+1,19.00000000000,2020,R1,heatpump,2025
+1,19.00000000000,2020,R1,heatpump,2030
+2,11.00000000000,2025,R1,heatpump,2030
+2,11.00000000000,2025,R1,heatpump,2035
+3,25.00000000000,2030,R1,heatpump,2035
+3,25.00000000000,2030,R1,heatpump,2040
+4,17.00000000000,2035,R1,heatpump,2040
+4,17.00000000000,2035,R1,heatpump,2045
+5,31.00000000000,2040,R1,heatpump,2045
+5,31.00000000000,2040,R1,heatpump,2050
+6,23.00000000000,2045,R1,heatpump,2050
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c6..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv
deleted file mode 100644
index 9d7ceeff7..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,11.00000000000
-2,2034,R1,heatpump,2025,11.00000000000
-2,2035,R1,heatpump,2025,11.00000000000
-2,2039,R1,heatpump,2025,11.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv
deleted file mode 100644
index b636c62a8..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,11.00000000000
-2,2034,R1,heatpump,2025,11.00000000000
-2,2035,R1,heatpump,2025,11.00000000000
-2,2039,R1,heatpump,2025,11.00000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv
deleted file mode 100644
index e9ff1cebf..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,11.00000000000
-2,2034,R1,heatpump,2025,11.00000000000
-2,2035,R1,heatpump,2025,11.00000000000
-2,2039,R1,heatpump,2025,11.00000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,17.00000000000
-4,2044,R1,heatpump,2035,17.00000000000
-4,2045,R1,heatpump,2035,17.00000000000
-4,2049,R1,heatpump,2035,17.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv
deleted file mode 100644
index 2d54c0aa9..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,11.00000000000
-2,2034,R1,heatpump,2025,11.00000000000
-2,2035,R1,heatpump,2025,11.00000000000
-2,2039,R1,heatpump,2025,11.00000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,17.00000000000
-4,2044,R1,heatpump,2035,17.00000000000
-4,2045,R1,heatpump,2035,17.00000000000
-4,2049,R1,heatpump,2035,17.00000000000
-5,2045,R1,heatpump,2040,31.00000000000
-5,2049,R1,heatpump,2040,31.00000000000
-5,2050,R1,heatpump,2040,31.00000000000
-5,2054,R1,heatpump,2040,31.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv
deleted file mode 100644
index 5924d03b5..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,11.00000000000
-2,2034,R1,heatpump,2025,11.00000000000
-2,2035,R1,heatpump,2025,11.00000000000
-2,2039,R1,heatpump,2025,11.00000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,17.00000000000
-4,2044,R1,heatpump,2035,17.00000000000
-4,2045,R1,heatpump,2035,17.00000000000
-4,2049,R1,heatpump,2035,17.00000000000
-5,2045,R1,heatpump,2040,31.00000000000
-5,2049,R1,heatpump,2040,31.00000000000
-5,2050,R1,heatpump,2040,31.00000000000
-5,2054,R1,heatpump,2040,31.00000000000
-6,2050,R1,heatpump,2045,23.00000000000
-6,2054,R1,heatpump,2045,23.00000000000
-6,2055,R1,heatpump,2045,23.00000000000
-6,2059,R1,heatpump,2045,23.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
deleted file mode 100644
index be30eaf2d..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,11.00000000000
-2,2034,R1,heatpump,2025,11.00000000000
-2,2035,R1,heatpump,2025,11.00000000000
-2,2039,R1,heatpump,2025,11.00000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,17.00000000000
-4,2044,R1,heatpump,2035,17.00000000000
-4,2045,R1,heatpump,2035,17.00000000000
-4,2049,R1,heatpump,2035,17.00000000000
-5,2045,R1,heatpump,2040,31.00000000000
-5,2049,R1,heatpump,2040,31.00000000000
-5,2050,R1,heatpump,2040,31.00000000000
-5,2054,R1,heatpump,2040,31.00000000000
-6,2050,R1,heatpump,2045,23.00000000000
-6,2054,R1,heatpump,2045,23.00000000000
-6,2055,R1,heatpump,2045,23.00000000000
-6,2059,R1,heatpump,2045,23.00000000000
-7,2055,R1,heatpump,2050,31.00000000000
-7,2059,R1,heatpump,2050,31.00000000000
-7,2060,R1,heatpump,2050,31.00000000000
-7,2064,R1,heatpump,2050,31.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply.csv b/tests/example_outputs/multiple_agents/Residential/Supply.csv
new file mode 100644
index 000000000..f33b0f268
--- /dev/null
+++ b/tests/example_outputs/multiple_agents/Residential/Supply.csv
@@ -0,0 +1,91 @@
+asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
+0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020
+0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020
+0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020
+0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020
+0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020
+0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020
+0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020
+0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020
+0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020
+0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020
+0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020
+0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020
+0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025
+0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025
+0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025
+0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025
+0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025
+0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025
+0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025
+0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025
+0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025
+0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025
+0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025
+0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025
+1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2030
+2,heat,all-week,night,2025,all-year,R1,0.61110000000,heatpump,0,2030
+1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2030
+2,heat,all-week,morning,2025,all-year,R1,0.91670000000,heatpump,1,2030
+1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2030
+2,heat,all-week,afternoon,2025,all-year,R1,0.61110000000,heatpump,2,2030
+1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2030
+2,heat,all-week,early-peak,2025,all-year,R1,0.91670000000,heatpump,3,2030
+1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2030
+2,heat,all-week,late-peak,2025,all-year,R1,1.83330000000,heatpump,4,2030
+1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2030
+2,heat,all-week,evening,2025,all-year,R1,1.22220000000,heatpump,5,2030
+2,heat,all-week,night,2025,all-year,R1,0.61110000000,heatpump,0,2035
+3,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2035
+2,heat,all-week,morning,2025,all-year,R1,0.91670000000,heatpump,1,2035
+3,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2035
+2,heat,all-week,afternoon,2025,all-year,R1,0.61110000000,heatpump,2,2035
+3,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2035
+2,heat,all-week,early-peak,2025,all-year,R1,0.91670000000,heatpump,3,2035
+3,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2035
+2,heat,all-week,late-peak,2025,all-year,R1,1.83330000000,heatpump,4,2035
+3,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2035
+2,heat,all-week,evening,2025,all-year,R1,1.22220000000,heatpump,5,2035
+3,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2035
+3,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2040
+4,heat,all-week,night,2035,all-year,R1,0.94440000000,heatpump,0,2040
+3,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2040
+4,heat,all-week,morning,2035,all-year,R1,1.41670000000,heatpump,1,2040
+3,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2040
+4,heat,all-week,afternoon,2035,all-year,R1,0.94440000000,heatpump,2,2040
+3,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2040
+4,heat,all-week,early-peak,2035,all-year,R1,1.41670000000,heatpump,3,2040
+3,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2040
+4,heat,all-week,late-peak,2035,all-year,R1,2.83330000000,heatpump,4,2040
+3,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2040
+4,heat,all-week,evening,2035,all-year,R1,1.88890000000,heatpump,5,2040
+4,heat,all-week,night,2035,all-year,R1,0.94440000000,heatpump,0,2045
+5,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2045
+4,heat,all-week,morning,2035,all-year,R1,1.41670000000,heatpump,1,2045
+5,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2045
+4,heat,all-week,afternoon,2035,all-year,R1,0.94440000000,heatpump,2,2045
+5,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2045
+4,heat,all-week,early-peak,2035,all-year,R1,1.41670000000,heatpump,3,2045
+5,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2045
+4,heat,all-week,late-peak,2035,all-year,R1,2.83330000000,heatpump,4,2045
+5,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2045
+4,heat,all-week,evening,2035,all-year,R1,1.88890000000,heatpump,5,2045
+5,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2045
+5,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2050
+6,heat,all-week,night,2045,all-year,R1,1.27780000000,heatpump,0,2050
+5,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2050
+6,heat,all-week,morning,2045,all-year,R1,1.91670000000,heatpump,1,2050
+5,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2050
+6,heat,all-week,afternoon,2045,all-year,R1,1.27780000000,heatpump,2,2050
+5,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2050
+6,heat,all-week,early-peak,2045,all-year,R1,1.91670000000,heatpump,3,2050
+5,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2050
+6,heat,all-week,late-peak,2045,all-year,R1,3.83330000000,heatpump,4,2050
+5,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2050
+6,heat,all-week,evening,2045,all-year,R1,2.55560000000,heatpump,5,2050
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
deleted file mode 100644
index 7b8c4061d..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
deleted file mode 100644
index b07adde6b..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
deleted file mode 100644
index 33951ce29..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
deleted file mode 100644
index c606a299c..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
deleted file mode 100644
index d66038bc0..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
deleted file mode 100644
index 2f0389d3c..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
deleted file mode 100644
index 3b6658d81..000000000
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity.csv
similarity index 64%
rename from tests/example_outputs/trade/Gas/Capacity/2020.csv
rename to tests/example_outputs/trade/Gas/Capacity.csv
index a35c2ed52..c190aea60 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity.csv
@@ -5,7 +5,5 @@ R1,2025,0,R1,gassupply1,2010,2100.00000000000
 R2,2025,1,R2,gassupply1,2010,700.00000000000
 R1,2030,0,R1,gassupply1,2010,2100.00000000000
 R2,2030,1,R2,gassupply1,2010,700.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R2,2040,1,R2,gassupply1,2010,490.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.00000000000
-R2,2050,1,R2,gassupply1,2010,343.00000000000
+R1,2035,0,R1,gassupply1,2010,1470.00000000000
+R2,2035,1,R2,gassupply1,2010,490.00000000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2025.csv b/tests/example_outputs/trade/Gas/Capacity/2025.csv
deleted file mode 100644
index 9777d7947..000000000
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-dst_region,year,asset,region,technology,installed,capacity
-R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R2,2025,1,R2,gassupply1,2010,700.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R2,2030,1,R2,gassupply1,2010,700.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R2,2040,1,R2,gassupply1,2010,490.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.00000000000
-R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2030.csv b/tests/example_outputs/trade/Gas/Capacity/2030.csv
deleted file mode 100644
index 023078ee8..000000000
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-dst_region,year,asset,region,technology,installed,capacity
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R2,2030,1,R2,gassupply1,2010,700.00000000000
-R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R2,2035,1,R2,gassupply1,2010,490.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R2,2040,1,R2,gassupply1,2010,490.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.00000000000
-R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2035.csv b/tests/example_outputs/trade/Gas/Capacity/2035.csv
deleted file mode 100644
index c232f0772..000000000
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-dst_region,year,asset,region,technology,installed,capacity
-R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R2,2035,1,R2,gassupply1,2010,490.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R2,2040,1,R2,gassupply1,2010,490.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.00000000000
-R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2020.csv b/tests/example_outputs/trade/Power/Capacity.csv
similarity index 61%
rename from tests/example_outputs/trade/Power/Capacity/2020.csv
rename to tests/example_outputs/trade/Power/Capacity.csv
index 66b1b1731..0864331dd 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity.csv
@@ -7,9 +7,3 @@ R1,2030,0,R1,gasCCGT,2010,153.60000000000
 R2,2030,1,R2,gasCCGT,2010,98.00000000000
 R1,2035,0,R1,gasCCGT,2010,122.88000000000
 R2,2035,1,R2,gasCCGT,2010,68.60000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R2,2040,1,R2,gasCCGT,2010,48.02000000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R2,2045,1,R2,gasCCGT,2010,33.61400000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
-R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2025.csv b/tests/example_outputs/trade/Power/Capacity/2025.csv
deleted file mode 100644
index 2e29060bd..000000000
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-dst_region,year,asset,region,technology,installed,capacity
-R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R2,2025,1,R2,gasCCGT,2010,140.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R2,2030,1,R2,gasCCGT,2010,98.00000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R2,2035,1,R2,gasCCGT,2010,68.60000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R2,2040,1,R2,gasCCGT,2010,48.02000000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R2,2045,1,R2,gasCCGT,2010,33.61400000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
-R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2030.csv b/tests/example_outputs/trade/Power/Capacity/2030.csv
deleted file mode 100644
index bb6edddab..000000000
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-dst_region,year,asset,region,technology,installed,capacity
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R2,2030,1,R2,gasCCGT,2010,98.00000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R2,2035,1,R2,gasCCGT,2010,68.60000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R2,2040,1,R2,gasCCGT,2010,48.02000000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R2,2045,1,R2,gasCCGT,2010,33.61400000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
-R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2035.csv b/tests/example_outputs/trade/Power/Capacity/2035.csv
deleted file mode 100644
index 768699fc8..000000000
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-dst_region,year,asset,region,technology,installed,capacity
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R2,2035,1,R2,gasCCGT,2010,68.60000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R2,2040,1,R2,gasCCGT,2010,48.02000000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R2,2045,1,R2,gasCCGT,2010,33.61400000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
-R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Residential/Capacity.csv b/tests/example_outputs/trade/Residential/Capacity.csv
new file mode 100644
index 000000000..8add49406
--- /dev/null
+++ b/tests/example_outputs/trade/Residential/Capacity.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2010,662.76000000000
+2,2020,R2,gasboiler,2010,35.00000000000
+0,2025,R1,gasboiler,2010,463.93200000000
+1,2025,R1,gasboiler,2020,355.93470000000
+3,2025,R2,gasboiler,2010,24.50000000000
+0,2030,R1,gasboiler,2010,463.93200000000
+1,2030,R1,gasboiler,2020,355.93470000000
+2,2030,R1,gasboiler,2025,74.53330000000
+4,2030,R2,gasboiler,2010,24.50000000000
+0,2035,R1,gasboiler,2010,394.34220000000
+1,2035,R1,gasboiler,2025,74.53330000000
+2,2035,R1,gasboiler,2030,444.15780000000
+3,2035,R2,gasboiler,2010,17.15000000000
+4,2035,R2,gasboiler,2030,1.63330000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2020.csv b/tests/example_outputs/trade/Residential/Capacity/2020.csv
deleted file mode 100644
index 67b762ddf..000000000
--- a/tests/example_outputs/trade/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2010,662.76000000000
-0,2025,R1,gasboiler,2010,463.93200000000
-0,2030,R1,gasboiler,2010,463.93200000000
-0,2034,R1,gasboiler,2010,408.26020000000
-0,2035,R1,gasboiler,2010,394.34220000000
-0,2040,R1,gasboiler,2010,324.75240000000
-0,2050,R1,gasboiler,2010,227.32670000000
-1,2025,R1,gasboiler,2020,355.93470000000
-1,2030,R1,gasboiler,2020,355.93470000000
-1,2034,R1,gasboiler,2020,355.93470000000
-2,2020,R2,gasboiler,2010,35.00000000000
-2,2025,R2,gasboiler,2010,24.50000000000
-2,2030,R2,gasboiler,2010,24.50000000000
-2,2034,R2,gasboiler,2010,21.56000000000
-2,2035,R2,gasboiler,2010,20.82500000000
-2,2040,R2,gasboiler,2010,17.15000000000
-2,2050,R2,gasboiler,2010,12.00500000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2025.csv b/tests/example_outputs/trade/Residential/Capacity/2025.csv
deleted file mode 100644
index 7a0a26c09..000000000
--- a/tests/example_outputs/trade/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2010,463.93200000000
-0,2030,R1,gasboiler,2010,463.93200000000
-0,2034,R1,gasboiler,2010,408.26020000000
-0,2035,R1,gasboiler,2010,394.34220000000
-0,2039,R1,gasboiler,2010,338.67040000000
-0,2040,R1,gasboiler,2010,324.75240000000
-0,2050,R1,gasboiler,2010,227.32670000000
-1,2025,R1,gasboiler,2020,355.93470000000
-1,2030,R1,gasboiler,2020,355.93470000000
-1,2034,R1,gasboiler,2020,355.93470000000
-2,2030,R1,gasboiler,2025,74.53330000000
-2,2034,R1,gasboiler,2025,74.53330000000
-2,2035,R1,gasboiler,2025,74.53330000000
-2,2039,R1,gasboiler,2025,74.53330000000
-3,2025,R2,gasboiler,2010,24.50000000000
-3,2030,R2,gasboiler,2010,24.50000000000
-3,2034,R2,gasboiler,2010,21.56000000000
-3,2035,R2,gasboiler,2010,20.82500000000
-3,2039,R2,gasboiler,2010,17.88500000000
-3,2040,R2,gasboiler,2010,17.15000000000
-3,2050,R2,gasboiler,2010,12.00500000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2030.csv b/tests/example_outputs/trade/Residential/Capacity/2030.csv
deleted file mode 100644
index 1609a5d56..000000000
--- a/tests/example_outputs/trade/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,32 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2010,463.93200000000
-0,2034,R1,gasboiler,2010,408.26020000000
-0,2035,R1,gasboiler,2010,394.34220000000
-0,2039,R1,gasboiler,2010,338.67040000000
-0,2040,R1,gasboiler,2010,324.75240000000
-0,2044,R1,gasboiler,2010,285.78210000000
-0,2045,R1,gasboiler,2010,276.03950000000
-0,2050,R1,gasboiler,2010,227.32670000000
-1,2030,R1,gasboiler,2020,355.93470000000
-1,2034,R1,gasboiler,2020,355.93470000000
-2,2030,R1,gasboiler,2025,74.53330000000
-2,2034,R1,gasboiler,2025,74.53330000000
-2,2035,R1,gasboiler,2025,74.53330000000
-2,2039,R1,gasboiler,2025,74.53330000000
-3,2035,R1,gasboiler,2030,444.15780000000
-3,2039,R1,gasboiler,2030,444.15780000000
-3,2040,R1,gasboiler,2030,444.15780000000
-3,2044,R1,gasboiler,2030,444.15780000000
-4,2030,R2,gasboiler,2010,24.50000000000
-4,2034,R2,gasboiler,2010,18.62000000000
-4,2035,R2,gasboiler,2010,17.15000000000
-4,2039,R2,gasboiler,2010,17.15000000000
-4,2040,R2,gasboiler,2010,17.15000000000
-4,2044,R2,gasboiler,2010,15.09200000000
-4,2045,R2,gasboiler,2010,14.57750000000
-4,2050,R2,gasboiler,2010,12.00500000000
-5,2034,R2,gasboiler,2030,1.00000000000
-5,2035,R2,gasboiler,2030,1.63330000000
-5,2039,R2,gasboiler,2030,1.63330000000
-5,2040,R2,gasboiler,2030,1.63330000000
-5,2044,R2,gasboiler,2030,1.63330000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2035.csv b/tests/example_outputs/trade/Residential/Capacity/2035.csv
deleted file mode 100644
index 9473ea082..000000000
--- a/tests/example_outputs/trade/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2010,394.34220000000
-0,2039,R1,gasboiler,2010,338.67040000000
-0,2040,R1,gasboiler,2010,324.75240000000
-0,2044,R1,gasboiler,2010,285.78210000000
-0,2045,R1,gasboiler,2010,276.03950000000
-0,2049,R1,gasboiler,2010,237.06930000000
-0,2050,R1,gasboiler,2010,227.32670000000
-1,2035,R1,gasboiler,2025,74.53330000000
-1,2039,R1,gasboiler,2025,74.53330000000
-2,2035,R1,gasboiler,2030,444.15780000000
-2,2039,R1,gasboiler,2030,444.15780000000
-2,2040,R1,gasboiler,2030,444.15780000000
-2,2044,R1,gasboiler,2030,444.15780000000
-3,2035,R2,gasboiler,2010,17.15000000000
-3,2039,R2,gasboiler,2010,17.15000000000
-3,2040,R2,gasboiler,2010,17.15000000000
-3,2044,R2,gasboiler,2010,15.09200000000
-3,2045,R2,gasboiler,2010,14.57750000000
-3,2049,R2,gasboiler,2010,12.51950000000
-3,2050,R2,gasboiler,2010,12.00500000000
-4,2035,R2,gasboiler,2030,1.63330000000
-4,2039,R2,gasboiler,2030,1.63330000000
-4,2040,R2,gasboiler,2030,1.63330000000
-4,2044,R2,gasboiler,2030,1.63330000000
-5,2040,R1,heatpump,2035,162.75650000000
-5,2044,R1,heatpump,2035,162.75650000000
-5,2045,R1,heatpump,2035,162.75650000000
-5,2049,R1,heatpump,2035,162.75650000000
-6,2039,R2,heatpump,2035,0.30670000000
-6,2040,R2,heatpump,2035,0.38330000000
-6,2044,R2,heatpump,2035,0.38330000000
-6,2045,R2,heatpump,2035,0.38330000000
-6,2049,R2,heatpump,2035,0.38330000000