Added TODO's for the edit button