Added command line stuff