added TODOs, edit button (WIP)