being a nice guy, adding the other contributor's name must be an excellent idea!
Major rewrite using new argument parser.