Add a few TODO notes