Moving instructions to baseline command line tool