added cli, updated base model