Feature/cli cont