Trying to untangle the Options from all the methods call.
17 files changed