Added (basically) all of the command line arguments