Added a few TODO