Added cli scaffolding