Added a TODO in cli. will take that up later