More command line stuff, should be useable now