CLI finish maybe