TOOD!
Clean up cli_commands. Add `..' and `.' support.