Adding CLI which is not yet working