Add more todos and remove some that are always done