added TODOs and files