added TODOs
added already done TODO