Adds a few TODO