Part one, grand CLI rework