Yes I agree--I'm going to add in argparse in another branch to take care of this + other things.