Added a TODO
Added a note