Added tokenizing logic, additional argparse args.