Current work on improving option parser

not actually for pull request