Quick attempt at adding a CLI