Further work towards working cli.