Code

Add extra-opts argument parsing with tests