Got something working
Save the extra arguments (non-options).
Some refactoring.
Some more refactoring + bugfix.