Add a couple more todos