Added some TODO comments

Change-Id: Ic79c9b709cac1df944377e568715bf2092d44c50