Initial CLI for API V2
Fix merge conflicts