Add old OptionHelper methods to Option
Display job data on step two
Add unit tests