Initial cli rewrite.