First run at changing to option...