Add some more items to the TODO