started work on new cli infrastructure