Refactor in prep. for other args.