Command line mode

Opening new PR to replace #71