Added few TODO comments for Kiran

Added few TODO comments for Kiran