Added first cut of CLI