Added start of better "parse_command_line" implementation