Massive Update to Fitting.R