Initial work on option handling