added TODOs in comments