Improved CLI experience. Working on the whole system.