More CLI work, it's not finished but it is usable.