Starting to break out cli