added TODOs to code