Adding comments for TODO's