CLI overhaul