Add more items to the todo list.

Change-Id: If6db947eb6d1467bb35054ae77bdb65de2d8a76f