Updated to run with commandline Arguments