Added support for command line args *BROKEN*