added TODOs
...