Add options and commands
Create tickets #2