-Moved option picking code over to the OptionPicker class. Options C/D now work. If D is checked, but C is not, then it will only generate for the first two options.