Massive CLI Update. Side by side with GUI.