added TODO notes

Change-Id: Idf44929c4588f43373c379b3057c03589e5222ff