added TODO notes

Change-Id: If08798ca273158dff98a6f31c118e0c349ad017e