Got command line tool working