TODOs

Change-Id: I6a7866d889f7446bc89c25a19c57d0c8220bf99f