Almost ready for a miniature CLI