Added a few TODO's