adding todos for areas of concern