Added the ability to pass in command line args