Added initial CLI back