Moved input to argument parser on commandline