Adding a few TODO comments