added TODOs for final version