Added some command line arg functionality