Starting to add some command line params