Add some to-do parts