Make options easier to add

[calvincramer]

Just have a map of options in the options class
For each option in the options file, give the ability to set type