work-in-progress on refactor_options.py