Re-work to switch pattern.

Need to really deal with a shared option now --config file.