Added initial command line parsing