Add CLI
Added tagging functionality