Added some TODO notes