Finish adding in all parameters from input files