New options

Options totally refactored. 
See commit message for details.