Add a better CLI