Move to optparsing
Minimal working version