Add CLI
Fix common logic
Add research