Refactor, new cli