Handling Options

Work in progress !