WIP
Job, modified creation of OptionSet