This commit feels so good, but is so broken.  Moving towards putting the parameters into the Parameters class with their own entry functions.