diff --git a/Analysis.r b/Analysis.r
index 4a18fa9..f408f3a 100644
--- a/Analysis.r
+++ b/Analysis.r
@@ -3,6 +3,7 @@ library(RcppRoll)
 RES <- readRDS("Results/Storage_Values_by_Facility_and_Variable_Discounts.Rds")
 RES[[1]]
 names(RES)
+RES$Per_10.5
 read_csv("Data/Curie_Spent_Fuel_Site_Totals.csv")
 CDATA <- RES$Per_5  %>% left_join(read_csv("Data/Curie_Spent_Fuel_Site_Totals.csv")) %>%  mutate(Revenue=parse_number(Revenue),Year=parse_number(Year),Marginal_Value=Revenue/Total_Tons) %>% select(Facility,Year,Revenue,Marginal_Value,Total_Tons)
 CDATA <- CDATA %>% group_by(Year) %>% arrange(Year,desc(Marginal_Value)) %>% mutate(CIFS_total=cumsum(Total_Tons)) %>% ungroup 
diff --git a/Cost_Data_Proc.r b/Cost_Data_Proc.r
new file mode 100644
index 0000000..b3b3d3c
--- /dev/null
+++ b/Cost_Data_Proc.r
@@ -0,0 +1,52 @@
+library(tidyverse)
+library(fixest)
+ISFSI <- read_csv("./Data/Raw_Data/Cost_Tables/Table_C-9_Number_of_ISFSIs_by_Project_Plan.csv")
+ONE <- ISFSI[1:3] 
+colnames(ONE) <- c("Year","Active","Decom")
+ONE <- ONE %>% mutate(Phase="Partial",Cost_Assumption="Low")
+
+TWO <- ISFSI[,c(1,4:5)] 
+colnames(TWO) <- c("Year","Active","Decom")
+TWO <- TWO%>% mutate(Phase="Full",Cost_Assumption="Low")
+
+THREE <- ISFSI[,c(1,6:7)] 
+colnames(THREE) <- c("Year","Active","Decom")
+THREE <- THREE %>% mutate(Phase="Partial",Cost_Assumption="High")
+
+FOUR <- ISFSI[,c(1,8:9)] 
+colnames(FOUR) <- c("Year","Active","Decom")
+FOUR <- FOUR %>% mutate(Phase="Full",Cost_Assumption="High")
+ISFSI_NUM <- rbind(ONE,TWO,THREE,FOUR)
+SAVE_DIR <- "./Data/Cleaned_Data/"
+dir.create(SAVE_DIR,showWarnings=FALSE,recursive=TRUE)
+saveRDS(ISFSI_NUM,paste0(SAVE_DIR,"ISFSI_Data.Rds"))
+rm(ONE,TWO,THREE,FOUR)
+######CIFS costs
+CIFS <- rbind( read_csv("./Data/Raw_Data/Cost_Tables/Table_C-3_Undiscounted_Cost_Estimates_Phase_1_Low.csv") %>% mutate(Phase='Partial',Cost_Assumption="Low"),read_csv("./Data/Raw_Data/Cost_Tables/Table_C-4_Undiscounted_Cost_Estimates_Phase_1_High.csv") %>% mutate(Phase='Partial',Cost_Assumption="High"), read_csv("./Data/Raw_Data/Cost_Tables/Table_C-5_Undiscounted_Cost_Estimates_Full_Low.csv") %>% mutate(Phase='Full',Cost_Assumption="Low"), read_csv("./Data/Raw_Data/Cost_Tables/Table_C-6_Undiscounted_Cost_Estimates_Full_High.csv") %>% mutate(Phase='Full',Cost_Assumption="High"))
+
+######Onsite costs
+ONSITE <- rbind( read_csv("./Data/Raw_Data/Cost_Tables/Table_C-10_Undiscounted_No_Action_Phase_1_Low.csv") %>% mutate(Phase='Partial',Cost_Assumption="Low"),read_csv("./Data/Raw_Data/Cost_Tables/Table_C-11_Undiscounted_No_Action_Phase_1_High.csv") %>% mutate(Phase='Partial',Cost_Assumption="High"), read_csv("./Data/Raw_Data/Cost_Tables/Table_C-12_Undiscounted_No_Action_Full_Low.csv") %>% mutate(Phase='Full',Cost_Assumption="Low"), read_csv("./Data/Raw_Data/Cost_Tables/Table_C-13_Undiscounted_No_Action_Full_High.csv") %>% mutate(Phase='Full',Cost_Assumption="High"))
+ISFSI_NUM %>% filter(Year>=30,Phase=='Full') %>% print(n=100)
+#######
+SUMMARY <- ONSITE %>% inner_join(ISFSI_NUM) %>% group_by(Year,Cost_Assumption) %>% summarize(Decom_num=Decom,OP=Operations_Active/ifelse(Active==0,1,Active),Decom=Operations_Decom/ifelse(Decom==0,1,Decom))
+OP <- SUMMARY %>% filter(OP!=0) %>% pull(OP) %>% mean
+TEST <-SUMMARY %>% filter(Cost_Assumption=='High')  %>% unique
+hist(TEST$Decom)
+
+TEST <-SUMMARY   %>% unique
+hist(TEST$Decom)
+TEST %>% filter(OP!=0,Year>28) %>% print(n=100)
+SUMMARY <- SUMMARY %>% mutate(CLOSING=ifelse(Year>=31,1,0))
+SUMMARY
+(10*77964491)/36
+(2*125682289)/9
+TEST
+77964491/108647430
+feols(Decom~Decom_num+CLOSING*Year,SUMMARY %>% filter(OP!=0))
+hist(SUMMARY$Decom)
+#####
+M <- (779644907-251364578)/(40000-5000)
+C <- 779644907-M*40000
+(M*150000+C)/10^6
+
+
diff --git a/Data/Raw_Data/Cost_Tables/.test.r.swp b/Data/Raw_Data/Cost_Tables/.test.r.swp
new file mode 100644
index 0000000..47b41fa
Binary files /dev/null and b/Data/Raw_Data/Cost_Tables/.test.r.swp differ
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-10_Undiscounted_No_Action_Phase_1_Low.csv b/Data/Raw_Data/Cost_Tables/Table_C-10_Undiscounted_No_Action_Phase_1_Low.csv
new file mode 100644
index 0000000..4d26bda
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-10_Undiscounted_No_Action_Phase_1_Low.csv
@@ -0,0 +1,43 @@
+
+Year,Operations_Active,Operations_Decom,SNF_Transportation,Total
+1,1086474,86917944,0,88004418
+2,1086474,86917944,0,88004418
+3,0,97782687,0,97782687
+4,0,97782687,0,97782687
+5,0,97782687,0,97782687
+6,0,97782687,0,97782687
+7,0,97782687,0,97782687
+8,0,97782687,0,97782687
+9,0,97782687,0,97782687
+10,0,97782687,0,97782687
+11,0,97782687,0,97782687
+12,0,97782687,0,97782687
+13,0,97782687,0,97782687
+14,0,97782687,0,97782687
+15,0,97782687,0,97782687
+16,0,97782687,0,97782687
+17,0,97782687,0,97782687
+18,0,97782687,0,97782687
+19,0,97782687,0,97782687
+20,0,97782687,0,97782687
+21,0,97782687,0,97782687
+22,0,97782687,0,97782687
+23,0,97782687,0,97782687
+24,0,97782687,0,97782687
+25,0,97782687,0,97782687
+26,0,97782687,0,97782687
+27,0,97782687,0,97782687
+28,0,97782687,0,97782687
+29,0,97782687,0,97782687
+30,0,97782687,0,97782687
+31,0,97782687,0,97782687
+32,0,97782687,0,97782687
+33,0,97782687,0,97782687
+34,0,97782687,0,97782687
+35,0,97782687,0,97782687
+36,0,97782687,0,97782687
+37,0,97782687,0,97782687
+38,0,97782687,0,97782687
+39,0,97782687,125682289,223464976
+40,0,48891344,125682289,174573633
+
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-11_Undiscounted_No_Action_Phase_1_High.csv b/Data/Raw_Data/Cost_Tables/Table_C-11_Undiscounted_No_Action_Phase_1_High.csv
new file mode 100644
index 0000000..4d26bda
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-11_Undiscounted_No_Action_Phase_1_High.csv
@@ -0,0 +1,43 @@
+
+Year,Operations_Active,Operations_Decom,SNF_Transportation,Total
+1,1086474,86917944,0,88004418
+2,1086474,86917944,0,88004418
+3,0,97782687,0,97782687
+4,0,97782687,0,97782687
+5,0,97782687,0,97782687
+6,0,97782687,0,97782687
+7,0,97782687,0,97782687
+8,0,97782687,0,97782687
+9,0,97782687,0,97782687
+10,0,97782687,0,97782687
+11,0,97782687,0,97782687
+12,0,97782687,0,97782687
+13,0,97782687,0,97782687
+14,0,97782687,0,97782687
+15,0,97782687,0,97782687
+16,0,97782687,0,97782687
+17,0,97782687,0,97782687
+18,0,97782687,0,97782687
+19,0,97782687,0,97782687
+20,0,97782687,0,97782687
+21,0,97782687,0,97782687
+22,0,97782687,0,97782687
+23,0,97782687,0,97782687
+24,0,97782687,0,97782687
+25,0,97782687,0,97782687
+26,0,97782687,0,97782687
+27,0,97782687,0,97782687
+28,0,97782687,0,97782687
+29,0,97782687,0,97782687
+30,0,97782687,0,97782687
+31,0,97782687,0,97782687
+32,0,97782687,0,97782687
+33,0,97782687,0,97782687
+34,0,97782687,0,97782687
+35,0,97782687,0,97782687
+36,0,97782687,0,97782687
+37,0,97782687,0,97782687
+38,0,97782687,0,97782687
+39,0,97782687,125682289,223464976
+40,0,48891344,125682289,174573633
+
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-12_Undiscounted_No_Action_Full_Low.csv b/Data/Raw_Data/Cost_Tables/Table_C-12_Undiscounted_No_Action_Full_Low.csv
new file mode 100644
index 0000000..c1993f9
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-12_Undiscounted_No_Action_Full_Low.csv
@@ -0,0 +1,42 @@
+
+Year,Operations_Active,Operations_Decom,SNF_Transportation,Total
+1,30421272,86917944,0,117339216
+2,30421272,86917944,0,117339216
+3,29334798,97782687,0,127117485
+4,29334798,97782687,0,127117485
+5,28248324,108647430,0,136895754
+6,28248324,108647430,0,136895754
+7,28248324,108647430,0,136895754
+8,28248324,108647430,0,136895754
+9,28248324,108647430,0,136895754
+10,28248324,108647430,0,136895754
+11,28248324,108647430,0,136895754
+12,28248324,108647430,0,136895754
+13,28248324,108647430,0,136895754
+14,28248324,108647430,0,136895754
+15,28248324,108647430,0,136895754
+16,28248324,108647430,0,136895754
+17,28248324,108647430,0,136895754
+18,28248324,108647430,0,136895754
+19,28248324,108647430,0,136895754
+20,28248324,108647430,0,136895754
+21,28248324,108647430,0,136895754
+22,28248324,108647430,0,136895754
+23,28248324,108647430,0,136895754
+24,28248324,108647430,0,136895754
+25,28248324,108647430,0,136895754
+26,28248324,108647430,0,136895754
+27,28248324,108647430,0,136895754
+28,28248324,108647430,0,136895754
+29,28248324,108647430,0,136895754
+30,28248324,108647430,0,136895754
+31,28248324,108647430,77964491,214860245
+32,25423492,97782687,77964491,201170670
+33,22598659,86917944,77964491,187481094
+34,19773827,76053201,77964491,173791519
+35,16948994,65188458,77964491,160101943
+36,14124162,54323715,77964491,146412368
+37,11299330,43458972,77964491,132722793
+38,8474497,32594229,77964491,119033217
+39,5649665,21729486,77964491,105343642
+40,2824832,10864743,77964491,91654066
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-13_Undiscounted_No_Action_Full_High.csv b/Data/Raw_Data/Cost_Tables/Table_C-13_Undiscounted_No_Action_Full_High.csv
new file mode 100644
index 0000000..f2d6bc4
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-13_Undiscounted_No_Action_Full_High.csv
@@ -0,0 +1,41 @@
+Year,Operations_Active,Operations_Decom,SNF_Transportation,Total
+1,30421272,86917944,0,117339216
+2,30421272,86917944,0,117339216
+3,29334798,97782687,0,127117485
+4,29334798,97782687,0,127117485
+5,28248324,108647430,0,136895754
+6,26075376,130376916,0,156452292
+7,24988902,141241659,0,166230561
+8,23902428,152106402,0,176008830
+9,22815954,162971145,0,185787099
+10,22815954,162971145,0,185787099
+11,22815954,162971145,0,185787099
+12,21729480,173835888,0,195565368
+13,19556532,195565374,0,215121906
+14,19556532,195565374,0,215121906
+15,18470058,206430117,0,224900175
+16,16297110,228159603,0,244456713
+17,14124162,249889089,0,264013251
+18,13037688,260753832,0,273791520
+19,10864740,282483318,0,293348058
+20,6518844,325942290,0,332461134
+21,5432370,380266005,0,385698375
+22,5432370,380266005,0,385698375
+23,0,391130748,0,391130748
+24,0,391130748,0,391130748
+25,0,391130748,0,391130748
+26,0,391130748,0,391130748
+27,0,391130748,0,391130748
+28,0,391130748,0,391130748
+29,0,391130748,0,391130748
+30,0,391130748,0,391130748
+31,0,391130748,77964491,469095239
+32,0,352017673,77964491,429982164
+33,0,312904598,77964491,390869089
+34,0,273791524,77964491,351756015
+35,0,234678449,77964491,312642940
+36,0,195565374,77964491,273529865
+37,0,156452299,77964491,234416790
+38,0,117339224,77964491,195303715
+39,0,78226150,77964491,156190641
+40,0,39113075,77964491,117077566
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-3_Undiscounted_Cost_Estimates_Phase_1_Low.csv b/Data/Raw_Data/Cost_Tables/Table_C-3_Undiscounted_Cost_Estimates_Phase_1_Low.csv
new file mode 100644
index 0000000..aeec5ec
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-3_Undiscounted_Cost_Estimates_Phase_1_Low.csv
@@ -0,0 +1,42 @@
+Year,Construction,Transportation_to_CISF,Operations,Transportation_to_Repository,Decommissioning,Total
+1,76552618,73711378,5041229,0,0,155305226
+2,65910317,142837839,5041229,0,0,213789386
+3,11737391,2547465,5041229,0,0,19326086
+4,40629430,7642396,5041229,0,0,53313056
+5,40629430,7642396,5041229,0,0,53313056
+6,40629430,7642396,5041229,0,0,53313056
+7,0,0,5041229,0,0,5041229
+8,40629430,7642396,5041229,0,0,53313056
+9,9028762,1698310,5041229,0,0,15768302
+10,0,0,5041229,0,0,5041229
+11,3606215,0,5041229,0,0,8647444
+12,0,0,5041229,0,0,5041229
+13,0,0,5041229,0,0,5041229
+14,0,0,5041229,0,0,5041229
+15,0,0,5041229,0,0,5041229
+16,0,0,5041229,0,0,5041229
+17,0,0,5041229,0,0,5041229
+18,0,0,5041229,0,0,5041229
+19,0,0,5041229,0,0,5041229
+20,0,0,5041229,0,0,5041229
+21,17854730,0,5041229,0,0,22895959
+22,0,0,5041229,0,0,5041229
+23,0,0,5041229,0,0,5041229
+24,0,0,5041229,0,0,5041229
+25,0,0,5041229,0,0,5041229
+26,0,0,5041229,0,0,5041229
+27,0,0,5041229,0,0,5041229
+28,0,0,5041229,0,0,5041229
+29,0,0,5041229,0,0,5041229
+30,0,0,5041229,0,0,5041229
+31,3606215,0,5041229,0,0,8647444
+32,0,0,5041229,0,0,5041229
+33,0,0,5041229,0,0,5041229
+34,0,0,5041229,0,0,5041229
+35,0,0,5041229,0,0,5041229
+36,0,0,5041229,0,0,5041229
+37,0,0,5041229,0,0,5041229
+38,0,0,5041229,0,0,5041229
+39,0,0,5041229,125682289,0,130723519
+40,0,0,5041229,125682289,0,130723519
+41,0,0,0,0,56740382,56740382
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-4_Undiscounted_Cost_Estimates_Phase_1_High.csv b/Data/Raw_Data/Cost_Tables/Table_C-4_Undiscounted_Cost_Estimates_Phase_1_High.csv
new file mode 100644
index 0000000..05df5d0
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-4_Undiscounted_Cost_Estimates_Phase_1_High.csv
@@ -0,0 +1,42 @@
+Year,Construction,Transportation_to_CISF,Operations,Transportation_to_Repository,Decommissioning,Total
+1,76552618,73711378,12170532,0,0,162434529
+2,65910317,142837839,12170532,0,0,220918689
+3,11737391,2547465,12437087,0,0,26721943
+4,40629430,7642396,13204163,0,0,61475990
+5,40629430,7642396,12970196,0,0,61242023
+6,40629430,7642396,12970196,0,0,61242023
+7,0,0,12170532,0,0,12170532
+8,40629430,7642396,12502264,0,0,60774091
+9,9028762,1698310,12426224,0,0,23153297
+10,0,0,12170532,0,0,12170532
+11,3606215,0,12170532,0,0,15776747
+12,0,0,12170532,0,0,12170532
+13,0,0,12170532,0,0,12170532
+14,0,0,12170532,0,0,12170532
+15,0,0,12170532,0,0,12170532
+16,0,0,12170532,0,0,12170532
+17,0,0,12170532,0,0,12170532
+18,0,0,12170532,0,0,12170532
+19,0,0,12170532,0,0,12170532
+20,0,0,12170532,0,0,12170532
+21,17854730,0,12170532,0,0,30025262
+22,0,0,12170532,0,0,12170532
+23,0,0,12170532,0,0,12170532
+24,0,0,12170532,0,0,12170532
+25,0,0,12170532,0,0,12170532
+26,0,0,12170532,0,0,12170532
+27,0,0,12170532,0,0,12170532
+28,0,0,12170532,0,0,12170532
+29,0,0,12170532,0,0,12170532
+30,0,0,12170532,0,0,12170532
+31,3606215,0,12170532,0,0,15776747
+32,0,0,12170532,0,0,12170532
+33,0,0,12170532,0,0,12170532
+34,0,0,12170532,0,0,12170532
+35,0,0,12170532,0,0,12170532
+36,0,0,12170532,0,0,12170532
+37,0,0,12170532,0,0,12170532
+38,0,0,12170532,0,0,12170532
+39,0,0,12170532,125682289,0,137852821
+40,0,0,12170532,0,125682289,137852821
+41,0,0,0,0,56740382,56740382
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-5_Undiscounted_Cost_Estimates_Full_Low.csv b/Data/Raw_Data/Cost_Tables/Table_C-5_Undiscounted_Cost_Estimates_Full_Low.csv
new file mode 100644
index 0000000..f9f95d6
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-5_Undiscounted_Cost_Estimates_Full_Low.csv
@@ -0,0 +1,44 @@
+
+Year,Construction,Transportation_to_CISF,Operations,Transportation_to_Repository,Decommissioning,Total
+1,76552618,73711378,5041229,0,0,155305226
+2,65910317,224660997,5041229,0,0,295612544
+3,11285953,196805573,5041229,0,0,213132756
+4,45143811,8491551,5041229,0,0,58676592
+5,77195917,14435637,5041229,0,0,96672783
+6,0,0,5041229,0,0,5041229
+7,0,0,5041229,0,0,5041229
+8,49658192,9340707,5041229,0,0,64040128
+9,0,0,5041229,0,0,5041229
+10,49658192,9340707,5041229,0,0,64040128
+11,93893836,16983102,5041229,0,0,115918168
+12,58686954,11039017,5041229,0,0,74767199
+13,49658192,9340707,5041229,0,0,64040128
+14,49658192,9340707,5041229,0,0,64040128
+15,0,0,5041229,0,0,5041229
+16,0,0,5041229,0,0,5041229
+17,49658192,9340707,5041229,0,0,64040128
+18,90287622,16983102,5041229,0,0,112311953
+19,9028762,1698310,5041229,0,0,15768302
+20,49658192,9340707,5041229,0,0,64040128
+21,108142352,16983102,5041229,0,0,130166683
+22,90287622,16983102,5041229,0,0,112311953
+23,67715717,12737327,5041229,0,0,85494273
+24,90287622,16983102,5041229,0,0,112311953
+25,90287622,16983102,5041229,0,0,112311953
+26,90287622,16983102,5041229,0,0,112311953
+27,90287622,16983102,5041229,0,0,112311953
+28,90287622,16983102,5041229,0,0,112311953
+29,90287622,16983102,5041229,0,0,112311953
+30,54172573,10189862,5041229,0,0,69403664
+31,3606215,0,5041229,77964491,0,86611935
+32,0,0,5041229,77964491,0,83005720
+33,0,0,5041229,77964491,0,83005720
+34,0,0,5041229,77964491,0,83005720
+35,0,0,5041229,77964491,0,83005720
+36,0,0,5041229,77964491,0,83005720
+37,0,0,5041229,77964491,0,83005720
+38,0,0,5041229,77964491,0,83005720
+39,0,0,5041229,77964491,0,83005720
+40,0,0,5041229,77964491,0,83005720
+41,0,0,0,0,405340890,405340890
+
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-6_Undiscounted_Cost_Estimates_Full_High.csv b/Data/Raw_Data/Cost_Tables/Table_C-6_Undiscounted_Cost_Estimates_Full_High.csv
new file mode 100644
index 0000000..d4a9afe
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-6_Undiscounted_Cost_Estimates_Full_High.csv
@@ -0,0 +1,43 @@
+
+Year,Construction,Transportation_to_CISF,Operations,Transportation_to_Repository,Decommissioning,Total
+1,76552618,73711378,12170532,0,0,162434529
+2,65910317,224660997,12170532,0,0,302741846
+3,11285953,196805573,12431687,0,0,220523213
+4,45143811,8491551,12513127,0,0,66148489
+5,77195917,14435637,13291064,0,0,104922618
+6,0,0,13340365,0,0,13340365
+7,0,0,12170532,0,0,12170532
+8,49658192,9340707,12290023,0,0,71288921
+9,0,0,12404499,0,0,12404499
+10,49658192,9340707,12290023,0,0,71288921
+11,93893836,16983102,12621753,0,0,123498692
+12,58686954,11039017,12779680,0,0,82505650
+13,49658192,9340707,12757955,0,0,71756854
+14,49658192,9340707,12523989,0,0,71522888
+15,0,0,12404499,0,0,12404499
+16,0,0,12170532,0,0,12170532
+17,49658192,9340707,12290023,0,0,71288921
+18,90287622,16983102,12621753,0,0,119892477
+19,9028762,1698310,12660190,0,0,23387262
+20,49658192,9340707,12523989,0,0,71522888
+21,108142352,16983102,12621753,0,0,137747207
+22,90287622,16983102,12855719,0,0,120126442
+23,67715717,12737327,13035372,0,0,93488416
+24,90287622,16983102,12855719,0,0,120126442
+25,90287622,16983102,12855719,0,0,120126442
+26,90287622,16983102,13089686,0,0,120360409
+27,90287622,16983102,13089686,0,0,120360409
+28,90287622,16983102,13089686,0,0,120360409
+29,90287622,16983102,13089686,0,0,120360409
+30,54172573,10189862,12768818,0,0,77131252
+31,3606215,0,12638465,77964491,0,94209170
+32,0,0,12170532,77964491,0,90135023
+33,0,0,12170532,77964491,0,90135023
+34,0,0,12170532,77964491,0,90135023
+35,0,0,12170532,77964491,0,90135023
+36,0,0,12170532,77964491,0,90135023
+37,0,0,12170532,77964491,0,90135023
+38,0,0,12170532,77964491,0,90135023
+39,0,0,12170532,77964491,0,90135023
+40,0,0,12170532,77964491,0,90135023
+41,0,0,12170532,0,405340890,417511423
diff --git a/Data/Raw_Data/Cost_Tables/Table_C-9_Number_of_ISFSIs_by_Project_Plan.csv b/Data/Raw_Data/Cost_Tables/Table_C-9_Number_of_ISFSIs_by_Project_Plan.csv
new file mode 100644
index 0000000..c1b3854
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/Table_C-9_Number_of_ISFSIs_by_Project_Plan.csv
@@ -0,0 +1,43 @@
+
+Year,S1_Phase1_Active,S1_Phase1_Decom,S1_Full_Active,S1_Full_Decom,S2_Phase1_Active,S2_Phase1_Decom,S2_Full_Active,S2_Full_Decom
+1,1,8,28,8,1,8,28,8
+2,1,8,28,8,0,9,27,9
+3,0,9,27,9,0,9,27,9
+4,0,9,27,9,0,9,26,10
+5,0,9,26,10,0,9,26,10
+6,0,9,26,10,0,9,24,12
+7,0,9,26,10,0,9,23,13
+8,0,9,26,10,0,9,22,14
+9,0,9,26,10,0,9,21,15
+10,0,9,26,10,0,9,21,15
+11,0,9,26,10,0,9,21,15
+12,0,9,26,10,0,9,20,16
+13,0,9,26,10,0,9,18,18
+14,0,9,26,10,0,9,18,18
+15,0,9,26,10,0,9,17,19
+16,0,9,26,10,0,9,15,21
+17,0,9,26,10,0,9,13,23
+18,0,9,26,10,0,9,12,24
+19,0,9,26,10,0,9,10,26
+20,0,9,26,10,0,9,6,30
+21,0,9,26,10,0,9,5,35
+22,0,9,26,10,0,9,5,35
+23,0,9,26,10,0,9,0,36
+24,0,9,26,10,0,9,0,36
+25,0,9,26,10,0,9,0,36
+26,0,9,26,10,0,9,0,36
+27,0,9,26,10,0,9,0,36
+28,0,9,26,10,0,9,0,36
+29,0,9,26,10,0,9,0,36
+30,0,9,26,10,0,9,0,36
+31,0,9,26,10,0,9,0,36
+32,0,9,26,10,0,9,0,36
+33,0,9,26,10,0,9,0,36
+34,0,9,26,10,0,9,0,36
+35,0,9,26,10,0,9,0,36
+36,0,9,26,10,0,9,0,36
+37,0,9,26,10,0,9,0,36
+38,0,9,26,10,0,9,0,36
+39,0,9,26,10,0,9,0,36
+40,0,9,26,10,0,9,0,36
+
diff --git a/Data/Raw_Data/Cost_Tables/test.r b/Data/Raw_Data/Cost_Tables/test.r
new file mode 100644
index 0000000..ade11bb
--- /dev/null
+++ b/Data/Raw_Data/Cost_Tables/test.r
@@ -0,0 +1,52 @@
+library(tidyverse)
+#########CIFS Costs
+DAT <- read_csv("Table_C-3_Undiscounted_Cost_Estimates_Phase_1.csv")
+rowSums(DAT[,2:6])-DAT$Total
+
+DAT <- read_csv("Table_C-4_Undiscounted_Cost_Estimates_Phase_1_High.csv")
+rowSums(DAT[,2:6])-DAT$Total
+sum(DAT[,2:6])
+sum(DAT[,7])
+DAT[5,7]-sum(DAT[5,2:6])
+61242023-(40629430+7642396+12970196)
+
+DAT <- read_csv("Table_C-5_Undiscounted_Cost_Estimates_Full_Low.csv")
+rowSums(DAT[,2:6])-DAT$Total
+
+DAT <- read_csv("Table_C-6_Undiscounted_Cost_Estimates_Full_High.csv")
+rowSums(DAT[,2:6])-DAT$Total
+sum(DAT[,2:6])
+
+################ISFS
+DAT <- read_csv("Table_C-9_Number_of_ISFSIs_by_Project_Plan.csv")
+ONE <- DAT[1:3] 
+colnames(ONE) <- c("Year","Active","Decom")
+ONE <- ONE %>% mutate(Phase="Partial",Cost_Assumption="Low")
+
+TWO <- DAT[,c(1,4:5)] 
+colnames(TWO) <- c("Year","Active","Decom")
+TWO <- TWO%>% mutate(Phase="Full",Cost_Assumption="Low")
+
+THREE <- DAT[,c(1,6:7)] 
+colnames(THREE) <- c("Year","Active","Decom")
+THREE <- THREE %>% mutate(Phase="Partial",Cost_Assumption="High")
+
+FOUR <- DAT[,c(1,8:9)] 
+colnames(FOUR) <- c("Year","Active","Decom")
+FOUR <- FOUR %>% mutate(Phase="Full",Cost_Assumption="High")
+ISFSI_NUM <- rbind(ONE,TWO,THREE,FOUR)
+ISFSI_NUM  %>% filter(Year==40)
+
+####No Action Costs
+DAT <- read_csv("Table_C-10_Undiscounted_No_Action_Phase_1_Low.csv")
+rowSums(DAT[,2:4])-DAT$Total
+sum(DAT$Total)
+#Table 11 is identical to Table 10 so not check needed
+DAT <- read_csv("Table_C-12_Undiscounted_No_Action_Full_Low.csv")
+rowSums(DAT[,2:4])-DAT$Total
+sum(DAT$Total)
+
+DAT <- read_csv("Table_C-13_Undiscounted_No_Action_Full_High.csv")
+rowSums(DAT[,2:4])-DAT$Total
+sum(DAT$Total)
+
diff --git a/Data/Curie_Spent_Fuel_Site_Totals.csv b/Data/Raw_Data/Curie_Spent_Fuel_Site_Totals.csv
similarity index 100%
rename from Data/Curie_Spent_Fuel_Site_Totals.csv
rename to Data/Raw_Data/Curie_Spent_Fuel_Site_Totals.csv
diff --git a/Data/Curie_Spent_Fuel_Timeline.csv b/Data/Raw_Data/Curie_Spent_Fuel_Timeline.csv
similarity index 100%
rename from Data/Curie_Spent_Fuel_Timeline.csv
rename to Data/Raw_Data/Curie_Spent_Fuel_Timeline.csv
diff --git a/Data_Proc.r b/Data_Proc.r
index 444a992..4df864e 100644
--- a/Data_Proc.r
+++ b/Data_Proc.r
@@ -1,8 +1,8 @@
 library(tidyverse)
 library(parallel)
 
-TS <- read_csv("Data/Curie_Spent_Fuel_Timeline.csv")
-TOTAL <- read_csv("Data/Curie_Spent_Fuel_Site_Totals.csv") %>% mutate(OP_YEAR=year(Op_Date_Min),CLOSE_YEAR=year(Close_Date_Max))%>% select(Facility,Total_Assemblies,Total_Tons,OP_YEAR,CLOSE_YEAR) 
+TS <- read_csv("Data/Raw_Data//Curie_Spent_Fuel_Timeline.csv")
+TOTAL <- read_csv("Data/Raw_Data/Curie_Spent_Fuel_Site_Totals.csv") %>% mutate(OP_YEAR=year(Op_Date_Min),CLOSE_YEAR=year(Close_Date_Max))%>% select(Facility,Total_Assemblies,Total_Tons,OP_YEAR,CLOSE_YEAR) 
 ###########Series of functions to calculate the gross consumer surplus from a CIFS for each facility, in each year from 1960 to 2082.
 
 #Function to find the net present revenue of a facility,given a discount rate, and the current year, and year the facility will close. This is the sum of discounted costs that WOULD have taken place if the facility was not built 
@@ -18,7 +18,7 @@ NPV_CALC <- function(r,DATA=TOTAL,YEARS=1960:2083){
 	Facility <- pull(DATA,Facility)
 	RES <- cbind(Facility,do.call(cbind,lapply(YEARS,function(x){VALUE_ADD_SINGLE_YEAR(r,x,DATA$CLOSE_YEAR)})))
 colnames(RES) <- c("Facility",YEARS) 
-	RES <- as_tibble(RES) %>% pivot_longer(cols=-Facility,names_to="Year",values_to="Revenue") %>% arrange(Year)
+	RES <- as_tibble(RES) %>% pivot_longer(cols=-Facility,names_to="Year",values_to="Revenue") %>% arrange(Year) %>% mutate(Year=parse_number(Year),Revenue=parse_number(Revenue))
 	return(RES)
 }
 #A function which returns a list, of net present revenue calculation tables (facility by year) for a range of possible discount rates. This allows for the results to be quickly looked up, when we want to adjust the time value of money. These results will need to be combined with costs to calculate NPV