Added some todo notes