Fix it so it runs from command line