Added notes regarding TODO