Added some command line functionality