move more cli code to flit