Add a couple more to-dos