Rewrite of the commandline parsing?