Adds a few TODO comments