@jcredding you also mentioned better error handling related to this CLI stuff.