Add a few todo items

Some of them should be pretty easy.