More work on the commandline parser (broken)