Started to add command line arguments