Started adding in support for command line arguments from the commandline