added TODOs in controller