Command Line Parser is back!

really need to rebase after this