added command line, shell stuff