Started using argparse subparsers instead of the manual way I was getting arguments before.