Write todos

Change-Id: I669e9732c2a600453b76f789c3d2a58480a10eb7