Add basic command line stuff