Add TODO
Add CLI version which is used for testing