Added better commandline support........for now