CLI overhaul

To be continued...