Added some TODO notes.