Initial manual commit with cmdline_parser mostly completed, bar one or two errors