Add a couple of todos