Changed to accept command line parameters
meh